Run sort imports + redundant braces on 1 line statements

olafurpg · Sep 25, 2016 · 3c82a0c · 3c82a0c
1 parent efe7f84
commit 3c82a0c
Show file tree

Hide file tree

Showing 182 changed files with 425 additions and 602 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -0,0 +1,5 @@
+rewrite.rules = [
+  SortImports,
+  RedundantBraces
+]
+rewrite.redundantBraces.maxLines = 1
diff --git a/repos/kafka/core/src/main/scala/kafka/Kafka.scala b/repos/kafka/core/src/main/scala/kafka/Kafka.scala
@@ -72,9 +72,7 @@ object Kafka extends Logging {
       Runtime
         .getRuntime()
         .addShutdownHook(new Thread() {
-          override def run() = {
-            kafkaServerStartable.shutdown
-          }
+          override def run() = kafkaServerStartable.shutdown
         })
 
       kafkaServerStartable.startup

diff --git a/repos/kafka/core/src/main/scala/kafka/admin/AdminClient.scala b/repos/kafka/core/src/main/scala/kafka/admin/AdminClient.scala
@@ -131,9 +131,8 @@ class AdminClient(val time: Time,
     }
   }
 
-  def listAllGroupsFlattened(): List[GroupOverview] = {
+  def listAllGroupsFlattened(): List[GroupOverview] =
     listAllGroups.values.flatten.toList
-  }
 
   def listAllConsumerGroupsFlattened(): List[GroupOverview] = {
     listAllGroupsFlattened.filter(

diff --git a/repos/kafka/core/src/main/scala/kafka/admin/AdminUtils.scala b/repos/kafka/core/src/main/scala/kafka/admin/AdminUtils.scala
@@ -27,9 +27,9 @@ import java.util.Random
 import java.util.Properties
 import org.apache.kafka.common.Node
 import org.apache.kafka.common.errors.{
-  ReplicaNotAvailableException,
   InvalidTopicException,
-  LeaderNotAvailableException
+  LeaderNotAvailableException,
+  ReplicaNotAvailableException
 }
 import org.apache.kafka.common.protocol.{Errors, SecurityProtocol}
 import org.apache.kafka.common.requests.MetadataResponse
@@ -390,9 +390,8 @@ object AdminUtils extends Logging {
     }
   }
 
-  def isConsumerGroupActive(zkUtils: ZkUtils, group: String) = {
+  def isConsumerGroupActive(zkUtils: ZkUtils, group: String) =
     zkUtils.getConsumersInGroup(group).nonEmpty
-  }
 
   /**
     * Delete the whole directory of the given consumer group if the group is inactive.

diff --git a/repos/kafka/core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala b/repos/kafka/core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala
@@ -40,7 +40,7 @@ import org.apache.kafka.common.serialization.StringDeserializer
 import org.apache.kafka.common.utils.Utils
 
 import scala.collection.JavaConverters._
-import scala.collection.{Set, mutable}
+import scala.collection.{mutable, Set}
 
 object ConsumerGroupCommand {
 

diff --git a/repos/kafka/core/src/main/scala/kafka/admin/PreferredReplicaLeaderElectionCommand.scala b/repos/kafka/core/src/main/scala/kafka/admin/PreferredReplicaLeaderElectionCommand.scala
@@ -20,7 +20,7 @@ import joptsimple.OptionParser
 import kafka.utils._
 import org.I0Itec.zkclient.ZkClient
 import org.I0Itec.zkclient.exception.ZkNodeExistsException
-import kafka.common.{TopicAndPartition, AdminCommandFailedException}
+import kafka.common.{AdminCommandFailedException, TopicAndPartition}
 import collection._
 import org.apache.kafka.common.utils.Utils
 import org.apache.kafka.common.security.JaasUtils

diff --git a/repos/kafka/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala b/repos/kafka/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala
@@ -21,7 +21,7 @@ import kafka.utils._
 import collection._
 import org.I0Itec.zkclient.ZkClient
 import org.I0Itec.zkclient.exception.ZkNodeExistsException
-import kafka.common.{TopicAndPartition, AdminCommandFailedException}
+import kafka.common.{AdminCommandFailedException, TopicAndPartition}
 import org.apache.kafka.common.utils.Utils
 import org.apache.kafka.common.security.JaasUtils
 

diff --git a/repos/kafka/core/src/main/scala/kafka/admin/ZkSecurityMigrator.scala b/repos/kafka/core/src/main/scala/kafka/admin/ZkSecurityMigrator.scala
@@ -21,7 +21,7 @@ import java.util.concurrent.ThreadPoolExecutor
 import java.util.concurrent.TimeUnit
 import joptsimple.OptionParser
 import org.I0Itec.zkclient.exception.ZkException
-import kafka.utils.{Logging, ZkUtils, CommandLineUtils}
+import kafka.utils.{CommandLineUtils, Logging, ZkUtils}
 import org.apache.log4j.Level
 import org.apache.kafka.common.security.JaasUtils
 import org.apache.zookeeper.AsyncCallback.{ChildrenCallback, StatCallback}

diff --git a/repos/kafka/core/src/main/scala/kafka/api/ControlledShutdownRequest.scala b/repos/kafka/core/src/main/scala/kafka/api/ControlledShutdownRequest.scala
@@ -20,7 +20,7 @@ import java.nio.ByteBuffer
 
 import kafka.common.{TopicAndPartition}
 import kafka.api.ApiUtils._
-import kafka.network.{RequestOrResponseSend, RequestChannel}
+import kafka.network.{RequestChannel, RequestOrResponseSend}
 import kafka.network.RequestChannel.Response
 import kafka.utils.Logging
 import org.apache.kafka.common.protocol.{ApiKeys, Errors}
@@ -63,9 +63,7 @@ case class ControlledShutdownRequest(versionId: Short,
       4 /* broker id */
   }
 
