From 27dc5e3d90a8129f0df7b2cfbe9cf03cedd7b6cf Mon Sep 17 00:00:00 2001 From: Jimin Hsieh Date: Thu, 19 Apr 2018 10:59:58 +0800 Subject: [PATCH 1/2] Remove unused input parameter Kafka Consumer Configs didn't have configurations related to topic. --- .../cakesolutions/kafka/akka/KafkaConsumerActorSpec.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/akka/src/test/scala/cakesolutions/kafka/akka/KafkaConsumerActorSpec.scala b/akka/src/test/scala/cakesolutions/kafka/akka/KafkaConsumerActorSpec.scala index 25eedd4..ce1dbdd 100644 --- a/akka/src/test/scala/cakesolutions/kafka/akka/KafkaConsumerActorSpec.scala +++ b/akka/src/test/scala/cakesolutions/kafka/akka/KafkaConsumerActorSpec.scala @@ -54,7 +54,7 @@ class KafkaConsumerActorSpec(system_ : ActorSystem) extends KafkaIntSpec(system_ """.stripMargin) ) - def configuredActor(topic: String): Config = + def configuredActor: Config = ConfigFactory.parseString( s""" | bootstrap.servers = "localhost:$kafkaPort", @@ -98,7 +98,7 @@ class KafkaConsumerActorSpec(system_ : ActorSystem) extends KafkaIntSpec(system_ producer.flush() // Consumer and actor config in same config file - val consumer = system.actorOf(KafkaConsumerActor.props(configuredActor(topic), new StringDeserializer(), new StringDeserializer(), testActor)) + val consumer = system.actorOf(KafkaConsumerActor.props(configuredActor, new StringDeserializer(), new StringDeserializer(), testActor)) consumer ! Subscribe.AutoPartition(List(topic)) val rs = expectMsgClass(30.seconds, classOf[ConsumerRecords[String, String]]) @@ -120,7 +120,7 @@ class KafkaConsumerActorSpec(system_ : ActorSystem) extends KafkaIntSpec(system_ val downstreamActor = TestProbe().ref // Consumer and actor config in same config file - val consumer = system.actorOf(KafkaConsumerActor.props(configuredActor(topic), new StringDeserializer(), new StringDeserializer(), downstreamActor)) + val consumer = system.actorOf(KafkaConsumerActor.props(configuredActor, new StringDeserializer(), new StringDeserializer(), downstreamActor)) consumer ! Subscribe.AutoPartition(List(topic)) // Initiate DeathWatch From 0a7702b51443566d20a41743a7285b85725b5745 Mon Sep 17 00:00:00 2001 From: Jimin Hsieh Date: Thu, 19 Apr 2018 17:30:42 +0800 Subject: [PATCH 2/2] Fix thread was not terminated correctly. --- .../cakesolutions/kafka/ConfigureSerializationSpec.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/test/scala/cakesolutions/kafka/ConfigureSerializationSpec.scala b/client/src/test/scala/cakesolutions/kafka/ConfigureSerializationSpec.scala index ba88ea0..fae13cf 100644 --- a/client/src/test/scala/cakesolutions/kafka/ConfigureSerializationSpec.scala +++ b/client/src/test/scala/cakesolutions/kafka/ConfigureSerializationSpec.scala @@ -46,7 +46,8 @@ class ConfigureSerializationSpec extends KafkaIntSpec{ """.stripMargin ), keySerializer, valueSerializer) - val _ = KafkaProducer(conf) + val producer = KafkaProducer(conf) + producer.close keySerializer.configuration shouldEqual "mock_value" keySerializer.isKeySerializer shouldEqual true @@ -66,7 +67,8 @@ class ConfigureSerializationSpec extends KafkaIntSpec{ """.stripMargin ), keyDeserializer, valueDeserializer) - val _ = KafkaConsumer(conf) + val consumer = KafkaConsumer(conf) + consumer.close keyDeserializer.configuration shouldEqual "mock_value" keyDeserializer.isKeyDeserializer shouldEqual true