[kafka] Diff for: [GitHub] rajinisivaram merged pull request #6140: HOTFIX: Fix Properties.putAll compiler error when compiling with Java 11

[GitBox]

diff --git a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala 
b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
index 2609d9e0b79..26db52ef466 100644
--- a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
+++ b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
@@ -28,6 +28,7 @@ import com.yammer.metrics.{Metrics => YammerMetrics}
 import javax.net.ssl._
 import kafka.security.CredentialProvider
 import kafka.server.{KafkaConfig, ThrottledChannel}
+import kafka.utils.Implicits._
 import kafka.utils.TestUtils
 import org.apache.kafka.common.TopicPartition
 import org.apache.kafka.common.memory.MemoryPool
@@ -188,7 +189,7 @@ class SocketServerTest extends JUnitSuite {
   @Test
   def testControlPlaneRequest(): Unit = {
     val testProps = new Properties
-    testProps.putAll(props)
+    testProps ++= props
     testProps.put("listeners", 
"PLAINTEXT://localhost:0,CONTROLLER://localhost:5000")
     testProps.put("listener.security.protocol.map", 
"PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT")
     testProps.put("control.plane.listener.name", "CONTROLLER")
@@ -1320,4 +1321,4 @@ class SocketServerTest extends JUnitSuite {
       sockets.filterNot(socket => isSocketConnectionId(failedConnectionId, 
socket))
     }
   }
-}
\ No newline at end of file
+}


With regards,
Apache Git Services