-  override def toString(): String = {
-    describe(true)
-  }
+  override def toString(): String = describe(true)
 
   override def handleError(e: Throwable,
                            requestChannel: RequestChannel,

diff --git a/repos/kafka/core/src/main/scala/kafka/api/ControlledShutdownResponse.scala b/repos/kafka/core/src/main/scala/kafka/api/ControlledShutdownResponse.scala
@@ -68,6 +68,5 @@ case class ControlledShutdownResponse(
     }
   }
 
-  override def describe(details: Boolean): String = { toString }
-
+  override def describe(details: Boolean): String = toString
 }
diff --git a/repos/kafka/core/src/main/scala/kafka/api/FetchRequest.scala b/repos/kafka/core/src/main/scala/kafka/api/FetchRequest.scala
@@ -149,9 +149,7 @@ case class FetchRequest(
 
   def numPartitions = requestInfo.size
 
-  override def toString(): String = {
-    describe(true)
-  }
+  override def toString(): String = describe(true)
 
   override def handleError(e: Throwable,
                            requestChannel: RequestChannel,

diff --git a/repos/kafka/core/src/main/scala/kafka/api/FetchResponse.scala b/repos/kafka/core/src/main/scala/kafka/api/FetchResponse.scala
@@ -20,10 +20,10 @@ import java.nio.ByteBuffer
 import java.nio.channels.GatheringByteChannel
 
 import kafka.common.TopicAndPartition
-import kafka.message.{MessageSet, ByteBufferMessageSet}
+import kafka.message.{ByteBufferMessageSet, MessageSet}
 import kafka.api.ApiUtils._
 import org.apache.kafka.common.KafkaException
-import org.apache.kafka.common.network.{Send, MultiSend}
+import org.apache.kafka.common.network.{MultiSend, Send}
 import org.apache.kafka.common.protocol.Errors
 
 import scala.collection._

diff --git a/repos/kafka/core/src/main/scala/kafka/api/GenericRequestAndHeader.scala b/repos/kafka/core/src/main/scala/kafka/api/GenericRequestAndHeader.scala
@@ -39,9 +39,7 @@ private[kafka] abstract class GenericRequestAndHeader(
       body.sizeOf()
   }
 
-  override def toString(): String = {
-    describe(true)
-  }
+  override def toString(): String = describe(true)
 
   override def describe(details: Boolean): String = {
     val strBuffer = new StringBuilder

diff --git a/repos/kafka/core/src/main/scala/kafka/api/GenericResponseAndHeader.scala b/repos/kafka/core/src/main/scala/kafka/api/GenericResponseAndHeader.scala
@@ -32,9 +32,7 @@ private[kafka] abstract class GenericResponseAndHeader(
       body.sizeOf()
   }
 
-  override def toString(): String = {
-    describe(true)
-  }
+  override def toString(): String = describe(true)
 
   override def describe(details: Boolean): String = {
     val strBuffer = new StringBuilder

diff --git a/repos/kafka/core/src/main/scala/kafka/api/GroupCoordinatorRequest.scala b/repos/kafka/core/src/main/scala/kafka/api/GroupCoordinatorRequest.scala
@@ -18,7 +18,7 @@ package kafka.api
 
 import java.nio.ByteBuffer
 
-import kafka.network.{RequestOrResponseSend, RequestChannel}
+import kafka.network.{RequestChannel, RequestOrResponseSend}
 import kafka.network.RequestChannel.Response
 import org.apache.kafka.common.protocol.{ApiKeys, Errors}
 

diff --git a/repos/kafka/core/src/main/scala/kafka/api/OffsetCommitRequest.scala b/repos/kafka/core/src/main/scala/kafka/api/OffsetCommitRequest.scala
@@ -20,7 +20,7 @@ import java.nio.ByteBuffer
 
 import kafka.api.ApiUtils._
 import kafka.common.{OffsetAndMetadata, TopicAndPartition}
-import kafka.network.{RequestOrResponseSend, RequestChannel}
+import kafka.network.{RequestChannel, RequestOrResponseSend}
 import kafka.network.RequestChannel.Response
 import kafka.utils.Logging
 import org.apache.kafka.common.protocol.{ApiKeys, Errors}
@@ -204,7 +204,5 @@ case class OffsetCommitRequest(
     offsetCommitRequest.toString()
   }
 
-  override def toString = {
-    describe(details = true)
-  }
+  override def toString = describe(details = true)
 }
diff --git a/repos/kafka/core/src/main/scala/kafka/api/OffsetCommitResponse.scala b/repos/kafka/core/src/main/scala/kafka/api/OffsetCommitResponse.scala
@@ -77,6 +77,5 @@ case class OffsetCommitResponse(commitStatus: Map[TopicAndPartition, Short],
       partitionStatus.size * (4 /* partition */ + 2 /* error code */ )
     })
 
-  override def describe(details: Boolean): String = { toString }
-
+  override def describe(details: Boolean): String = toString
 }
diff --git a/repos/kafka/core/src/main/scala/kafka/api/OffsetFetchRequest.scala b/repos/kafka/core/src/main/scala/kafka/api/OffsetFetchRequest.scala
@@ -20,7 +20,7 @@ import java.nio.ByteBuffer
 
 import kafka.api.ApiUtils._
 import kafka.common.{TopicAndPartition, _}
-import kafka.network.{RequestOrResponseSend, RequestChannel}
+import kafka.network.{RequestChannel, RequestOrResponseSend}
 import kafka.network.RequestChannel.Response
 import kafka.utils.Logging
 import org.apache.kafka.common.protocol.{ApiKeys, Errors}
@@ -125,7 +125,5 @@ case class OffsetFetchRequest(
     offsetFetchRequest.toString()
   }
 
-  override def toString: String = {
-    describe(details = true)
-  }
+  override def toString: String = describe(details = true)
 }
