Repository: kafka Updated Branches: refs/heads/trunk 198302fee -> 5383f9bed
http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/integration/kafka/api/SslEndToEndAuthorizationTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/integration/kafka/api/SslEndToEndAuthorizationTest.scala b/core/src/test/scala/integration/kafka/api/SslEndToEndAuthorizationTest.scala index 8d3f9b2..b304f29 100644 --- a/core/src/test/scala/integration/kafka/api/SslEndToEndAuthorizationTest.scala +++ b/core/src/test/scala/integration/kafka/api/SslEndToEndAuthorizationTest.scala @@ -18,8 +18,7 @@ package kafka.api import org.apache.kafka.common.config.internals.BrokerSecurityConfigs -import org.apache.kafka.common.protocol.SecurityProtocol -import org.apache.kafka.common.security.auth.{AuthenticationContext, KafkaPrincipal, KafkaPrincipalBuilder, SslAuthenticationContext} +import org.apache.kafka.common.security.auth._ import org.junit.Before object SslEndToEndAuthorizationTest { http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/integration/kafka/api/SslProducerSendTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/integration/kafka/api/SslProducerSendTest.scala b/core/src/test/scala/integration/kafka/api/SslProducerSendTest.scala index 4d9189c..cadc02f 100644 --- a/core/src/test/scala/integration/kafka/api/SslProducerSendTest.scala +++ b/core/src/test/scala/integration/kafka/api/SslProducerSendTest.scala @@ -19,7 +19,7 @@ package kafka.api import java.io.File -import org.apache.kafka.common.protocol.SecurityProtocol +import org.apache.kafka.common.security.auth.SecurityProtocol class SslProducerSendTest extends BaseProducerSendTest { override protected def securityProtocol = SecurityProtocol.SSL http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/integration/kafka/api/TransactionsBounceTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/integration/kafka/api/TransactionsBounceTest.scala b/core/src/test/scala/integration/kafka/api/TransactionsBounceTest.scala index 1a85d34..1712ef8 100644 --- a/core/src/test/scala/integration/kafka/api/TransactionsBounceTest.scala +++ b/core/src/test/scala/integration/kafka/api/TransactionsBounceTest.scala @@ -25,12 +25,11 @@ import kafka.utils.{ShutdownableThread, TestUtils} import org.apache.kafka.clients.consumer.ConsumerConfig import org.apache.kafka.clients.producer.internals.ErrorLoggingCallback import org.apache.kafka.common.TopicPartition -import org.apache.kafka.common.protocol.SecurityProtocol +import org.apache.kafka.common.security.auth.SecurityProtocol +import org.junit.Assert._ import org.junit.Test import scala.collection.JavaConverters._ -import org.junit.Assert._ - import scala.collection.mutable http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/integration/kafka/api/TransactionsTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/integration/kafka/api/TransactionsTest.scala b/core/src/test/scala/integration/kafka/api/TransactionsTest.scala index d978961..0fa0b87 100644 --- a/core/src/test/scala/integration/kafka/api/TransactionsTest.scala +++ b/core/src/test/scala/integration/kafka/api/TransactionsTest.scala @@ -29,7 +29,7 @@ import org.apache.kafka.clients.consumer.{ConsumerConfig, KafkaConsumer, OffsetA import org.apache.kafka.clients.producer.{KafkaProducer, ProducerRecord} import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.errors.ProducerFencedException -import org.apache.kafka.common.protocol.SecurityProtocol +import org.apache.kafka.common.security.auth.SecurityProtocol import org.junit.{After, Before, Test} import org.junit.Assert._ http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala b/core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala index cd9437c..cb6d376 100644 --- a/core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala +++ b/core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala @@ -18,10 +18,8 @@ import java.io.File import java.util.Properties import kafka.admin.AdminUtils - import kafka.server._ - -import org.apache.kafka.common.protocol.SecurityProtocol +import org.apache.kafka.common.security.auth.SecurityProtocol import org.junit.Before import org.apache.kafka.common.metrics.Sanitizer http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/integration/kafka/api/UserQuotaTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/integration/kafka/api/UserQuotaTest.scala b/core/src/test/scala/integration/kafka/api/UserQuotaTest.scala index 330c1e0..a7bddc5 100644 --- a/core/src/test/scala/integration/kafka/api/UserQuotaTest.scala +++ b/core/src/test/scala/integration/kafka/api/UserQuotaTest.scala @@ -20,7 +20,7 @@ import java.util.Properties import kafka.admin.AdminUtils import kafka.server.{ConfigEntityName, KafkaConfig, QuotaId} import kafka.utils.JaasTestUtils -import org.apache.kafka.common.protocol.SecurityProtocol +import org.apache.kafka.common.security.auth.SecurityProtocol import org.junit.{After, Before} import org.apache.kafka.common.metrics.Sanitizer http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala b/core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala index 44b2843..79fc68f 100755 --- a/core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala +++ b/core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala @@ -19,7 +19,6 @@ package kafka.admin import kafka.api.TopicMetadata import org.junit.Assert._ -import org.apache.kafka.common.protocol.SecurityProtocol import kafka.zk.ZooKeeperTestHarness import kafka.utils.TestUtils._ import kafka.utils.TestUtils @@ -28,6 +27,7 @@ import kafka.client.ClientUtils import kafka.server.{KafkaConfig, KafkaServer} import org.apache.kafka.common.errors.InvalidReplicaAssignmentException import org.apache.kafka.common.network.ListenerName +import org.apache.kafka.common.security.auth.SecurityProtocol import org.junit.{After, Before, Test} class AddPartitionsTest extends ZooKeeperTestHarness { http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/admin/ConfigCommandTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/admin/ConfigCommandTest.scala b/core/src/test/scala/unit/kafka/admin/ConfigCommandTest.scala index bb17d74..c0aff93 100644 --- a/core/src/test/scala/unit/kafka/admin/ConfigCommandTest.scala +++ b/core/src/test/scala/unit/kafka/admin/ConfigCommandTest.scala @@ -20,7 +20,7 @@ import java.util.Properties import kafka.admin.ConfigCommand.ConfigCommandOptions import kafka.common.InvalidConfigException -import kafka.server.{ConfigEntityName, QuotaId} +import kafka.server.ConfigEntityName import kafka.utils.{Logging, ZkUtils} import kafka.zk.ZooKeeperTestHarness http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/api/RequestResponseSerializationTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/api/RequestResponseSerializationTest.scala b/core/src/test/scala/unit/kafka/api/RequestResponseSerializationTest.scala index 90b67ba..026786e 100644 --- a/core/src/test/scala/unit/kafka/api/RequestResponseSerializationTest.scala +++ b/core/src/test/scala/unit/kafka/api/RequestResponseSerializationTest.scala @@ -26,7 +26,8 @@ import TestUtils.createBroker import java.nio.ByteBuffer import org.apache.kafka.common.network.ListenerName -import org.apache.kafka.common.protocol.{Errors, SecurityProtocol} +import org.apache.kafka.common.protocol.Errors +import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.utils.Time import org.junit._ import org.scalatest.junit.JUnitSuite http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala b/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala index 536957c..a563c03 100644 --- a/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala +++ b/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala @@ -19,7 +19,7 @@ package kafka.cluster import kafka.utils.TestUtils import org.apache.kafka.common.network.ListenerName -import org.apache.kafka.common.protocol.SecurityProtocol +import org.apache.kafka.common.security.auth.SecurityProtocol import org.junit.Assert.{assertEquals, assertNotEquals, assertNull} import org.junit.Test http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala b/core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala index 1b5841d..fed78a5 100755 --- a/core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala +++ b/core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala @@ -24,8 +24,7 @@ import kafka.common.KafkaException import kafka.server._ import kafka.utils.TestUtils import kafka.zk.ZooKeeperTestHarness -import org.apache.kafka.common.protocol.SecurityProtocol -import org.apache.kafka.common.security.auth.KafkaPrincipal +import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol} import org.junit.{After, Before} import scala.collection.mutable.{ArrayBuffer, Buffer} http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/log/LogSegmentTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/log/LogSegmentTest.scala b/core/src/test/scala/unit/kafka/log/LogSegmentTest.scala index 61a8492..0f866e7 100644 --- a/core/src/test/scala/unit/kafka/log/LogSegmentTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogSegmentTest.scala @@ -17,7 +17,6 @@ package kafka.log import java.io.File -import java.util.concurrent.ConcurrentLinkedDeque import kafka.utils.TestUtils import kafka.utils.TestUtils.checkEquals http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/network/SocketServerTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala index 46eb4ce..633138b 100644 --- a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala +++ b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala @@ -34,10 +34,10 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.memory.MemoryPool import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.network.{ChannelBuilder, ChannelState, KafkaChannel, ListenerName, NetworkReceive, NetworkSend, Selector, Send} -import org.apache.kafka.common.protocol.{ApiKeys, SecurityProtocol} -import org.apache.kafka.common.record.{MemoryRecords, RecordBatch} +import org.apache.kafka.common.protocol.ApiKeys +import org.apache.kafka.common.record.MemoryRecords import org.apache.kafka.common.requests.{AbstractRequest, ProduceRequest, RequestHeader} -import org.apache.kafka.common.security.auth.KafkaPrincipal +import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol} import org.apache.kafka.common.utils.{LogContext, MockTime, Time} import org.junit.Assert._ import org.junit._ http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/producer/AsyncProducerTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/producer/AsyncProducerTest.scala b/core/src/test/scala/unit/kafka/producer/AsyncProducerTest.scala index 376c71f..74f3ad1 100755 --- a/core/src/test/scala/unit/kafka/producer/AsyncProducerTest.scala +++ b/core/src/test/scala/unit/kafka/producer/AsyncProducerTest.scala @@ -20,7 +20,7 @@ package kafka.producer import java.util.Properties import java.util.concurrent.LinkedBlockingQueue -import org.apache.kafka.common.protocol.{Errors, SecurityProtocol} +import org.apache.kafka.common.protocol.Errors import org.junit.Assert.{assertEquals, assertTrue} import org.easymock.EasyMock import org.junit.Test @@ -36,6 +36,7 @@ import kafka.utils.TestUtils._ import scala.collection.Map import scala.collection.mutable.ArrayBuffer import kafka.utils._ +import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.utils.Time @deprecated("This test has been deprecated and it will be removed in a future release.", "0.10.0.0") http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/AdvertiseBrokerTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/AdvertiseBrokerTest.scala b/core/src/test/scala/unit/kafka/server/AdvertiseBrokerTest.scala index d2dd1e1..1c3efee 100755 --- a/core/src/test/scala/unit/kafka/server/AdvertiseBrokerTest.scala +++ b/core/src/test/scala/unit/kafka/server/AdvertiseBrokerTest.scala @@ -20,7 +20,7 @@ package kafka.server import org.junit.Assert._ import kafka.utils.TestUtils import kafka.zk.ZooKeeperTestHarness -import org.apache.kafka.common.protocol.SecurityProtocol +import org.apache.kafka.common.security.auth.SecurityProtocol import org.junit.{After, Test} import scala.collection.mutable.ArrayBuffer http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/BaseRequestTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/BaseRequestTest.scala b/core/src/test/scala/unit/kafka/server/BaseRequestTest.scala index a2ff35e..b34b5a0 100644 --- a/core/src/test/scala/unit/kafka/server/BaseRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/BaseRequestTest.scala @@ -27,8 +27,9 @@ import kafka.network.SocketServer import kafka.utils._ import org.apache.kafka.common.network.ListenerName import org.apache.kafka.common.protocol.types.Struct -import org.apache.kafka.common.protocol.{ApiKeys, SecurityProtocol} +import org.apache.kafka.common.protocol.ApiKeys import org.apache.kafka.common.requests.{AbstractRequest, AbstractRequestResponse, RequestHeader, ResponseHeader} +import org.apache.kafka.common.security.auth.SecurityProtocol abstract class BaseRequestTest extends KafkaServerTestHarness { private var correlationId = 0 http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala b/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala index 7c8e5bd..54be960 100644 --- a/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala +++ b/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala @@ -22,7 +22,6 @@ import org.apache.kafka.common.metrics.{MetricConfig, Metrics, Quota, Sanitizer} import org.apache.kafka.common.utils.MockTime import org.junit.Assert.{assertEquals, assertTrue} import org.junit.{Before, Test} -import kafka.admin.ConfigCommand class ClientQuotaManagerTest { private val time = new MockTime http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/EdgeCaseRequestTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/EdgeCaseRequestTest.scala b/core/src/test/scala/unit/kafka/server/EdgeCaseRequestTest.scala index 092dffe..7b3011f 100755 --- a/core/src/test/scala/unit/kafka/server/EdgeCaseRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/EdgeCaseRequestTest.scala @@ -27,9 +27,10 @@ import kafka.utils._ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.network.ListenerName import org.apache.kafka.common.protocol.types.Type -import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol} -import org.apache.kafka.common.record.{CompressionType, SimpleRecord, RecordBatch, MemoryRecords} +import org.apache.kafka.common.protocol.{ApiKeys, Errors} +import org.apache.kafka.common.record.{CompressionType, MemoryRecords, SimpleRecord} import org.apache.kafka.common.requests.{ProduceRequest, ProduceResponse, ResponseHeader} +import org.apache.kafka.common.security.auth.SecurityProtocol import org.junit.Assert._ import org.junit.Test http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala index c3f492d..508bc35 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaApisTest.scala @@ -37,12 +37,12 @@ import org.apache.kafka.common.errors.UnsupportedVersionException import org.apache.kafka.common.memory.MemoryPool import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.network.ListenerName -import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol} +import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.record.RecordBatch import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse import org.apache.kafka.common.requests.WriteTxnMarkersRequest.TxnMarkerEntry import org.apache.kafka.common.requests._ -import org.apache.kafka.common.security.auth.KafkaPrincipal +import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol} import org.apache.kafka.common.utils.Utils import org.easymock.{Capture, EasyMock, IAnswer} import org.junit.Assert.{assertEquals, assertTrue} http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala b/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala index 08a45b3..522941d 100755 --- a/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala @@ -26,7 +26,7 @@ import kafka.utils.{CoreUtils, TestUtils} import org.apache.kafka.common.config.ConfigException import org.apache.kafka.common.metrics.Sensor import org.apache.kafka.common.network.ListenerName -import org.apache.kafka.common.protocol.SecurityProtocol +import org.apache.kafka.common.security.auth.SecurityProtocol import org.junit.Assert._ import org.junit.Test import org.scalatest.Assertions.intercept http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala b/core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala index f608b95..1dd0808 100755 --- a/core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala +++ b/core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala @@ -30,7 +30,8 @@ import kafka.utils.TestUtils._ import kafka.zk.ZooKeeperTestHarness import org.apache.kafka.common.metrics.Metrics import org.apache.kafka.common.network.ListenerName -import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol} +import org.apache.kafka.common.protocol.{ApiKeys, Errors} +import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.utils.Time import org.junit.{After, Before, Test} http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/MetadataCacheTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/MetadataCacheTest.scala b/core/src/test/scala/unit/kafka/server/MetadataCacheTest.scala index 6b3c6c0..383c1e2 100644 --- a/core/src/test/scala/unit/kafka/server/MetadataCacheTest.scala +++ b/core/src/test/scala/unit/kafka/server/MetadataCacheTest.scala @@ -22,9 +22,10 @@ import util.Arrays.asList import kafka.common.BrokerEndPointNotAvailableException import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.network.ListenerName -import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol} +import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.requests.UpdateMetadataRequest import org.apache.kafka.common.requests.UpdateMetadataRequest.{Broker, EndPoint} +import org.apache.kafka.common.security.auth.SecurityProtocol import org.junit.Test import org.junit.Assert._ http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala b/core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala index 029bb33..5141ad5 100644 --- a/core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/ProduceRequestTest.scala @@ -20,7 +20,7 @@ package kafka.server import kafka.utils.TestUtils import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.protocol.{ApiKeys, Errors} -import org.apache.kafka.common.record.{CompressionType, DefaultRecordBatch, MemoryRecords, RecordBatch, SimpleRecord} +import org.apache.kafka.common.record.{CompressionType, DefaultRecordBatch, MemoryRecords, SimpleRecord} import org.apache.kafka.common.requests.{ProduceRequest, ProduceResponse} import org.junit.Assert._ import org.junit.Test http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala b/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala index d6e0ec0..480dfa6 100644 --- a/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala +++ b/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala @@ -30,12 +30,12 @@ import org.apache.kafka.common.resource.{ResourceFilter, Resource => AdminResour import org.apache.kafka.common.{Node, TopicPartition} import org.apache.kafka.common.metrics.{KafkaMetric, Quota, Sensor} import org.apache.kafka.common.network.ListenerName -import org.apache.kafka.common.protocol.{ApiKeys, SecurityProtocol} +import org.apache.kafka.common.protocol.ApiKeys import org.apache.kafka.common.protocol.types.Struct import org.apache.kafka.common.record._ import org.apache.kafka.common.requests.CreateAclsRequest.AclCreation import org.apache.kafka.common.requests.{Resource => RResource, ResourceType => RResourceType, _} -import org.apache.kafka.common.security.auth.{AuthenticationContext, KafkaPrincipal, KafkaPrincipalBuilder} +import org.apache.kafka.common.security.auth.{AuthenticationContext, KafkaPrincipal, KafkaPrincipalBuilder, SecurityProtocol} import org.junit.Assert._ import org.junit.{After, Before, Test} http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala b/core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala index 01d3a83..7703993 100644 --- a/core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala @@ -19,7 +19,7 @@ package kafka.server import java.net.Socket import java.util.Collections -import org.apache.kafka.common.protocol.{ApiKeys, Errors, SecurityProtocol} +import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.requests.{ApiVersionsRequest, ApiVersionsResponse} import org.apache.kafka.common.requests.SaslHandshakeRequest import org.apache.kafka.common.requests.SaslHandshakeResponse @@ -27,6 +27,7 @@ import org.junit.{After, Before, Test} import org.junit.Assert._ import kafka.api.{KafkaSasl, SaslSetup} import kafka.utils.JaasTestUtils +import org.apache.kafka.common.security.auth.SecurityProtocol class SaslApiVersionsRequestTest extends BaseRequestTest with SaslSetup { override protected def securityProtocol = SecurityProtocol.SASL_PLAINTEXT http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/core/src/test/scala/unit/kafka/utils/TestUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/utils/TestUtils.scala b/core/src/test/scala/unit/kafka/utils/TestUtils.scala index abf0540..08da667 100755 --- a/core/src/test/scala/unit/kafka/utils/TestUtils.scala +++ b/core/src/test/scala/unit/kafka/utils/TestUtils.scala @@ -47,8 +47,8 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.header.Header import org.apache.kafka.common.internals.Topic import org.apache.kafka.common.network.{ListenerName, Mode} -import org.apache.kafka.common.protocol.SecurityProtocol import org.apache.kafka.common.record._ +import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.serialization.{ByteArraySerializer, Serializer} import org.apache.kafka.common.utils.Time import org.apache.kafka.common.utils.Utils._ http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/docs/upgrade.html ---------------------------------------------------------------------- diff --git a/docs/upgrade.html b/docs/upgrade.html index b784402..7162876 100644 --- a/docs/upgrade.html +++ b/docs/upgrade.html @@ -81,6 +81,8 @@ metric named <code>records-consumed-total</code>.</li> <li>Mx4j will only be enabled if the system property <code>kafka_mx4jenable</code> is set to <code>true</code>. Due to a logic inversion bug, it was previously enabled by default and disabled if <code>kafka_mx4jenable</code> was set to <code>true</code>.</li> + <li>The package <code>org.apache.kafka.common.security.auth</code> in the clients jar has been made public and added to the javadocs. + Internal classes which had previously been located in this package have been moved elsewhere.</li> </ul> <h5><a id="upgrade_100_new_protocols" href="#upgrade_100_new_protocols">New Protocol Versions</a></h5> http://git-wip-us.apache.org/repos/asf/kafka/blob/5383f9be/tools/src/main/java/org/apache/kafka/tools/VerifiableLog4jAppender.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/kafka/tools/VerifiableLog4jAppender.java b/tools/src/main/java/org/apache/kafka/tools/VerifiableLog4jAppender.java index 9df5f61..4dd7bee 100644 --- a/tools/src/main/java/org/apache/kafka/tools/VerifiableLog4jAppender.java +++ b/tools/src/main/java/org/apache/kafka/tools/VerifiableLog4jAppender.java @@ -20,7 +20,7 @@ import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.inf.ArgumentParser; import net.sourceforge.argparse4j.inf.ArgumentParserException; import net.sourceforge.argparse4j.inf.Namespace; -import org.apache.kafka.common.protocol.SecurityProtocol; +import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.utils.Exit; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator;
