Clean up (#139)

* Underscore for unused variables

* IntelliJ friendly: import `scala.util.Random`

* Remove unused import

* Bump Akka version

* For clarity

Author: jiminhsieh

build.sbt

@@ -4,7 +4,7 @@ parallelExecution in ThisBuild := false
 
 val kafkaVersion = "1.1.0"
 val confluentVersion = "4.1.0"
-val akkaVersion = "2.5.11"
+val akkaVersion = "2.5.12"
 
 lazy val commonSettings = Seq(
   organization := "net.manub",

embedded-kafka/src/main/scala/net/manub/embeddedkafka/ConsumerExtensions.scala

@@ -29,7 +29,7 @@ object ConsumerExtensions {
         retryConf: ConsumerRetryConfig = ConsumerRetryConfig()
     ): Stream[T] = {
       val attempts = 1 to retryConf.maximumAttempts
-      attempts.toStream.flatMap { attempt =>
+      attempts.toStream.flatMap { _ =>
         val batch: Seq[T] = getNextBatch(retryConf.poll, topics)
         batch
       }

embedded-kafka/src/main/scala/net/manub/embeddedkafka/EmbeddedKafka.scala

@@ -1,8 +1,6 @@
 package net.manub.embeddedkafka
 
 import java.net.InetSocketAddress
-import java.util.Properties
-import java.util.concurrent.Executors
 
 import kafka.server.{KafkaConfig, KafkaServer}
 import org.apache.kafka.clients.admin.{AdminClient, AdminClientConfig, NewTopic}
@@ -31,12 +29,7 @@ import org.scalatest.Suite
 import scala.collection.JavaConverters._
 import scala.collection.mutable.ListBuffer
 import scala.concurrent.duration._
-import scala.concurrent.{
-  ExecutionContext,
-  ExecutionContextExecutorService,
-  TimeoutException
-}
-import scala.language.{higherKinds, postfixOps}
+import scala.concurrent.TimeoutException
 import scala.reflect.io.Directory
 import scala.util.Try
 
@@ -120,7 +113,7 @@ object EmbeddedKafka extends EmbeddedKafkaSupport[EmbeddedKafkaConfig] {
     */
   def stop(server: EmbeddedServer): Unit = {
     server.stop(true)
-    servers = servers.filter(x => x != server)
+    servers = servers.filter(_ != server)
   }
 
   /**

embedded-kafka/src/test/scala/net/manub/embeddedkafka/EmbeddedKafkaCustomConfigSpec.scala

@@ -5,6 +5,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig
 import org.apache.kafka.clients.producer.ProducerConfig
 
 import scala.language.postfixOps
+import scala.util.Random
 
 class EmbeddedKafkaCustomConfigSpec
     extends EmbeddedKafkaSpecSupport
@@ -40,5 +41,5 @@ class EmbeddedKafkaCustomConfigSpec
   }
 
   def generateMessageOfLength(length: Int): String =
-    Stream.continually(util.Random.nextPrintableChar) take length mkString
+    Stream.continually(Random.nextPrintableChar) take length mkString
 }

embedded-kafka/src/test/scala/net/manub/embeddedkafka/EmbeddedKafkaWithRunningKafkaSpec.scala

@@ -2,8 +2,6 @@ package net.manub.embeddedkafka
 
 import org.scalatest.exceptions.TestFailedException
 
-import scala.language.postfixOps
-
 class EmbeddedKafkaWithRunningKafkaSpec
     extends EmbeddedKafkaSpecSupport
     with EmbeddedKafka {

embedded-kafka/src/test/scala/net/manub/embeddedkafka/embeddedKafkaSpecSupport.scala

@@ -41,41 +41,41 @@ abstract class EmbeddedKafkaSpecSupport
   def kafkaIsAvailable(kafkaPort: Int = 6001): Unit = {
     system.actorOf(
       TcpClient.props(new InetSocketAddress("localhost", kafkaPort), testActor))
-    expectMsg(1 second, ConnectionSuccessful)
+    expectMsg(1 second, Connection.Success)
   }
 
   def schemaRegistryIsAvailable(schemaRegistryPort: Int = 6002): Unit = {
     system.actorOf(
       TcpClient.props(new InetSocketAddress("localhost", schemaRegistryPort),
                       testActor))
-    expectMsg(1 second, ConnectionSuccessful)
+    expectMsg(1 second, Connection.Success)
   }
 
   def zookeeperIsAvailable(zookeeperPort: Int = 6000): Unit = {
     system.actorOf(
       TcpClient.props(new InetSocketAddress("localhost", zookeeperPort),
                       testActor))
-    expectMsg(1 second, ConnectionSuccessful)
+    expectMsg(1 second, Connection.Success)
   }
 
   def kafkaIsNotAvailable(kafkaPort: Int = 6001): Unit = {
     system.actorOf(
       TcpClient.props(new InetSocketAddress("localhost", kafkaPort), testActor))
-    expectMsg(1 second, ConnectionFailed)
+    expectMsg(1 second, Connection.Failure)
   }
 
   def schemaRegistryIsNotAvailable(schemaRegistryPort: Int = 6002): Unit = {
     system.actorOf(
       TcpClient.props(new InetSocketAddress("localhost", schemaRegistryPort),
                       testActor))
-    expectMsg(1 second, ConnectionFailed)
+    expectMsg(1 second, Connection.Failure)
   }
 
   def zookeeperIsNotAvailable(zookeeperPort: Int = 6000): Unit = {
     system.actorOf(
       TcpClient.props(new InetSocketAddress("localhost", zookeeperPort),
                       testActor))
-    expectMsg(1 second, ConnectionFailed)
+    expectMsg(1 second, Connection.Failure)
   }
 }
 
@@ -84,8 +84,10 @@ object TcpClient {
     Props(new TcpClient(remote, replies))
 }
 
-case object ConnectionSuccessful
-case object ConnectionFailed
+object Connection {
+  object Success
+  object Failure
+}
 
 class TcpClient(remote: InetSocketAddress, listener: ActorRef) extends Actor {
 
@@ -95,11 +97,11 @@ class TcpClient(remote: InetSocketAddress, listener: ActorRef) extends Actor {
 
   def receive: Receive = {
     case Connected(_, _) =>
-      listener ! ConnectionSuccessful
+      listener ! Connection.Success
       context stop self
 
     case _ =>
-      listener ! ConnectionFailed
+      listener ! Connection.Failure
       context stop self
   }
 }

kafka-streams/src/main/scala/net/manub/embeddedkafka/streams/TestStreamsConfig.scala

@@ -2,7 +2,6 @@ package net.manub.embeddedkafka.streams
 
 import java.nio.file.Files
 
-import net.manub.embeddedkafka.avro
 import net.manub.embeddedkafka.EmbeddedKafkaConfig
 import org.apache.kafka.clients.consumer.{ConsumerConfig, OffsetResetStrategy}
 import org.apache.kafka.streams.StreamsConfig

schema-registry/src/test/scala/net/manub/embeddedkafka/schemaregistry/EmbeddedKafkaWithSchemaRegistryObjectSpec.scala

@@ -1,6 +1,6 @@
 package net.manub.embeddedkafka.schemaregistry
 
-import net.manub.embeddedkafka.{EmbeddedKafka, EmbeddedKafkaSpecSupport}
+import net.manub.embeddedkafka.EmbeddedKafkaSpecSupport
 
 class EmbeddedKafkaWithSchemaRegistryObjectSpec
     extends EmbeddedKafkaSpecSupport {