diff --git a/repos/kafka/core/src/main/scala/kafka/api/OffsetFetchResponse.scala b/repos/kafka/core/src/main/scala/kafka/api/OffsetFetchResponse.scala
@@ -19,7 +19,7 @@ package kafka.api
 import java.nio.ByteBuffer
 
 import kafka.api.ApiUtils._
-import kafka.common.{TopicAndPartition, OffsetMetadataAndError}
+import kafka.common.{OffsetMetadataAndError, TopicAndPartition}
 import kafka.utils.Logging
 
 object OffsetFetchResponse extends Logging {
@@ -84,5 +84,5 @@ case class OffsetFetchResponse(
       })
     })
 
-  override def describe(details: Boolean): String = { toString }
+  override def describe(details: Boolean): String = toString
 }
diff --git a/repos/kafka/core/src/main/scala/kafka/api/OffsetRequest.scala b/repos/kafka/core/src/main/scala/kafka/api/OffsetRequest.scala
@@ -20,7 +20,7 @@ import java.nio.ByteBuffer
 
 import kafka.api.ApiUtils._
 import kafka.common.TopicAndPartition
-import kafka.network.{RequestOrResponseSend, RequestChannel}
+import kafka.network.{RequestChannel, RequestOrResponseSend}
 import kafka.network.RequestChannel.Response
 import org.apache.kafka.common.protocol.{ApiKeys, Errors}
 
