From 8f772d38f94856f9d75b9c6f7fd873a009284f0b Mon Sep 17 00:00:00 2001 From: Jon Riehl Date: Fri, 5 Sep 2014 18:25:32 -0500 Subject: [PATCH 1/4] KAFKA-1054; Suppressed compiler warnings about type erasure in matching via unboxing. --- core/src/main/scala/kafka/admin/AdminUtils.scala | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/kafka/admin/AdminUtils.scala b/core/src/main/scala/kafka/admin/AdminUtils.scala index b700110..91e9140 100644 --- a/core/src/main/scala/kafka/admin/AdminUtils.scala +++ b/core/src/main/scala/kafka/admin/AdminUtils.scala @@ -315,12 +315,17 @@ object AdminUtils extends Logging { if(str != null) { Json.parseFull(str) match { case None => // there are no config overrides - case Some(map: Map[String, _]) => + case Some(mapAnon: Map[_, _]) => + val map = mapAnon collect { case (k: String, v: Any) => k -> v } require(map("version") == 1) map.get("config") match { - case Some(config: Map[String, String]) => - for((k,v) <- config) - props.setProperty(k, v) + case Some(config: Map[_, _]) => + for(configTup <- config) + configTup match { + case (k: String, v: String) => + props.setProperty(k, v) + case _ => throw new IllegalArgumentException("Invalid topic config: " + str) + } case _ => throw new IllegalArgumentException("Invalid topic config: " + str) } -- 1.8.5.2 (Apple Git-48) From 2035350bc6487b846578a8ca3212a116050ea33a Mon Sep 17 00:00:00 2001 From: Jon Riehl Date: Fri, 5 Sep 2014 18:37:47 -0500 Subject: [PATCH 2/4] KAFKA-1054; Removed code with no discernable effect that was causing warnings. --- core/src/main/scala/kafka/server/KafkaServer.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/scala/kafka/server/KafkaServer.scala b/core/src/main/scala/kafka/server/KafkaServer.scala index dddef93..b7e509f 100644 --- a/core/src/main/scala/kafka/server/KafkaServer.scala +++ b/core/src/main/scala/kafka/server/KafkaServer.scala @@ -207,8 +207,6 @@ class KafkaServer(val config: KafkaConfig, time: Time = SystemTime) extends Logg */ private def registerStats() { BrokerTopicStats.getBrokerAllTopicsStats() - ControllerStats.uncleanLeaderElectionRate - ControllerStats.leaderElectionTimer } /** -- 1.8.5.2 (Apple Git-48) From aa64f3d571fb4e376505323f243211405dab554e Mon Sep 17 00:00:00 2001 From: Jon Riehl Date: Fri, 5 Sep 2014 18:39:21 -0500 Subject: [PATCH 3/4] KAFKA-1054; Suppressed warning caused by slight difference in input function type. Added parameter name to scaladoc in comment. --- core/src/main/scala/kafka/utils/Utils.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/kafka/utils/Utils.scala b/core/src/main/scala/kafka/utils/Utils.scala index 738c1af..5873020 100644 --- a/core/src/main/scala/kafka/utils/Utils.scala +++ b/core/src/main/scala/kafka/utils/Utils.scala @@ -77,7 +77,7 @@ object Utils extends Logging { * @param fun The runction to execute in the thread * @return The unstarted thread */ - def daemonThread(name: String, fun: () => Unit): Thread = + def daemonThread(name: String, fun: => Unit): Thread = daemonThread(name, runnable(fun)) /** @@ -220,7 +220,7 @@ object Utils extends Logging { /** * Recursively delete the list of files/directories and any subfiles (if any exist) - * @param a sequence of files to be deleted + * @param files a sequence of files to be deleted */ def rm(files: Seq[String]): Unit = files.map(f => rm(new File(f))) -- 1.8.5.2 (Apple Git-48) From ac940f20f7510451519239924a86bf69fdfe003e Mon Sep 17 00:00:00 2001 From: Blake Smith Date: Tue, 10 Mar 2015 23:17:52 -0500 Subject: [PATCH 4/4] KAFKA-1054; Fix compiler warnings: ServerShutdownTest, DelayedJoinGroup function signature --- core/src/main/scala/kafka/coordinator/DelayedJoinGroup.scala | 4 ++-- core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/kafka/coordinator/DelayedJoinGroup.scala b/core/src/main/scala/kafka/coordinator/DelayedJoinGroup.scala index df60cbc..f5bd5dc 100644 --- a/core/src/main/scala/kafka/coordinator/DelayedJoinGroup.scala +++ b/core/src/main/scala/kafka/coordinator/DelayedJoinGroup.scala @@ -28,7 +28,7 @@ import kafka.server.DelayedOperation */ class DelayedJoinGroup(sessionTimeout: Long, consumerRegistry: ConsumerRegistry, - responseCallback: () => Unit) extends DelayedOperation(sessionTimeout) { + responseCallback: => Unit) extends DelayedOperation(sessionTimeout) { /* always successfully complete the operation once called */ override def tryComplete(): Boolean = { @@ -45,4 +45,4 @@ class DelayedJoinGroup(sessionTimeout: Long, // TODO responseCallback } -} \ No newline at end of file +} diff --git a/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala b/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala index b46daa4..d4e1af2 100644 --- a/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala +++ b/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala @@ -164,9 +164,8 @@ class ServerShutdownTest extends JUnit3Suite with ZooKeeperTestHarness { server.awaitShutdown() server.shutdown() assertTrue(true); - } - catch{ - case ex => fail() + } catch { + case ex: Throwable => fail() } } } -- 1.8.5.2 (Apple Git-48)