[kafka] branch trunk updated: MINOR: Remove deprecated Resource class constructor usage (#5624)

[ijuma]

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new 257c402  MINOR: Remove deprecated Resource class constructor usage 
(#5624)
257c402 is described below

commit 257c402c1565eebf421dbd44a272a3dd6c99d609
Author: Manikumar Reddy O <manikumar.re...@gmail.com>
AuthorDate: Tue Sep 11 12:30:52 2018 +0530

    MINOR: Remove deprecated Resource class constructor usage (#5624)
    
    Reviewers: Ismael Juma <ism...@juma.me.uk>
---
 core/src/main/scala/kafka/server/KafkaApis.scala                    | 6 +++---
 .../scala/integration/kafka/api/EndToEndAuthorizationTest.scala     | 4 +++-
 .../integration/kafka/api/SaslSslAdminClientIntegrationTest.scala   | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/src/main/scala/kafka/server/KafkaApis.scala 
b/core/src/main/scala/kafka/server/KafkaApis.scala
index 24c13cd..9f32b94 100644
--- a/core/src/main/scala/kafka/server/KafkaApis.scala
+++ b/core/src/main/scala/kafka/server/KafkaApis.scala
@@ -53,7 +53,7 @@ import 
org.apache.kafka.common.requests.DescribeLogDirsResponse.LogDirInfo
 import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse
 import org.apache.kafka.common.requests._
 import org.apache.kafka.common.resource.PatternType.LITERAL
-import org.apache.kafka.common.resource.ResourcePattern
+import org.apache.kafka.common.resource.{PatternType, ResourcePattern}
 import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
 import org.apache.kafka.common.security.token.delegation.{DelegationToken, 
TokenInformation}
 import org.apache.kafka.common.utils.{Time, Utils}
@@ -1044,7 +1044,7 @@ class KafkaApis(val requestChannel: RequestChannel,
       if (metadataRequest.allowAutoTopicCreation && 
config.autoCreateTopicsEnable && nonExistingTopics.nonEmpty) {
         if (!authorize(request.session, Create, Resource.ClusterResource)) {
           unauthorizedForCreateTopics = nonExistingTopics.filter { topic =>
-            !authorize(request.session, Create, new Resource(Topic, topic))
+            !authorize(request.session, Create, new Resource(Topic, topic, 
PatternType.LITERAL))
           }
           authorizedTopics --= unauthorizedForCreateTopics
         }
@@ -1443,7 +1443,7 @@ class KafkaApis(val requestChannel: RequestChannel,
           (validTopics, Map[String, TopicDetails]())
         } else {
           validTopics.partition { case (topic, _) =>
-            authorize(request.session, Create, new Resource(Topic, topic))
+            authorize(request.session, Create, new Resource(Topic, topic, 
PatternType.LITERAL))
           }
         }
 
diff --git 
a/core/src/test/scala/integration/kafka/api/EndToEndAuthorizationTest.scala 
b/core/src/test/scala/integration/kafka/api/EndToEndAuthorizationTest.scala
index d53a94d..c9da834 100644
--- a/core/src/test/scala/integration/kafka/api/EndToEndAuthorizationTest.scala
+++ b/core/src/test/scala/integration/kafka/api/EndToEndAuthorizationTest.scala
@@ -30,6 +30,7 @@ import org.apache.kafka.clients.producer.{KafkaProducer, 
ProducerRecord}
 import org.apache.kafka.common.security.auth.KafkaPrincipal
 import org.apache.kafka.common.{KafkaException, TopicPartition}
 import org.apache.kafka.common.errors.{GroupAuthorizationException, 
TimeoutException, TopicAuthorizationException}
+import org.apache.kafka.common.resource.PatternType
 import org.apache.kafka.common.resource.PatternType.{LITERAL, PREFIXED}
 import org.junit.Assert._
 import org.junit.{After, Before, Test}
@@ -263,7 +264,8 @@ abstract class EndToEndAuthorizationTest extends 
IntegrationTestHarness with Sas
     AclCommand.main(produceAclArgs(tp.topic))
     AclCommand.main(consumeAclArgs(tp.topic))
     servers.foreach { s =>
-      TestUtils.waitAndVerifyAcls(TopicReadAcl ++ TopicWriteAcl ++ 
TopicDescribeAcl ++ TopicCreateAcl, s.apis.authorizer.get, new Resource(Topic, 
tp.topic))
+      TestUtils.waitAndVerifyAcls(TopicReadAcl ++ TopicWriteAcl ++ 
TopicDescribeAcl ++ TopicCreateAcl, s.apis.authorizer.get,
+        new Resource(Topic, tp.topic, PatternType.LITERAL))
       TestUtils.waitAndVerifyAcls(GroupReadAcl, s.apis.authorizer.get, 
groupResource)
     }
     val producer = createProducer()
diff --git 
a/core/src/test/scala/integration/kafka/api/SaslSslAdminClientIntegrationTest.scala
 
b/core/src/test/scala/integration/kafka/api/SaslSslAdminClientIntegrationTest.scala
index 3b63613..55e1529 100644
--- 
a/core/src/test/scala/integration/kafka/api/SaslSslAdminClientIntegrationTest.scala
+++ 
b/core/src/test/scala/integration/kafka/api/SaslSslAdminClientIntegrationTest.scala
@@ -43,9 +43,9 @@ class SaslSslAdminClientIntegrationTest extends 
AdminClientIntegrationTest with
     try {
       authorizer.configure(this.configs.head.originals())
       authorizer.addAcls(Set(new AuthAcl(AuthAcl.WildCardPrincipal, Allow,
-                             AuthAcl.WildCardHost, All)), new 
AuthResource(Topic, "*"))
+                             AuthAcl.WildCardHost, All)), new 
AuthResource(Topic, "*", PatternType.LITERAL))
       authorizer.addAcls(Set(new AuthAcl(AuthAcl.WildCardPrincipal, Allow,
-                             AuthAcl.WildCardHost, All)), new 
AuthResource(Group, "*"))
+                             AuthAcl.WildCardHost, All)), new 
AuthResource(Group, "*", PatternType.LITERAL))
 
       authorizer.addAcls(Set(clusterAcl(Allow, Create),
                              clusterAcl(Allow, Delete),