@@ -120,9 +120,7 @@ case class OffsetRequest(
   def isFromOrdinaryClient = replicaId == Request.OrdinaryConsumerId
   def isFromDebuggingClient = replicaId == Request.DebuggingConsumerId
 
-  override def toString(): String = {
-    describe(true)
-  }
+  override def toString(): String = describe(true)
 
   override def handleError(e: Throwable,
                            requestChannel: RequestChannel,

diff --git a/repos/kafka/core/src/main/scala/kafka/api/OffsetResponse.scala b/repos/kafka/core/src/main/scala/kafka/api/OffsetResponse.scala
@@ -97,5 +97,5 @@ case class OffsetResponse(
     }
   }
 
-  override def describe(details: Boolean): String = { toString }
+  override def describe(details: Boolean): String = toString
 }
diff --git a/repos/kafka/core/src/main/scala/kafka/api/ProducerRequest.scala b/repos/kafka/core/src/main/scala/kafka/api/ProducerRequest.scala
@@ -21,7 +21,7 @@ import java.nio._
 import kafka.api.ApiUtils._
 import kafka.common._
 import kafka.message._
-import kafka.network.{RequestOrResponseSend, RequestChannel}
+import kafka.network.{RequestChannel, RequestOrResponseSend}
 import kafka.network.RequestChannel.Response
 import org.apache.kafka.common.protocol.{ApiKeys, Errors}
 
