[kafka] branch 2.2 updated: HOTFIX: Compile error in SocketServerTest

[jgus]

This is an automated email from the ASF dual-hosted git repository.

jgus pushed a commit to branch 2.2
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/2.2 by this push:
     new 5fc6f0d  HOTFIX: Compile error in SocketServerTest
5fc6f0d is described below

commit 5fc6f0d076d739772d014db30f0155c72417cead
Author: Jason Gustafson <ja...@confluent.io>
AuthorDate: Wed Dec 4 09:55:04 2019 -0800

    HOTFIX: Compile error in SocketServerTest
---
 core/src/test/scala/unit/kafka/network/SocketServerTest.scala | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala 
b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
index b0dc052..4e506f3 100644
--- a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
+++ b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
@@ -32,8 +32,6 @@ import kafka.utils.Implicits._
 import kafka.utils.TestUtils
 import org.apache.kafka.common.TopicPartition
 import org.apache.kafka.common.memory.MemoryPool
-import org.apache.kafka.common.message.SaslAuthenticateRequestData
-import org.apache.kafka.common.message.SaslHandshakeRequestData
 import org.apache.kafka.common.metrics.Metrics
 import org.apache.kafka.common.network.KafkaChannel.ChannelMuteState
 import org.apache.kafka.common.network.{ChannelBuilder, ChannelState, 
KafkaChannel, ListenerName, NetworkReceive, NetworkSend, Selector, Send}
@@ -689,7 +687,7 @@ class SocketServerTest extends JUnitSuite {
       val correlationId = -1
       val clientId = ""
       // send a SASL handshake request
-      val saslHandshakeRequest = new SaslHandshakeRequest.Builder(new 
SaslHandshakeRequestData().setMechanism("PLAIN"))
+      val saslHandshakeRequest = new SaslHandshakeRequest.Builder("PLAIN")
         .build()
       val saslHandshakeHeader = new RequestHeader(ApiKeys.SASL_HANDSHAKE, 
saslHandshakeRequest.version, clientId,
         correlationId)
@@ -698,8 +696,7 @@ class SocketServerTest extends JUnitSuite {
 
       // now send credentials within a SaslAuthenticateRequest
       val authBytes = "admin\u0000admin\u0000admin-secret".getBytes("UTF-8")
-      val saslAuthenticateRequest = new SaslAuthenticateRequest.Builder(new 
SaslAuthenticateRequestData()
-        .setAuthBytes(authBytes)).build()
+      val saslAuthenticateRequest = new 
SaslAuthenticateRequest.Builder(ByteBuffer.wrap(authBytes)).build()
       val saslAuthenticateHeader = new 
RequestHeader(ApiKeys.SASL_AUTHENTICATE, saslAuthenticateRequest.version,
         clientId, correlationId)
       sendApiRequest(socket, saslAuthenticateRequest, saslAuthenticateHeader)