@@ -136,9 +136,7 @@ case class ProducerRequest(
 
   def numPartitions = data.size
 
-  override def toString(): String = {
-    describe(true)
-  }
+  override def toString(): String = describe(true)
 
   override def handleError(e: Throwable,
                            requestChannel: RequestChannel,

diff --git a/repos/kafka/core/src/main/scala/kafka/api/ProducerResponse.scala b/repos/kafka/core/src/main/scala/kafka/api/ProducerResponse.scala
@@ -110,5 +110,5 @@ case class ProducerResponse(
       buffer.putInt(throttleTime)
   }
 
-  override def describe(details: Boolean): String = { toString }
+  override def describe(details: Boolean): String = toString
 }
diff --git a/repos/kafka/core/src/main/scala/kafka/api/TopicMetadataRequest.scala b/repos/kafka/core/src/main/scala/kafka/api/TopicMetadataRequest.scala
@@ -19,7 +19,7 @@ package kafka.api
 import java.nio.ByteBuffer
 
 import kafka.api.ApiUtils._
-import kafka.network.{RequestOrResponseSend, RequestChannel}
+import kafka.network.{RequestChannel, RequestOrResponseSend}
 import kafka.network.RequestChannel.Response
 import kafka.utils.Logging
 import org.apache.kafka.common.protocol.{ApiKeys, Errors}
@@ -59,9 +59,7 @@ case class TopicMetadataRequest(versionId: Short,
     topics.foldLeft(0)(_ + shortStringLength(_)) /* topics */
   }
 
-  override def toString(): String = {
-    describe(true)
-  }
+  override def toString(): String = describe(true)
 
   override def handleError(e: Throwable,
                            requestChannel: RequestChannel,

diff --git a/repos/kafka/core/src/main/scala/kafka/api/TopicMetadataResponse.scala b/repos/kafka/core/src/main/scala/kafka/api/TopicMetadataResponse.scala
@@ -54,5 +54,5 @@ case class TopicMetadataResponse(brokers: Seq[BrokerEndPoint],
     topicsMetadata.foreach(_.writeTo(buffer))
   }
 
-  override def describe(details: Boolean): String = { toString }
+  override def describe(details: Boolean): String = toString
 }
diff --git a/repos/kafka/core/src/main/scala/kafka/cluster/Partition.scala b/repos/kafka/core/src/main/scala/kafka/cluster/Partition.scala
@@ -74,9 +74,7 @@ class Partition(val topic: String,
   val tags = Map("topic" -> topic, "partition" -> partitionId.toString)
 
   newGauge("UnderReplicated", new Gauge[Int] {
-    def value = {
-      if (isUnderReplicated) 1 else 0
-    }
+    def value = if (isUnderReplicated) 1 else 0
   }, tags)
 
   def isUnderReplicated(): Boolean = {
@@ -139,13 +137,10 @@ class Partition(val topic: String,
     }
   }
 
-  def addReplicaIfNotExists(replica: Replica) = {
+  def addReplicaIfNotExists(replica: Replica) =
     assignedReplicaMap.putIfNotExists(replica.brokerId, replica)
-  }
 
-  def assignedReplicas(): Set[Replica] = {
-    assignedReplicaMap.values.toSet
-  }
+  def assignedReplicas(): Set[Replica] = assignedReplicaMap.values.toSet
 
   def removeReplica(replicaId: Int) {
     assignedReplicaMap.remove(replicaId)
@@ -170,9 +165,7 @@ class Partition(val topic: String,
     }
   }
 
-  def getLeaderEpoch(): Int = {
-    return this.leaderEpoch
-  }
+  def getLeaderEpoch(): Int = return this.leaderEpoch
 
   /**
     * Make the local replica the leader by resetting LogEndOffset for remote replicas (there could be old LogEndOffset
@@ -557,9 +550,7 @@ class Partition(val topic: String,
     false
   }
 
-  override def hashCode(): Int = {
-    31 + topic.hashCode() + 17 * partitionId
-  }
+  override def hashCode(): Int = 31 + topic.hashCode() + 17 * partitionId
 
   override def toString(): String = {
     val partitionString = new StringBuilder

diff --git a/repos/kafka/core/src/main/scala/kafka/cluster/Replica.scala b/repos/kafka/core/src/main/scala/kafka/cluster/Replica.scala
@@ -17,8 +17,8 @@
 package kafka.cluster
 
 import kafka.log.Log
-import kafka.utils.{SystemTime, Time, Logging}
-import kafka.server.{LogReadResult, LogOffsetMetadata}
+import kafka.utils.{Logging, SystemTime, Time}
+import kafka.server.{LogOffsetMetadata, LogReadResult}
 import kafka.common.KafkaException
 
 import java.util.concurrent.atomic.AtomicLong
@@ -119,9 +119,8 @@ class Replica(val brokerId: Int,
     false
   }
 
-  override def hashCode(): Int = {
+  override def hashCode(): Int =
     31 + topic.hashCode() + 17 * brokerId + partition.hashCode()
-  }
 
   override def toString(): String = {
     val replicaString = new StringBuilder

diff --git a/repos/kafka/core/src/main/scala/kafka/common/AppInfo.scala b/repos/kafka/core/src/main/scala/kafka/common/AppInfo.scala
@@ -32,15 +32,11 @@ object AppInfo extends KafkaMetricsGroup {
     }
 
     newGauge("Version", new Gauge[String] {
-      def value = {
-        AppInfoParser.getVersion()
-      }
+      def value = AppInfoParser.getVersion()
     })
 
     newGauge("CommitID", new Gauge[String] {
-      def value = {
-        AppInfoParser.getCommitId();
-      }
+      def value = AppInfoParser.getCommitId();
     })
 
     lock.synchronized {
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,6 +68,5 @@ case class ControlledShutdownResponse( @@
         }
       }
-      override def describe(details: Boolean): String = { toString }
+      override def describe(details: Boolean): String = toString
     }