From 46f8b55868c9e609f74f17f35f26217975be31ec Mon Sep 17 00:00:00 2001 From: gongxuanzhang Date: Wed, 19 Jun 2024 09:50:59 +0800 Subject: [PATCH 1/3] apply to `clients` --- build.gradle | 3 +- .../org/apache/kafka/clients/ClientUtils.java | 1 + .../clients/ClusterConnectionStates.java | 8 +- .../kafka/clients/CommonClientConfigs.java | 1 + .../kafka/clients/FetchSessionHandler.java | 1 + .../org/apache/kafka/clients/Metadata.java | 1 + .../kafka/clients/MetadataSnapshot.java | 2 +- .../apache/kafka/clients/NetworkClient.java | 3 +- .../kafka/clients/admin/AdminClient.java | 1 - .../AlterConsumerGroupOffsetsResult.java | 8 +- .../admin/AlterReplicaLogDirsOptions.java | 1 + .../admin/AlterReplicaLogDirsResult.java | 7 +- .../clients/admin/ConsumerGroupListing.java | 6 +- .../admin/CreateDelegationTokenOptions.java | 6 +- .../DeleteConsumerGroupOffsetsOptions.java | 3 +- .../DeleteConsumerGroupOffsetsResult.java | 6 +- .../admin/DescribeDelegationTokenOptions.java | 4 +- .../admin/DescribeDelegationTokenResult.java | 4 +- .../clients/admin/DescribeLogDirsResult.java | 8 +- .../admin/DescribeReplicaLogDirsOptions.java | 1 + .../admin/DescribeReplicaLogDirsResult.java | 2 +- .../clients/admin/ElectLeadersResult.java | 8 +- .../kafka/clients/admin/FeatureMetadata.java | 4 +- .../kafka/clients/admin/KafkaAdminClient.java | 3 +- .../admin/ListConsumerGroupOffsetsResult.java | 12 +- .../admin/ListConsumerGroupsOptions.java | 8 +- .../clients/admin/ListOffsetsResult.java | 8 +- .../apache/kafka/clients/admin/NewTopic.java | 4 +- .../clients/admin/SupportedVersionRange.java | 1 - .../clients/admin/UpdateFeaturesOptions.java | 3 +- .../clients/admin/UpdateFeaturesResult.java | 3 +- .../internals/AbortTransactionHandler.java | 1 + .../admin/internals/AdminApiDriver.java | 1 + .../internals/AdminApiLookupStrategy.java | 2 +- .../admin/internals/AdminMetadataManager.java | 1 + .../admin/internals/AllBrokersStrategy.java | 1 + .../AlterConsumerGroupOffsetsHandler.java | 21 +-- .../admin/internals/CoordinatorStrategy.java | 1 + .../DeleteConsumerGroupOffsetsHandler.java | 19 +-- .../DeleteConsumerGroupsHandler.java | 19 +-- .../admin/internals/DeleteRecordsHandler.java | 16 ++- .../DescribeConsumerGroupsHandler.java | 27 ++-- .../internals/DescribeProducersHandler.java | 1 + .../DescribeTransactionsHandler.java | 1 + .../internals/FenceProducersHandler.java | 1 + .../ListConsumerGroupOffsetsHandler.java | 23 ++-- .../admin/internals/ListOffsetsHandler.java | 20 +-- .../internals/ListTransactionsHandler.java | 1 + .../internals/PartitionLeaderStrategy.java | 1 + ...RemoveMembersFromConsumerGroupHandler.java | 19 +-- .../consumer/ConsumerPartitionAssignor.java | 15 ++- .../consumer/ConsumerRebalanceListener.java | 4 +- .../consumer/CooperativeStickyAssignor.java | 15 ++- .../kafka/clients/consumer/KafkaConsumer.java | 2 +- .../clients/consumer/StickyAssignor.java | 15 ++- .../internals/AbstractCoordinator.java | 1 + .../consumer/internals/AbstractFetch.java | 1 + .../internals/AbstractPartitionAssignor.java | 1 + .../internals/AbstractStickyAssignor.java | 14 +- .../consumer/internals/AsyncClient.java | 1 + .../internals/AsyncKafkaConsumer.java | 4 +- .../internals/CommitRequestManager.java | 1 + .../consumer/internals/CompletedFetch.java | 1 + .../internals/ConsumerCoordinator.java | 1 + .../internals/ConsumerInterceptors.java | 1 + .../consumer/internals/ConsumerMetrics.java | 6 +- .../internals/ConsumerNetworkClient.java | 1 + .../internals/ConsumerNetworkThread.java | 1 + .../consumer/internals/ConsumerProtocol.java | 2 +- .../ConsumerRebalanceListenerInvoker.java | 1 + .../consumer/internals/ConsumerUtils.java | 1 + .../internals/CoordinatorRequestManager.java | 1 + .../consumer/internals/FetchBuffer.java | 1 + .../consumer/internals/FetchCollector.java | 1 + .../internals/FetchMetricsRegistry.java | 4 +- .../clients/consumer/internals/Fetcher.java | 3 +- .../internals/HeartbeatRequestManager.java | 1 + .../internals/LegacyKafkaConsumer.java | 3 +- .../internals/MembershipManagerImpl.java | 1 + .../internals/NetworkClientDelegate.java | 1 + .../consumer/internals/OffsetFetcher.java | 1 + .../internals/OffsetFetcherUtils.java | 1 + .../internals/OffsetsForLeaderEpochUtils.java | 1 + .../internals/OffsetsRequestManager.java | 1 + .../consumer/internals/RequestFuture.java | 2 +- .../consumer/internals/RequestManagers.java | 1 + .../consumer/internals/RequestState.java | 1 + .../consumer/internals/SensorBuilder.java | 2 +- .../consumer/internals/SubscriptionState.java | 1 + .../internals/TopicMetadataFetcher.java | 1 + .../TopicMetadataRequestManager.java | 1 + .../events/ApplicationEventHandler.java | 1 + .../events/ApplicationEventProcessor.java | 1 + .../events/CompletableEventReaper.java | 1 + .../internals/events/UnsubscribeEvent.java | 1 - .../kafka/clients/producer/KafkaProducer.java | 1 + .../kafka/clients/producer/Partitioner.java | 2 +- .../kafka/clients/producer/Producer.java | 2 +- .../clients/producer/ProducerConfig.java | 1 + .../producer/RoundRobinPartitioner.java | 8 +- .../producer/UniformStickyPartitioner.java | 4 +- .../producer/internals/BufferPool.java | 14 +- .../internals/BuiltInPartitioner.java | 1 + .../internals/ErrorLoggingCallback.java | 1 + .../producer/internals/ProducerBatch.java | 3 +- .../internals/ProducerInterceptors.java | 1 + .../producer/internals/ProducerMetadata.java | 1 + .../producer/internals/ProducerMetrics.java | 8 +- .../producer/internals/RecordAccumulator.java | 37 +++--- .../clients/producer/internals/Sender.java | 9 +- .../internals/SenderMetricsRegistry.java | 12 +- .../internals/StickyPartitionCache.java | 6 +- .../internals/TransactionManager.java | 1 + .../producer/internals/TxnPartitionEntry.java | 11 +- .../producer/internals/TxnPartitionMap.java | 11 +- .../org/apache/kafka/common/Endpoint.java | 6 +- .../apache/kafka/common/MessageFormatter.java | 4 +- .../common/compress/Lz4BlockInputStream.java | 8 +- .../common/compress/Lz4BlockOutputStream.java | 6 +- .../common/compress/SnappyCompression.java | 1 + .../common/compress/ZstdCompression.java | 11 +- .../kafka/common/config/AbstractConfig.java | 1 + .../kafka/common/config/SslConfigs.java | 3 +- .../provider/DirectoryConfigProvider.java | 1 + .../config/provider/EnvVarConfigProvider.java | 1 + .../config/provider/FileConfigProvider.java | 1 + .../errors/InvalidTxnTimeoutException.java | 1 - .../errors/RecordBatchTooLargeException.java | 1 - .../errors/TelemetryTooLargeException.java | 1 - .../UnknownSubscriptionIdException.java | 1 - .../common/feature/BaseVersionRange.java | 4 +- .../apache/kafka/common/feature/Features.java | 2 +- .../common/header/internals/RecordHeader.java | 6 +- .../common/internals/KafkaFutureImpl.java | 4 +- .../kafka/common/memory/SimpleMemoryPool.java | 7 +- .../kafka/common/metrics/JmxReporter.java | 20 +-- .../apache/kafka/common/metrics/Metrics.java | 1 + .../kafka/common/metrics/MetricsReporter.java | 8 +- .../apache/kafka/common/metrics/Sensor.java | 2 +- .../metrics/internals/IntGaugeSuite.java | 1 + .../kafka/common/metrics/stats/Avg.java | 5 +- .../kafka/common/metrics/stats/Max.java | 4 +- .../kafka/common/metrics/stats/Meter.java | 8 +- .../kafka/common/metrics/stats/Min.java | 4 +- .../common/metrics/stats/Percentiles.java | 7 +- .../kafka/common/metrics/stats/Rate.java | 6 +- .../common/metrics/stats/SampledStat.java | 6 +- .../common/metrics/stats/TokenBucket.java | 3 +- .../kafka/common/network/ChannelBuilder.java | 6 +- .../kafka/common/network/ChannelBuilders.java | 5 +- .../kafka/common/network/NetworkReceive.java | 1 + .../network/PlaintextTransportLayer.java | 7 +- .../common/network/SaslChannelBuilder.java | 6 +- .../apache/kafka/common/network/Selector.java | 1 + .../common/network/SslTransportLayer.java | 25 ++-- .../apache/kafka/common/protocol/Errors.java | 11 +- .../kafka/common/protocol/MessageUtil.java | 3 +- .../common/record/ControlRecordType.java | 1 + .../common/record/EndTransactionMarker.java | 1 + .../common/record/FileLogInputStream.java | 2 +- .../kafka/common/record/LegacyRecord.java | 2 +- .../kafka/common/record/MemoryRecords.java | 2 +- .../apache/kafka/common/record/Record.java | 4 +- .../requests/AddPartitionsToTxnRequest.java | 2 +- .../requests/AddPartitionsToTxnResponse.java | 2 +- .../requests/AlterReplicaLogDirsRequest.java | 7 +- .../common/requests/ApiVersionsRequest.java | 2 +- .../AssignReplicasToDirsResponse.java | 1 - .../common/requests/CreateTopicsRequest.java | 7 +- .../common/requests/DeleteAclsRequest.java | 4 +- .../common/requests/DeleteAclsResponse.java | 7 +- .../common/requests/DeleteTopicsRequest.java | 2 +- .../common/requests/DescribeAclsResponse.java | 17 ++- .../requests/DescribeClusterRequest.java | 3 +- .../requests/DescribeClusterResponse.java | 9 +- .../DescribeTransactionsResponse.java | 1 - .../common/requests/ElectLeadersRequest.java | 11 +- .../common/requests/ElectLeadersResponse.java | 14 +- .../common/requests/EnvelopeRequest.java | 2 +- .../ExpireDelegationTokenRequest.java | 4 +- .../ExpireDelegationTokenResponse.java | 6 +- .../kafka/common/requests/FetchResponse.java | 2 +- .../GetTelemetrySubscriptionsRequest.java | 1 - .../common/requests/LeaderAndIsrRequest.java | 4 +- .../ListClientMetricsResourcesResponse.java | 2 +- .../common/requests/ListOffsetsRequest.java | 18 +-- .../common/requests/ListOffsetsResponse.java | 12 +- .../common/requests/OffsetFetchRequest.java | 7 +- .../common/requests/OffsetFetchResponse.java | 4 +- .../requests/PushTelemetryResponse.java | 1 - .../requests/RenewDelegationTokenRequest.java | 4 +- .../RenewDelegationTokenResponse.java | 6 +- .../requests/SaslAuthenticateRequest.java | 1 - .../common/requests/SaslHandshakeRequest.java | 1 - .../common/requests/ShareFetchResponse.java | 8 +- .../requests/ShareGroupHeartbeatRequest.java | 4 +- .../common/requests/StopReplicaRequest.java | 2 +- .../kafka/common/security/JaasConfig.java | 8 +- .../kafka/common/security/JaasContext.java | 6 +- .../kafka/common/security/JaasUtils.java | 2 +- .../common/security/auth/KafkaPrincipal.java | 1 - .../auth/SaslAuthenticationContext.java | 6 +- .../common/security/auth/SaslExtensions.java | 1 + .../auth/SslAuthenticationContext.java | 3 +- .../security/auth/SslEngineFactory.java | 3 +- .../security/authenticator/AbstractLogin.java | 24 ++-- .../DefaultKafkaPrincipalBuilder.java | 11 +- .../security/authenticator/DefaultLogin.java | 1 - .../security/authenticator/LoginManager.java | 6 +- .../SaslClientAuthenticator.java | 10 +- .../SaslClientCallbackHandler.java | 14 +- .../SaslServerAuthenticator.java | 14 +- .../SaslServerCallbackHandler.java | 12 +- .../KerberosClientCallbackHandler.java | 5 +- .../security/kerberos/KerberosError.java | 4 +- .../security/kerberos/KerberosLogin.java | 19 +-- ...AuthBearerExtensionsValidatorCallback.java | 3 +- .../OAuthBearerLoginCallbackHandler.java | 24 ++-- .../oauthbearer/OAuthBearerLoginModule.java | 21 +-- .../oauthbearer/OAuthBearerToken.java | 4 +- .../oauthbearer/OAuthBearerTokenCallback.java | 4 +- .../OAuthBearerValidatorCallback.java | 4 +- .../OAuthBearerValidatorCallbackHandler.java | 23 ++-- .../OAuthBearerClientInitialResponse.java | 3 +- .../internals/OAuthBearerRefreshingLogin.java | 17 +-- .../internals/OAuthBearerSaslClient.java | 21 +-- .../OAuthBearerSaslClientCallbackHandler.java | 19 +-- .../OAuthBearerSaslClientProvider.java | 6 +- .../internals/OAuthBearerSaslServer.java | 25 ++-- .../OAuthBearerSaslServerProvider.java | 6 +- .../ExpiringCredentialRefreshConfig.java | 4 +- .../ExpiringCredentialRefreshingLogin.java | 15 ++- .../secured/AccessTokenRetrieverFactory.java | 11 +- .../secured/AccessTokenValidatorFactory.java | 13 +- .../secured/BasicOAuthBearerToken.java | 3 +- .../CloseableVerificationKeyResolver.java | 7 +- .../internals/secured/ConfigurationUtils.java | 5 +- .../internals/secured/FileTokenRetriever.java | 3 +- .../secured/HttpAccessTokenRetriever.java | 16 ++- .../internals/secured/JaasOptionsUtils.java | 17 ++- .../JwksFileVerificationKeyResolver.java | 10 +- .../secured/LoginAccessTokenValidator.java | 16 ++- .../secured/RefreshingHttpsJwks.java | 16 +-- ...shingHttpsJwksVerificationKeyResolver.java | 7 +- .../oauthbearer/internals/secured/Retry.java | 4 +- .../internals/secured/ValidateException.java | 3 +- .../ValidatorAccessTokenValidator.java | 12 +- .../VerificationKeyResolverFactory.java | 17 ++- .../OAuthBearerIllegalTokenException.java | 4 +- .../unsecured/OAuthBearerUnsecuredJws.java | 14 +- ...thBearerUnsecuredLoginCallbackHandler.java | 27 ++-- ...arerUnsecuredValidatorCallbackHandler.java | 19 +-- .../unsecured/OAuthBearerValidationUtils.java | 4 +- .../plain/internals/PlainSaslServer.java | 6 +- .../internals/PlainSaslServerProvider.java | 4 +- .../internals/PlainServerCallbackHandler.java | 2 +- .../scram/ScramExtensionsCallback.java | 3 +- .../scram/internals/ScramCredentialUtils.java | 6 +- .../scram/internals/ScramFormatter.java | 12 +- .../scram/internals/ScramSaslClient.java | 17 +-- .../internals/ScramSaslClientProvider.java | 4 +- .../scram/internals/ScramSaslServer.java | 31 ++--- .../internals/ScramSaslServerProvider.java | 4 +- .../internals/ScramServerCallbackHandler.java | 16 +-- .../CommonNameLoggingSslEngineFactory.java | 2 +- ...NameLoggingTrustManagerFactoryWrapper.java | 1 + .../security/ssl/DefaultSslEngineFactory.java | 7 +- .../kafka/common/security/ssl/SslFactory.java | 14 +- .../security/ssl/SslPrincipalMapper.java | 2 +- .../common/serialization/BytesSerializer.java | 1 - .../serialization/ListDeserializer.java | 23 ++-- .../common/serialization/ListSerializer.java | 9 +- .../internals/ClientTelemetryProvider.java | 8 +- .../internals/ClientTelemetryReporter.java | 11 +- .../internals/ClientTelemetrySender.java | 2 +- .../internals/ClientTelemetryUtils.java | 6 +- .../internals/KafkaMetricsCollector.java | 1 + .../telemetry/internals/MetricsEmitter.java | 3 +- .../internals/SinglePointMetric.java | 10 +- .../kafka/common/utils/AppInfoParser.java | 15 ++- .../kafka/common/utils/CollectionUtils.java | 2 +- .../kafka/common/utils/ConfigUtils.java | 1 + .../apache/kafka/common/utils/Sanitizer.java | 4 +- .../kafka/common/utils/SecurityUtils.java | 3 +- .../org/apache/kafka/common/utils/Shell.java | 5 +- .../org/apache/kafka/common/utils/Utils.java | 1 + .../server/authorizer/AclDeleteResult.java | 8 +- .../kafka/server/authorizer/Action.java | 3 +- .../AuthorizableRequestContext.java | 3 +- .../authorizer/AuthorizerServerInfo.java | 3 +- .../server/quota/ClientQuotaCallback.java | 1 - .../apache/kafka/clients/ApiVersionsTest.java | 1 + .../apache/kafka/clients/ClientUtilsTest.java | 6 +- .../clients/ClusterConnectionStatesTest.java | 28 ++-- .../clients/CommonClientConfigsTest.java | 1 + .../clients/FetchSessionHandlerTest.java | 7 +- .../kafka/clients/InFlightRequestsTest.java | 1 + .../kafka/clients/MetadataSnapshotTest.java | 3 +- .../apache/kafka/clients/MetadataTest.java | 11 +- .../kafka/clients/NetworkClientTest.java | 1 + .../kafka/clients/NodeApiVersionsTest.java | 1 + .../clients/admin/AdminClientConfigTest.java | 1 + .../clients/admin/AdminClientTestUtils.java | 12 +- .../kafka/clients/admin/ConfigTest.java | 1 + .../DeleteConsumerGroupOffsetsResultTest.java | 2 +- .../clients/admin/DeleteTopicsResultTest.java | 8 +- .../admin/DescribeTopicsResultTest.java | 1 + ...escribeUserScramCredentialsResultTest.java | 1 + .../clients/admin/KafkaAdminClientTest.java | 1 + .../admin/ListTransactionsResultTest.java | 1 + .../clients/admin/MemberDescriptionTest.java | 1 + .../kafka/clients/admin/MockAdminClient.java | 14 +- .../kafka/clients/admin/NewTopicTest.java | 1 + ...oveMembersFromConsumerGroupResultTest.java | 2 +- .../clients/admin/ScramMechanismTest.java | 4 +- .../clients/admin/TopicCollectionTest.java | 6 +- .../AbortTransactionHandlerTest.java | 1 + .../admin/internals/AdminApiDriverTest.java | 4 +- .../AdminBootstrapAddressesTest.java | 1 + .../internals/AdminMetadataManagerTest.java | 1 + .../AllBrokersStrategyIntegrationTest.java | 1 + .../internals/AllBrokersStrategyTest.java | 1 + .../AlterConsumerGroupOffsetsHandlerTest.java | 22 ++-- .../internals/CoordinatorStrategyTest.java | 1 + ...DeleteConsumerGroupOffsetsHandlerTest.java | 29 +++-- .../DeleteConsumerGroupsHandlerTest.java | 15 ++- .../internals/DeleteRecordsHandlerTest.java | 18 +-- .../DescribeConsumerGroupsHandlerTest.java | 39 +++--- .../DescribeProducersHandlerTest.java | 1 + .../DescribeTransactionsHandlerTest.java | 1 + .../internals/FenceProducersHandlerTest.java | 1 + .../ListConsumerGroupOffsetsHandlerTest.java | 44 +++---- .../internals/ListOffsetsHandlerTest.java | 32 ++--- .../ListTransactionsHandlerTest.java | 1 + .../PartitionLeaderStrategyTest.java | 1 + ...veMembersFromConsumerGroupHandlerTest.java | 25 ++-- .../clients/consumer/ConsumerConfigTest.java | 1 + .../consumer/ConsumerGroupMetadataTest.java | 1 + .../ConsumerPartitionAssignorTest.java | 1 + .../clients/consumer/ConsumerRecordTest.java | 1 + .../clients/consumer/ConsumerRecordsTest.java | 11 +- .../CooperativeStickyAssignorTest.java | 10 +- .../clients/consumer/KafkaConsumerTest.java | 2 + .../clients/consumer/MockConsumerTest.java | 1 + .../consumer/MockShareConsumerTest.java | 1 + .../consumer/OffsetAndMetadataTest.java | 1 + .../clients/consumer/RangeAssignorTest.java | 3 +- .../consumer/RoundRobinAssignorTest.java | 1 + .../clients/consumer/StickyAssignorTest.java | 35 ++--- .../internals/AbstractCoordinatorTest.java | 1 + .../AbstractPartitionAssignorTest.java | 1 + .../internals/AbstractStickyAssignorTest.java | 29 +++-- .../internals/AsyncKafkaConsumerTest.java | 6 +- .../internals/CommitRequestManagerTest.java | 1 + .../internals/CompletedFetchTest.java | 1 + .../internals/ConsumerCoordinatorTest.java | 1 + .../internals/ConsumerInterceptorsTest.java | 5 +- .../internals/ConsumerMetadataTest.java | 1 + .../internals/ConsumerNetworkClientTest.java | 1 + .../internals/ConsumerNetworkThreadTest.java | 5 +- .../internals/ConsumerProtocolTest.java | 1 + .../CoordinatorRequestManagerTest.java | 1 + .../EagerConsumerCoordinatorTest.java | 1 - .../consumer/internals/FetchBufferTest.java | 1 + .../internals/FetchCollectorTest.java | 1 + .../consumer/internals/FetchConfigTest.java | 1 + .../internals/FetchMetricsManagerTest.java | 1 + .../internals/FetchRequestManagerTest.java | 1 + .../consumer/internals/FetcherTest.java | 13 +- .../HeartbeatRequestManagerTest.java | 1 + .../internals/MembershipManagerImplTest.java | 1 + .../internals/MockRebalanceListener.java | 3 +- .../internals/NetworkClientDelegateTest.java | 1 + .../OffsetCommitCallbackInvokerTest.java | 1 + .../consumer/internals/OffsetFetcherTest.java | 1 + .../OffsetForLeaderEpochClientTest.java | 1 + .../internals/OffsetsRequestManagerTest.java | 1 + .../internals/RequestManagersTest.java | 1 + .../consumer/internals/RequestStateTest.java | 1 + .../internals/SubscriptionStateTest.java | 1 + .../internals/TimedRequestStateTest.java | 1 + .../internals/TopicMetadataFetcherTest.java | 1 + .../TopicMetadataRequestManagerTest.java | 1 + .../TopicPartitionComparatorTest.java | 7 +- .../consumer/internals/WakeupTriggerTest.java | 1 + .../events/ApplicationEventProcessorTest.java | 1 + .../events/CompletableEventReaperTest.java | 1 + .../metrics/HeartbeatMetricsManagerTest.java | 1 + .../OffsetCommitMetricsManagerTest.java | 1 + .../RebalanceCallbackMetricsManagerTest.java | 1 + .../clients/producer/KafkaProducerTest.java | 2 + .../clients/producer/MockProducerTest.java | 1 + .../clients/producer/ProducerConfigTest.java | 1 + .../clients/producer/RecordMetadataTest.java | 1 + .../clients/producer/RecordSendTest.java | 22 ++-- .../producer/RoundRobinPartitionerTest.java | 2 + .../UniformStickyPartitionerTest.java | 3 +- .../producer/internals/BufferPoolTest.java | 3 +- .../internals/BuiltInPartitionerTest.java | 1 + .../internals/DefaultPartitionerTest.java | 2 + .../internals/FutureRecordMetadataTest.java | 1 + .../producer/internals/ProducerBatchTest.java | 3 +- .../internals/ProducerInterceptorsTest.java | 2 +- .../internals/ProducerMetadataTest.java | 1 + .../internals/RecordAccumulatorTest.java | 7 +- .../producer/internals/SenderTest.java | 3 +- .../internals/StickyPartitionCacheTest.java | 1 + .../internals/TransactionManagerTest.java | 3 +- .../org/apache/kafka/common/ClusterTest.java | 1 + .../apache/kafka/common/KafkaFutureTest.java | 5 +- .../kafka/common/TopicIdPartitionTest.java | 7 +- .../kafka/common/TopicPartitionTest.java | 3 +- .../kafka/common/acl/AclBindingTest.java | 1 + .../common/acl/ResourcePatternFilterTest.java | 1 + .../kafka/common/acl/ResourcePatternTest.java | 1 + .../common/compress/GzipCompressionTest.java | 1 + .../common/compress/Lz4CompressionTest.java | 5 +- .../common/compress/NoCompressionTest.java | 1 + .../compress/SnappyCompressionTest.java | 1 + .../common/compress/ZstdCompressionTest.java | 1 + .../common/config/AbstractConfigTest.java | 7 +- .../kafka/common/config/ConfigDefTest.java | 1 + .../common/config/ConfigTransformerTest.java | 1 + .../kafka/common/config/SaslConfigsTest.java | 6 +- .../config/provider/AllowedPathsTest.java | 3 +- .../provider/DirectoryConfigProviderTest.java | 7 +- .../provider/EnvVarConfigProviderTest.java | 9 +- .../provider/FileConfigProviderTest.java | 1 + .../kafka/common/feature/FeaturesTest.java | 6 +- .../feature/SupportedVersionRangeTest.java | 4 +- .../header/internals/RecordHeadersTest.java | 1 + .../common/internals/PartitionStatesTest.java | 1 + .../kafka/common/internals/TopicTest.java | 1 + .../GarbageCollectedMemoryPoolTest.java | 6 +- .../common/message/ApiMessageTypeTest.java | 3 +- .../kafka/common/message/MessageTest.java | 5 +- .../message/NullableStructMessageTest.java | 1 + .../common/message/RecordsSerdeTest.java | 1 + .../message/SimpleArraysMessageTest.java | 1 + .../message/SimpleExampleMessageTest.java | 4 +- .../kafka/common/metrics/JmxReporterTest.java | 6 +- .../kafka/common/metrics/KafkaMbeanTest.java | 6 +- .../kafka/common/metrics/KafkaMetricTest.java | 1 + .../metrics/KafkaMetricsContextTest.java | 6 +- .../kafka/common/metrics/MetricsTest.java | 58 ++++----- .../kafka/common/metrics/SampleMetrics.java | 1 - .../kafka/common/metrics/SensorTest.java | 3 +- .../kafka/common/metrics/TokenBucketTest.java | 8 +- .../metrics/internals/IntGaugeSuiteTest.java | 1 + .../common/metrics/stats/FrequenciesTest.java | 1 + .../common/metrics/stats/HistogramTest.java | 12 +- .../kafka/common/metrics/stats/MeterTest.java | 11 +- .../kafka/common/metrics/stats/RateTest.java | 1 + .../common/metrics/stats/SampledStatTest.java | 1 + .../kafka/common/network/CertStores.java | 8 +- .../common/network/ChannelBuildersTest.java | 1 + .../kafka/common/network/EchoServer.java | 7 +- .../common/network/KafkaChannelTest.java | 1 + .../common/network/NetworkReceiveTest.java | 1 + .../common/network/NetworkTestUtils.java | 20 +-- .../kafka/common/network/NioEchoServer.java | 5 +- .../network/SaslChannelBuilderTest.java | 12 +- .../kafka/common/network/SelectorTest.java | 1 + .../kafka/common/network/SslSelectorTest.java | 9 +- .../kafka/common/network/SslSender.java | 9 +- .../common/network/SslTransportLayerTest.java | 3 +- .../network/SslTransportTls12Tls13Test.java | 12 +- .../SslVersionsTransportLayerTest.java | 21 +-- .../common/network/Tls12SelectorTest.java | 10 +- .../common/network/Tls13SelectorTest.java | 18 +-- .../kafka/common/protocol/ApiKeysTest.java | 1 + .../DataOutputStreamWritableTest.java | 10 +- .../kafka/common/protocol/ErrorsTest.java | 13 +- .../common/protocol/MessageUtilTest.java | 10 +- .../common/protocol/SendBuilderTest.java | 1 + .../types/ProtocolSerializationTest.java | 1 + .../types/RawTaggedFieldWriterTest.java | 1 + .../kafka/common/protocol/types/TypeTest.java | 1 + .../record/AbstractLegacyRecordBatchTest.java | 1 + .../common/record/BufferSupplierTest.java | 1 + .../record/ByteBufferLogInputStreamTest.java | 1 + .../record/CompressionRatioEstimatorTest.java | 4 +- .../common/record/ControlRecordTypeTest.java | 4 +- .../common/record/ControlRecordUtilsTest.java | 9 +- .../common/record/DefaultRecordBatchTest.java | 1 + .../common/record/DefaultRecordTest.java | 1 + .../record/EndTransactionMarkerTest.java | 1 + .../common/record/FileLogInputStreamTest.java | 1 + .../kafka/common/record/FileRecordsTest.java | 1 + .../kafka/common/record/LegacyRecordTest.java | 1 + .../record/MemoryRecordsBuilderTest.java | 1 + .../common/record/MemoryRecordsTest.java | 1 + .../common/record/MultiRecordsSendTest.java | 1 + .../record/RemoteLogInputStreamTest.java | 1 + .../common/record/SimpleLegacyRecordTest.java | 1 + .../record/UnalignedFileRecordsTest.java | 1 + .../common/replica/ReplicaSelectorTest.java | 1 + .../AddPartitionsToTxnRequestTest.java | 10 +- .../AddPartitionsToTxnResponseTest.java | 3 +- .../requests/AlterPartitionRequestTest.java | 3 +- .../AlterReplicaLogDirsRequestTest.java | 7 +- .../AlterReplicaLogDirsResponseTest.java | 7 +- .../kafka/common/requests/ApiErrorTest.java | 1 + .../requests/ApiVersionsResponseTest.java | 5 +- .../BrokerRegistrationRequestTest.java | 1 + .../requests/ByteBufferChannelTest.java | 1 + .../ConsumerGroupDescribeRequestTest.java | 1 + .../ConsumerGroupDescribeResponseTest.java | 1 + .../ControlledShutdownRequestTest.java | 1 + .../requests/CreateAclsRequestTest.java | 1 + .../requests/DeleteAclsRequestTest.java | 1 + .../requests/DeleteAclsResponseTest.java | 1 + .../requests/DeleteGroupsRequestTest.java | 1 + .../requests/DeleteGroupsResponseTest.java | 1 + .../requests/DeleteTopicsRequestTest.java | 1 + .../requests/DescribeAclsRequestTest.java | 1 + .../requests/DescribeAclsResponseTest.java | 1 + .../requests/DescribeGroupsRequestTest.java | 1 + .../common/requests/EndTxnRequestTest.java | 1 + .../common/requests/EndTxnResponseTest.java | 1 + .../common/requests/EnvelopeRequestTest.java | 1 + .../common/requests/EnvelopeResponseTest.java | 1 + .../common/requests/FetchRequestTest.java | 3 +- .../requests/FindCoordinatorRequestTest.java | 1 + .../GetTelemetrySubscriptionsRequestTest.java | 1 + ...GetTelemetrySubscriptionsResponseTest.java | 1 + .../common/requests/HeartbeatRequestTest.java | 1 + .../common/requests/JoinGroupRequestTest.java | 1 + .../requests/JoinGroupResponseTest.java | 1 + .../requests/LeaderAndIsrRequestTest.java | 1 + .../requests/LeaderAndIsrResponseTest.java | 3 +- .../requests/LeaveGroupRequestTest.java | 1 + .../requests/LeaveGroupResponseTest.java | 1 + .../requests/ListOffsetsRequestTest.java | 19 +-- .../common/requests/MetadataRequestTest.java | 3 +- .../common/requests/MetadataResponseTest.java | 1 + .../requests/OffsetCommitRequestTest.java | 1 + .../requests/OffsetCommitResponseTest.java | 1 + .../requests/OffsetFetchRequestTest.java | 1 + .../requests/OffsetFetchResponseTest.java | 1 + .../OffsetsForLeaderEpochRequestTest.java | 1 + .../common/requests/ProduceRequestTest.java | 1 + .../common/requests/ProduceResponseTest.java | 2 +- .../requests/PushTelemetryRequestTest.java | 13 +- .../requests/PushTelemetryResponseTest.java | 1 + .../common/requests/RequestContextTest.java | 1 + .../common/requests/RequestHeaderTest.java | 1 + .../common/requests/RequestResponseTest.java | 13 +- .../common/requests/RequestTestUtils.java | 4 +- .../requests/StopReplicaRequestTest.java | 3 +- .../requests/StopReplicaResponseTest.java | 1 + .../common/requests/SyncGroupRequestTest.java | 1 + .../requests/TxnOffsetCommitRequestTest.java | 1 + .../requests/TxnOffsetCommitResponseTest.java | 1 + .../requests/UpdateFeaturesRequestTest.java | 1 + .../requests/UpdateFeaturesResponseTest.java | 1 + .../requests/UpdateMetadataRequestTest.java | 1 + .../requests/WriteTxnMarkersRequestTest.java | 1 + .../requests/WriteTxnMarkersResponseTest.java | 1 + .../common/security/JaasContextTest.java | 17 +-- .../common/security/SaslExtensionsTest.java | 3 +- .../DefaultKafkaPrincipalBuilderTest.java | 8 +- .../ClientAuthenticationFailureTest.java | 1 + .../authenticator/LoginManagerTest.java | 3 +- .../SaslAuthenticatorFailureDelayTest.java | 1 + .../authenticator/SaslAuthenticatorTest.java | 28 ++-- .../SaslServerAuthenticatorTest.java | 10 +- .../authenticator/TestDigestLoginModule.java | 6 +- .../authenticator/TestJaasConfig.java | 14 +- .../security/kerberos/KerberosRuleTest.java | 4 +- ...BearerExtensionsValidatorCallbackTest.java | 1 + .../OAuthBearerLoginCallbackHandlerTest.java | 45 ++++--- .../OAuthBearerLoginModuleTest.java | 25 ++-- ...thBearerSaslClientCallbackHandlerTest.java | 9 +- .../OAuthBearerTokenCallbackTest.java | 8 +- ...uthBearerValidatorCallbackHandlerTest.java | 25 ++-- .../OAuthBearerValidatorCallbackTest.java | 6 +- .../OAuthBearerClientInitialResponseTest.java | 12 +- .../internals/OAuthBearerSaslClientTest.java | 12 +- .../internals/OAuthBearerSaslServerTest.java | 29 +++-- .../ExpiringCredentialRefreshConfigTest.java | 11 +- ...ExpiringCredentialRefreshingLoginTest.java | 35 ++--- .../internals/secured/AccessTokenBuilder.java | 14 +- .../AccessTokenRetrieverFactoryTest.java | 10 +- .../AccessTokenValidatorFactoryTest.java | 6 +- .../secured/AccessTokenValidatorTest.java | 4 +- .../secured/BasicOAuthBearerTokenTest.java | 14 +- .../secured/ClaimValidationUtilsTest.java | 10 +- .../secured/ConfigurationUtilsTest.java | 8 +- .../secured/HttpAccessTokenRetrieverTest.java | 20 +-- .../secured/JaasOptionsUtilsTest.java | 14 +- .../internals/secured/OAuthBearerTest.java | 43 +++--- .../secured/RefreshingHttpsJwksTest.java | 37 +++--- .../internals/secured/RetryTest.java | 11 +- .../ValidatorAccessTokenValidatorTest.java | 4 +- .../unsecured/OAuthBearerScopeUtilsTest.java | 9 +- .../OAuthBearerUnsecuredJwsTest.java | 8 +- ...arerUnsecuredLoginCallbackHandlerTest.java | 19 +-- ...UnsecuredValidatorCallbackHandlerTest.java | 19 +-- .../OAuthBearerValidationUtilsTest.java | 7 +- .../plain/internals/PlainSaslServerTest.java | 8 +- .../internals/ScramCredentialUtilsTest.java | 8 +- .../scram/internals/ScramMessagesTest.java | 13 +- .../scram/internals/ScramSaslServerTest.java | 6 +- ...LoggingTrustManagerFactoryWrapperTest.java | 2 +- .../ssl/DefaultSslEngineFactoryTest.java | 1 + .../common/security/ssl/SslFactoryTest.java | 33 ++--- .../ssl/mock/TestKeyManagerFactory.java | 18 +-- .../ssl/mock/TestTrustManagerFactory.java | 8 +- .../serialization/ListDeserializerTest.java | 13 +- .../serialization/ListSerializerTest.java | 11 +- .../serialization/SerializationTest.java | 1 + .../ClientTelemetryReporterTest.java | 5 +- .../internals/ClientTelemetryUtilsTest.java | 1 + .../internals/KafkaMetricsCollectorTest.java | 11 +- .../internals/LastValueTrackerTest.java | 1 + .../internals/SinglePointMetricTest.java | 8 +- .../TelemetryMetricNamingConventionTest.java | 3 +- .../common/utils/AbstractIteratorTest.java | 10 +- .../kafka/common/utils/AppInfoParserTest.java | 7 +- .../utils/ByteBufferInputStreamTest.java | 122 +++++++++--------- .../common/utils/ByteBufferUnmapperTest.java | 1 + .../apache/kafka/common/utils/BytesTest.java | 2 +- .../common/utils/ChunkedBytesStreamTest.java | 12 +- .../common/utils/CircularIteratorTest.java | 6 +- .../common/utils/CollectionUtilsTest.java | 2 +- .../kafka/common/utils/ConfigUtilsTest.java | 1 + .../common/utils/FlattenedIteratorTest.java | 1 - .../ImplicitLinkedHashCollectionTest.java | 6 +- ...ImplicitLinkedHashMultiCollectionTest.java | 1 + .../apache/kafka/common/utils/JavaTest.java | 8 +- .../kafka/common/utils/MockScheduler.java | 1 + .../kafka/common/utils/SanitizerTest.java | 8 +- .../kafka/common/utils/SecurityUtilsTest.java | 3 +- .../apache/kafka/common/utils/Serializer.java | 2 +- .../apache/kafka/common/utils/TimeTest.java | 1 + .../apache/kafka/common/utils/UtilsTest.java | 7 +- .../annotation/ApiKeyVersionsProvider.java | 4 +- .../annotation/ApiKeyVersionsSource.java | 6 +- .../server/policy/AlterConfigPolicyTest.java | 1 + .../org/apache/kafka/test/MetricsBench.java | 4 +- .../test/MockClusterResourceListener.java | 2 +- .../kafka/test/MockConsumerInterceptor.java | 4 +- .../apache/kafka/test/MockPartitioner.java | 2 +- .../kafka/test/MockProducerInterceptor.java | 2 +- .../org/apache/kafka/test/MockSerializer.java | 2 +- .../org/apache/kafka/test/TestSslUtils.java | 1 + .../java/org/apache/kafka/test/TestUtils.java | 1 + 648 files changed, 2199 insertions(+), 1698 deletions(-) diff --git a/build.gradle b/build.gradle index 1b407bfdaf2cc..4a0e3589818f9 100644 --- a/build.gradle +++ b/build.gradle @@ -201,8 +201,7 @@ def determineCommitId() { } } -def excludedSpotlessModules = [':clients', - ':connect:runtime', +def excludedSpotlessModules = [':connect:runtime', ':core', ':streams'] diff --git a/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java b/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java index c164a886ece65..c2c2fca17d1b7 100644 --- a/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java @@ -31,6 +31,7 @@ import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java index c4e24a48bec42..0f2fdff475c7a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java +++ b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java @@ -16,21 +16,21 @@ */ package org.apache.kafka.clients; -import java.util.HashSet; -import java.util.Set; - -import java.util.stream.Collectors; import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.utils.ExponentialBackoff; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; /** * The state of our connection to each node in the cluster. diff --git a/clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java b/clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java index 9803d487f41b1..6c0c469264c7d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java +++ b/clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java index da0e7559d57eb..101dce5ab06fb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.requests.FetchRequest.PartitionData; import org.apache.kafka.common.requests.FetchResponse; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/Metadata.java b/clients/src/main/java/org/apache/kafka/clients/Metadata.java index 7c4f3bd6b3c17..5f2a412550a88 100644 --- a/clients/src/main/java/org/apache/kafka/clients/Metadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/Metadata.java @@ -32,6 +32,7 @@ import org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata; import org.apache.kafka.common.utils.ExponentialBackoff; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.io.Closeable; diff --git a/clients/src/main/java/org/apache/kafka/clients/MetadataSnapshot.java b/clients/src/main/java/org/apache/kafka/clients/MetadataSnapshot.java index fbfb828b31c15..6d84a738c1dfe 100644 --- a/clients/src/main/java/org/apache/kafka/clients/MetadataSnapshot.java +++ b/clients/src/main/java/org/apache/kafka/clients/MetadataSnapshot.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients; -import java.util.OptionalInt; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.ClusterResource; import org.apache.kafka.common.Node; @@ -34,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.OptionalInt; import java.util.Set; import java.util.function.BiPredicate; import java.util.function.Predicate; diff --git a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java index afbc7d4f68d1e..b301b43eb9f64 100644 --- a/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/NetworkClient.java @@ -26,8 +26,8 @@ import org.apache.kafka.common.message.ApiVersionsResponseData.ApiVersion; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.network.ChannelState; -import org.apache.kafka.common.network.NetworkSend; import org.apache.kafka.common.network.NetworkReceive; +import org.apache.kafka.common.network.NetworkSend; import org.apache.kafka.common.network.Selectable; import org.apache.kafka.common.network.Send; import org.apache.kafka.common.protocol.ApiKeys; @@ -48,6 +48,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import java.io.IOException; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/AdminClient.java b/clients/src/main/java/org/apache/kafka/clients/admin/AdminClient.java index 989a6fa5d37ae..204579605bc13 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/AdminClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/AdminClient.java @@ -49,4 +49,3 @@ public static AdminClient create(Map conf) { return (AdminClient) Admin.create(conf); } } - diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsResult.java index c4cb2e998897c..32e54de0a7f5f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsResult.java @@ -16,16 +16,16 @@ */ package org.apache.kafka.clients.admin; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.annotation.InterfaceStability; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.protocol.Errors; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * The result of the {@link AdminClient#alterConsumerGroupOffsets(String, Map)} call. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsOptions.java b/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsOptions.java index 76037fbb91333..02f2186b1f7d7 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsOptions.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsOptions.java @@ -18,6 +18,7 @@ package org.apache.kafka.clients.admin; import org.apache.kafka.common.annotation.InterfaceStability; + import java.util.Map; /** diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsResult.java index 81eb0ea73bc4f..6f9d65e1c6282 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsResult.java @@ -16,9 +16,6 @@ */ package org.apache.kafka.clients.admin; -import java.util.Map; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.TopicPartitionReplica; import org.apache.kafka.common.annotation.InterfaceStability; @@ -29,6 +26,10 @@ import org.apache.kafka.common.errors.ReplicaNotAvailableException; import org.apache.kafka.common.errors.UnknownServerException; +import java.util.Map; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; + /** * The result of {@link Admin#alterReplicaLogDirs(Map, AlterReplicaLogDirsOptions)}. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/ConsumerGroupListing.java b/clients/src/main/java/org/apache/kafka/clients/admin/ConsumerGroupListing.java index 01c23796d41ae..96a3ecce9d000 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/ConsumerGroupListing.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/ConsumerGroupListing.java @@ -17,12 +17,12 @@ package org.apache.kafka.clients.admin; -import java.util.Objects; -import java.util.Optional; - import org.apache.kafka.common.ConsumerGroupState; import org.apache.kafka.common.GroupType; +import java.util.Objects; +import java.util.Optional; + /** * A listing of a consumer group in the cluster. */ diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenOptions.java b/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenOptions.java index 693e8f52f63b7..13540b0299cfc 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenOptions.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenOptions.java @@ -17,13 +17,13 @@ package org.apache.kafka.clients.admin; +import org.apache.kafka.common.annotation.InterfaceStability; +import org.apache.kafka.common.security.auth.KafkaPrincipal; + import java.util.LinkedList; import java.util.List; import java.util.Optional; -import org.apache.kafka.common.annotation.InterfaceStability; -import org.apache.kafka.common.security.auth.KafkaPrincipal; - /** * Options for {@link Admin#createDelegationToken(CreateDelegationTokenOptions)}. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsOptions.java b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsOptions.java index 63e6b4be84bae..74aadea29ca0c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsOptions.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsOptions.java @@ -16,9 +16,10 @@ */ package org.apache.kafka.clients.admin; -import java.util.Set; import org.apache.kafka.common.annotation.InterfaceStability; +import java.util.Set; + /** * Options for the {@link Admin#deleteConsumerGroupOffsets(String, Set)} call. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResult.java index 336e9c0f3b269..238dfe56234f5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResult.java @@ -16,15 +16,15 @@ */ package org.apache.kafka.clients.admin; -import java.util.Set; import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.annotation.InterfaceStability; - -import java.util.Map; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.protocol.Errors; +import java.util.Map; +import java.util.Set; + /** * The result of the {@link Admin#deleteConsumerGroupOffsets(String, Set)} call. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenOptions.java b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenOptions.java index fabd91b58f782..fd57ad45f23cc 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenOptions.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenOptions.java @@ -17,11 +17,11 @@ package org.apache.kafka.clients.admin; -import java.util.List; - import org.apache.kafka.common.annotation.InterfaceStability; import org.apache.kafka.common.security.auth.KafkaPrincipal; +import java.util.List; + /** * Options for {@link Admin#describeDelegationToken(DescribeDelegationTokenOptions)}. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenResult.java index 47b2530328199..0c856933c86f6 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenResult.java @@ -17,12 +17,12 @@ package org.apache.kafka.clients.admin; -import java.util.List; - import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.annotation.InterfaceStability; import org.apache.kafka.common.security.token.delegation.DelegationToken; +import java.util.List; + /** * The result of the {@link KafkaAdminClient#describeDelegationToken(DescribeDelegationTokenOptions)} call. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsResult.java index d6f1114d61f4a..1ed2d49c96284 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsResult.java @@ -19,16 +19,16 @@ import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.annotation.InterfaceStability; -import java.util.HashMap; +import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.requests.DescribeLogDirsResponse; + import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.requests.DescribeLogDirsResponse; - /** * The result of the {@link Admin#describeLogDirs(Collection)} call. diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsOptions.java b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsOptions.java index 589de503df5b9..00accc2e99f5a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsOptions.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsOptions.java @@ -18,6 +18,7 @@ package org.apache.kafka.clients.admin; import org.apache.kafka.common.annotation.InterfaceStability; + import java.util.Collection; /** diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsResult.java index 399caaa8db5e4..88a71028b7ece 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsResult.java @@ -21,9 +21,9 @@ import org.apache.kafka.common.annotation.InterfaceStability; import org.apache.kafka.common.requests.DescribeLogDirsResponse; +import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.Collection; import java.util.concurrent.ExecutionException; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersResult.java index acc79b3227d0e..4b050d652c2af 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersResult.java @@ -18,16 +18,16 @@ package org.apache.kafka.clients.admin; -import java.util.Map; -import java.util.Optional; -import java.util.Set; - import org.apache.kafka.common.ElectionType; import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.annotation.InterfaceStability; import org.apache.kafka.common.internals.KafkaFutureImpl; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + /** * The result of {@link Admin#electLeaders(ElectionType, Set, ElectLeadersOptions)} * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/FeatureMetadata.java b/clients/src/main/java/org/apache/kafka/clients/admin/FeatureMetadata.java index 815f9e3b97ca6..8e2a7d594f694 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/FeatureMetadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/FeatureMetadata.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.clients.admin; -import static java.util.stream.Collectors.joining; - import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.Optional; +import static java.util.stream.Collectors.joining; + /** * Encapsulates details about finalized as well as supported features. This is particularly useful * to hold the result returned by the {@link Admin#describeFeatures(DescribeFeaturesOptions)} API. diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java index 8bbd0369b7a8d..646ed43a8aa1b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java @@ -60,8 +60,8 @@ import org.apache.kafka.clients.consumer.internals.ConsumerProtocol; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.ConsumerGroupState; -import org.apache.kafka.common.GroupType; import org.apache.kafka.common.ElectionType; +import org.apache.kafka.common.GroupType; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.Metric; @@ -256,6 +256,7 @@ import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import java.security.InvalidKeyException; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsResult.java index c54b5a997acc7..4335e7ce30619 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsResult.java @@ -17,18 +17,18 @@ package org.apache.kafka.clients.admin; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ExecutionException; -import java.util.stream.Collectors; - import org.apache.kafka.clients.admin.internals.CoordinatorKey; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.annotation.InterfaceStability; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; + /** * The result of the {@link Admin#listConsumerGroupOffsets(Map)} and * {@link Admin#listConsumerGroupOffsets(String)} call. diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsOptions.java b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsOptions.java index c240da159ff77..acbe3f00d600a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsOptions.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsOptions.java @@ -17,14 +17,14 @@ package org.apache.kafka.clients.admin; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - import org.apache.kafka.common.ConsumerGroupState; import org.apache.kafka.common.GroupType; import org.apache.kafka.common.annotation.InterfaceStability; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + /** * Options for {@link Admin#listConsumerGroups()}. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsResult.java index 552b2559958aa..080e7da949e46 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsResult.java @@ -16,15 +16,15 @@ */ package org.apache.kafka.clients.admin; +import org.apache.kafka.common.KafkaFuture; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.annotation.InterfaceStability; + import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutionException; -import org.apache.kafka.common.KafkaFuture; -import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.annotation.InterfaceStability; - /** * The result of the {@link AdminClient#listOffsets(Map)} call. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/NewTopic.java b/clients/src/main/java/org/apache/kafka/clients/admin/NewTopic.java index 0151e6f61793f..cb048ae4d147c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/NewTopic.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/NewTopic.java @@ -17,7 +17,6 @@ package org.apache.kafka.clients.admin; -import java.util.Optional; import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableReplicaAssignment; import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopic; import org.apache.kafka.common.message.CreateTopicsRequestData.CreateableTopicConfig; @@ -27,8 +26,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; /** * A new topic to be created via {@link Admin#createTopics(Collection)}. diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/SupportedVersionRange.java b/clients/src/main/java/org/apache/kafka/clients/admin/SupportedVersionRange.java index 3ba6303eacd55..2eef560d26408 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/SupportedVersionRange.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/SupportedVersionRange.java @@ -79,4 +79,3 @@ public String toString() { return String.format("SupportedVersionRange[min_version:%d, max_version:%d]", minVersion, maxVersion); } } - diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesOptions.java b/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesOptions.java index 455f2b87d1573..d9a7be887802b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesOptions.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesOptions.java @@ -16,9 +16,10 @@ */ package org.apache.kafka.clients.admin; -import java.util.Map; import org.apache.kafka.common.annotation.InterfaceStability; +import java.util.Map; + /** * Options for {@link AdminClient#updateFeatures(Map, UpdateFeaturesOptions)}. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesResult.java index 6c484dc24d95b..9939b48fa975f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesResult.java @@ -16,9 +16,10 @@ */ package org.apache.kafka.clients.admin; -import java.util.Map; import org.apache.kafka.common.KafkaFuture; +import java.util.Map; + /** * The result of the {@link Admin#updateFeatures(Map, UpdateFeaturesOptions)} call. * diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java index 4963a49c351b0..0f5f4781080b2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java @@ -30,6 +30,7 @@ import org.apache.kafka.common.requests.WriteTxnMarkersRequest; import org.apache.kafka.common.requests.WriteTxnMarkersResponse; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.List; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java index 73e29275dfa08..92e724e74f5b9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.requests.OffsetFetchRequest.NoBatchedOffsetFetchRequestException; import org.apache.kafka.common.utils.ExponentialBackoff; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiLookupStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiLookupStrategy.java index ef1d4ba1460b8..084ae97d813b0 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiLookupStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiLookupStrategy.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import java.util.stream.Collectors; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.requests.AbstractRequest; import org.apache.kafka.common.requests.AbstractResponse; @@ -25,6 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java index 239f6eecef0d4..90b237aa749eb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java @@ -29,6 +29,7 @@ import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.Collections; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java index 56305db03d267..433d25e8e54ca 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategy.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.Collections; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandler.java index d918fd28aa135..5ef72f327d637 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandler.java @@ -16,15 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import static java.util.Collections.singleton; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; @@ -35,12 +26,22 @@ import org.apache.kafka.common.message.OffsetCommitResponseData.OffsetCommitResponseTopic; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.OffsetCommitRequest; import org.apache.kafka.common.requests.OffsetCommitResponse; -import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import static java.util.Collections.singleton; + public class AlterConsumerGroupOffsetsHandler extends AdminApiHandler.Batched> { private final CoordinatorKey groupId; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java index cffec69fd7814..46cba73e75a18 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategy.java @@ -27,6 +27,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.FindCoordinatorResponse; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.Collections; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java index b68334b55c8ae..ebafe634db627 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandler.java @@ -16,14 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.OffsetDeleteRequestData; @@ -32,12 +24,21 @@ import org.apache.kafka.common.message.OffsetDeleteRequestData.OffsetDeleteRequestTopicCollection; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.OffsetDeleteRequest; import org.apache.kafka.common.requests.OffsetDeleteResponse; -import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + public class DeleteConsumerGroupOffsetsHandler extends AdminApiHandler.Batched> { private final CoordinatorKey groupId; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java index c05a11b5cfb40..0d581243ddc7b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandler.java @@ -16,15 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import org.apache.kafka.common.Node; import org.apache.kafka.common.message.DeleteGroupsRequestData; import org.apache.kafka.common.message.DeleteGroupsResponseData.DeletableGroupResult; @@ -34,8 +25,18 @@ import org.apache.kafka.common.requests.DeleteGroupsResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + public class DeleteConsumerGroupsHandler extends AdminApiHandler.Batched { private final Logger log; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java index 9f40d19f00b48..836f2bc2a5910 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java @@ -16,13 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.kafka.clients.admin.DeletedRecords; import org.apache.kafka.clients.admin.RecordsToDelete; import org.apache.kafka.clients.admin.internals.AdminApiFuture.SimpleAdminApiFuture; @@ -40,8 +33,17 @@ import org.apache.kafka.common.requests.DeleteRecordsRequest; import org.apache.kafka.common.requests.DeleteRecordsResponse; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + public final class DeleteRecordsHandler extends Batched { private final Map recordsToDelete; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java index 184608ee95f91..a2531db90ae5e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandler.java @@ -16,18 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - import org.apache.kafka.clients.admin.ConsumerGroupDescription; import org.apache.kafka.clients.admin.MemberAssignment; import org.apache.kafka.clients.admin.MemberDescription; @@ -51,12 +39,25 @@ import org.apache.kafka.common.requests.DescribeGroupsRequest; import org.apache.kafka.common.requests.DescribeGroupsResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest; -import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; +import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + public class DescribeConsumerGroupsHandler implements AdminApiHandler { private final boolean includeAuthorizedOperations; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java index 8555bf59ab4ed..e4b203545bdae 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandler.java @@ -32,6 +32,7 @@ import org.apache.kafka.common.requests.DescribeProducersResponse; import org.apache.kafka.common.utils.CollectionUtils; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java index 4a3d7c0a05272..b68521bd0005a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandler.java @@ -31,6 +31,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java index 826db904a36d8..f2dea06c7b3af 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/FenceProducersHandler.java @@ -28,6 +28,7 @@ import org.apache.kafka.common.requests.InitProducerIdResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; + import org.slf4j.Logger; import java.util.Collection; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java index 8fee665ac3731..4c0e3db925404 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandler.java @@ -16,28 +16,29 @@ */ package org.apache.kafka.clients.admin.internals; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsSpec; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.OffsetFetchRequest; import org.apache.kafka.common.requests.OffsetFetchResponse; -import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + public class ListConsumerGroupOffsetsHandler implements AdminApiHandler> { private final boolean requireStable; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java index 960d953b584b3..0bb42ed7696e2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java @@ -16,15 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; import org.apache.kafka.clients.admin.ListOffsetsOptions; import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; import org.apache.kafka.clients.admin.internals.AdminApiFuture.SimpleAdminApiFuture; @@ -44,8 +35,19 @@ import org.apache.kafka.common.requests.ListOffsetsResponse; import org.apache.kafka.common.utils.CollectionUtils; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + public final class ListOffsetsHandler extends Batched { private final Map offsetTimestampsByPartition; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java index b77cf762e1b1d..56318fc0acc04 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandler.java @@ -27,6 +27,7 @@ import org.apache.kafka.common.requests.ListTransactionsRequest; import org.apache.kafka.common.requests.ListTransactionsResponse; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java index 2a2192a58a9a1..9d52327b3c4f4 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategy.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.Collections; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandler.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandler.java index 83aee36587d3a..21f1543d6553c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandler.java @@ -16,25 +16,26 @@ */ package org.apache.kafka.clients.admin.internals; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.kafka.common.Node; import org.apache.kafka.common.message.LeaveGroupRequestData.MemberIdentity; import org.apache.kafka.common.message.LeaveGroupResponseData.MemberResponse; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.LeaveGroupRequest; import org.apache.kafka.common.requests.LeaveGroupResponse; -import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + public class RemoveMembersFromConsumerGroupHandler extends AdminApiHandler.Batched> { private final CoordinatorKey groupId; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerPartitionAssignor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerPartitionAssignor.java index ed1871a3d8b8a..5c5e843d32e51 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerPartitionAssignor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerPartitionAssignor.java @@ -16,19 +16,20 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.common.Cluster; +import org.apache.kafka.common.Configurable; +import org.apache.kafka.common.KafkaException; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.utils.Utils; + import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Optional; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; -import org.apache.kafka.common.Cluster; -import org.apache.kafka.common.Configurable; -import org.apache.kafka.common.KafkaException; -import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.Utils; import static org.apache.kafka.clients.consumer.internals.AbstractStickyAssignor.DEFAULT_GENERATION; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRebalanceListener.java b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRebalanceListener.java index 8884c0393d608..914c0ab979f54 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRebalanceListener.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRebalanceListener.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.common.TopicPartition; + import java.time.Duration; import java.util.Collection; -import org.apache.kafka.common.TopicPartition; - /** * A callback interface that the user can implement to trigger custom actions when the set of partitions assigned to the * consumer changes. diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/CooperativeStickyAssignor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/CooperativeStickyAssignor.java index 42d52bd0ef80d..80cc8c0997706 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/CooperativeStickyAssignor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/CooperativeStickyAssignor.java @@ -16,6 +16,14 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.clients.consumer.internals.AbstractStickyAssignor; +import org.apache.kafka.common.PartitionInfo; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.protocol.types.Field; +import org.apache.kafka.common.protocol.types.Schema; +import org.apache.kafka.common.protocol.types.Struct; +import org.apache.kafka.common.protocol.types.Type; + import java.nio.ByteBuffer; import java.util.Arrays; import java.util.HashMap; @@ -24,13 +32,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.apache.kafka.clients.consumer.internals.AbstractStickyAssignor; -import org.apache.kafka.common.PartitionInfo; -import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.protocol.types.Field; -import org.apache.kafka.common.protocol.types.Schema; -import org.apache.kafka.common.protocol.types.Struct; -import org.apache.kafka.common.protocol.types.Type; /** * A cooperative version of the {@link AbstractStickyAssignor AbstractStickyAssignor}. This follows the same (sticky) diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index 40870146435f3..323d518ffb93e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -20,8 +20,8 @@ import org.apache.kafka.clients.consumer.internals.ConsumerDelegate; import org.apache.kafka.clients.consumer.internals.ConsumerDelegateCreator; import org.apache.kafka.clients.consumer.internals.ConsumerMetadata; -import org.apache.kafka.clients.consumer.internals.metrics.KafkaConsumerMetrics; import org.apache.kafka.clients.consumer.internals.SubscriptionState; +import org.apache.kafka.clients.consumer.internals.metrics.KafkaConsumerMetrics; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/StickyAssignor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/StickyAssignor.java index 0d3e4a256e2be..c7560ca389893 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/StickyAssignor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/StickyAssignor.java @@ -16,13 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; import org.apache.kafka.clients.consumer.internals.AbstractStickyAssignor; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.protocol.types.ArrayOf; @@ -32,6 +25,14 @@ import org.apache.kafka.common.protocol.types.Type; import org.apache.kafka.common.utils.CollectionUtils; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + /** *

The sticky assignor serves two purposes. First, it guarantees an assignment that is as balanced as possible, meaning either: *

    diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java index 7d99dbeb46b5c..f177dad62b97c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java @@ -72,6 +72,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import java.io.Closeable; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java index 73584ce06ff5a..8f5691d17c005 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java @@ -38,6 +38,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.helpers.MessageFormatter; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractPartitionAssignor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractPartitionAssignor.java index f6beb477f1595..c49239d86610c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractPartitionAssignor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractPartitionAssignor.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignor.java index 149a24901b1a4..966b44b59a6f5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignor.java @@ -16,6 +16,14 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.clients.consumer.internals.Utils.PartitionComparator; +import org.apache.kafka.common.Node; +import org.apache.kafka.common.PartitionInfo; +import org.apache.kafka.common.TopicPartition; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -33,12 +41,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; -import org.apache.kafka.clients.consumer.internals.Utils.PartitionComparator; -import org.apache.kafka.common.Node; -import org.apache.kafka.common.PartitionInfo; -import org.apache.kafka.common.TopicPartition; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Sticky assignment implementation used by {@link org.apache.kafka.clients.consumer.StickyAssignor} and diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java index fe47195f1bee3..d4265e72c04ab 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncClient.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.requests.AbstractRequest; import org.apache.kafka.common.requests.AbstractResponse; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; public abstract class AsyncClient { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java index 2e51b0404d52a..ad608468e784d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java @@ -72,11 +72,11 @@ import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; +import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.errors.FencedInstanceIdException; import org.apache.kafka.common.errors.InterruptException; import org.apache.kafka.common.errors.InvalidGroupIdException; import org.apache.kafka.common.errors.TimeoutException; -import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.internals.ClusterResourceListeners; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.metrics.MetricsReporter; @@ -89,6 +89,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import org.slf4j.event.Level; @@ -2019,4 +2020,3 @@ private void maybeUpdateSubscriptionMetadata() { } } } - diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java index e841c2be52aa6..814250e09491a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java @@ -45,6 +45,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java index 5244af9c827d5..2cba76588e5f0 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java @@ -37,6 +37,7 @@ import org.apache.kafka.common.utils.BufferSupplier; import org.apache.kafka.common.utils.CloseableIterator; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.io.Closeable; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java index bb4591d8192c8..785df2362ab9e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java @@ -66,6 +66,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import java.nio.ByteBuffer; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerInterceptors.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerInterceptors.java index 1c9d17a549d5d..c56ea1a03e979 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerInterceptors.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerInterceptors.java @@ -21,6 +21,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.TopicPartition; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMetrics.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMetrics.java index 7b552b1a05f0f..19e9a7e832094 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMetrics.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerMetrics.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.common.MetricNameTemplate; +import org.apache.kafka.common.metrics.Metrics; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.kafka.common.MetricNameTemplate; -import org.apache.kafka.common.metrics.Metrics; - public class ConsumerMetrics { public FetchMetricsRegistry fetcherMetrics; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java index 50c7eb5b0285b..1f07bbcaa2f9a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClient.java @@ -32,6 +32,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import java.io.Closeable; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java index 64bba14837aaa..a91ea11d2f332 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThread.java @@ -28,6 +28,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import java.io.Closeable; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerProtocol.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerProtocol.java index 640afc04fe313..aa9d0cc40e4fe 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerProtocol.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerProtocol.java @@ -25,8 +25,8 @@ import org.apache.kafka.common.protocol.MessageUtil; import org.apache.kafka.common.protocol.types.SchemaException; -import java.nio.ByteBuffer; import java.nio.BufferUnderflowException; +import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java index 1c055ba82f9ee..b42cf85a8602a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerRebalanceListenerInvoker.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.util.Optional; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerUtils.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerUtils.java index 5a7745b40dd0d..a8a409c6e996e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerUtils.java @@ -41,6 +41,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java index aba539b876326..5144b41f574aa 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManager.java @@ -28,6 +28,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest; import org.apache.kafka.common.requests.FindCoordinatorResponse; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.Objects; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java index a33a650d1f8d7..23adf9c9afaaa 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchBuffer.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.internals.IdempotentCloser; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import java.util.Collection; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java index 998136797b573..5dfa31248e34c 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchCollector.java @@ -29,6 +29,7 @@ import org.apache.kafka.common.requests.FetchResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.util.ArrayDeque; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchMetricsRegistry.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchMetricsRegistry.java index 289cbf01ee5cd..54dddf653ad52 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchMetricsRegistry.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/FetchMetricsRegistry.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.clients.consumer.internals; +import org.apache.kafka.common.MetricNameTemplate; + import java.util.Arrays; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.apache.kafka.common.MetricNameTemplate; - public class FetchMetricsRegistry { public MetricNameTemplate fetchSizeAvg; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java index 3c8a9c148db48..745bbfde99289 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.ApiVersions; +import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.clients.FetchSessionHandler; import org.apache.kafka.clients.NetworkClient; @@ -28,6 +28,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java index fdfd662ea4192..3dacbec8ae97b 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManager.java @@ -35,6 +35,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/LegacyKafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/LegacyKafkaConsumer.java index 641bc81d8a265..406f591f97a1f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/LegacyKafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/LegacyKafkaConsumer.java @@ -57,6 +57,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import org.slf4j.event.Level; @@ -86,12 +87,12 @@ import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.CONSUMER_METRIC_GROUP_PREFIX; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.DEFAULT_CLOSE_TIMEOUT_MS; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.THROW_ON_FETCH_STABLE_OFFSET_UNSUPPORTED; +import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.configuredConsumerInterceptors; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.createConsumerNetworkClient; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.createFetchMetricsManager; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.createLogContext; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.createMetrics; import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.createSubscriptionState; -import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.configuredConsumerInterceptors; import static org.apache.kafka.common.utils.Utils.closeQuietly; import static org.apache.kafka.common.utils.Utils.isBlank; import static org.apache.kafka.common.utils.Utils.swallow; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java index 14b03dc4b8896..9f0dfda6a2f3a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImpl.java @@ -40,6 +40,7 @@ import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java index ee17f3b5d5778..aeec93d93f131 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegate.java @@ -37,6 +37,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import java.io.IOException; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java index 33a05bdcf8958..f624941c525c1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcher.java @@ -37,6 +37,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import java.util.Collection; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java index ac5d8a4acff8b..f504c57b4aecc 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherUtils.java @@ -38,6 +38,7 @@ import org.apache.kafka.common.requests.OffsetsForLeaderEpochRequest; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsForLeaderEpochUtils.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsForLeaderEpochUtils.java index 4970446a3e58c..033daa098761d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsForLeaderEpochUtils.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsForLeaderEpochUtils.java @@ -28,6 +28,7 @@ import org.apache.kafka.common.requests.AbstractRequest; import org.apache.kafka.common.requests.OffsetsForLeaderEpochRequest; import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java index 22e56111b473c..b4f637141287d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManager.java @@ -39,6 +39,7 @@ import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestFuture.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestFuture.java index 9bba53e3d3d87..034efd4dba850 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestFuture.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestFuture.java @@ -20,9 +20,9 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.utils.Timer; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicReference; /** diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java index 874631db84ec7..d6a8a858bf20d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestManagers.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.io.Closeable; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java index 5db4add68b574..b509f675fc858 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/RequestState.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.utils.ExponentialBackoff; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; class RequestState { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SensorBuilder.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SensorBuilder.java index 901eb7b3de4ac..a2346a3b376bb 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SensorBuilder.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SensorBuilder.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.common.MetricNameTemplate; import org.apache.kafka.common.Metric; +import org.apache.kafka.common.MetricNameTemplate; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.metrics.stats.Avg; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java index 06183751f8af5..36f1bcb4aebc8 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java @@ -29,6 +29,7 @@ import org.apache.kafka.common.internals.PartitionStates; import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.EpochEndOffset; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.time.Duration; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java index df6b26227407e..f86457891e2cf 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcher.java @@ -32,6 +32,7 @@ import org.apache.kafka.common.utils.ExponentialBackoff; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Timer; + import org.slf4j.Logger; import java.util.Collections; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java index a555d6ce7f359..2d9cab0dd9686 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManager.java @@ -30,6 +30,7 @@ import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.util.Collections; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java index 1e082e11978be..d8fc13830f716 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import java.io.Closeable; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java index 9d0062f546fb8..1f5756de63e18 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessor.java @@ -28,6 +28,7 @@ import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.List; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java index 545a03df8b30d..9f91617c73579 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaper.java @@ -19,6 +19,7 @@ import org.apache.kafka.clients.consumer.internals.AsyncKafkaConsumer; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.time.Duration; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/UnsubscribeEvent.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/UnsubscribeEvent.java index 327feaa22f69b..87eef1afb8a2a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/UnsubscribeEvent.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/UnsubscribeEvent.java @@ -30,4 +30,3 @@ public UnsubscribeEvent(final long deadlineMs) { super(Type.UNSUBSCRIBE, deadlineMs); } } - diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java index 21476143199a0..b0b68aa098e49 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java @@ -75,6 +75,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import java.net.InetSocketAddress; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/Partitioner.java b/clients/src/main/java/org/apache/kafka/clients/producer/Partitioner.java index 233d701b40a17..bcfcb2db6468e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/Partitioner.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/Partitioner.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.clients.producer; -import org.apache.kafka.common.Configurable; import org.apache.kafka.common.Cluster; +import org.apache.kafka.common.Configurable; import java.io.Closeable; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/Producer.java b/clients/src/main/java/org/apache/kafka/clients/producer/Producer.java index 1cfa9dbc8f216..2579fa0eeb9f2 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/Producer.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/Producer.java @@ -17,10 +17,10 @@ package org.apache.kafka.clients.producer; import org.apache.kafka.clients.consumer.ConsumerGroupMetadata; +import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.PartitionInfo; -import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.ProducerFencedException; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java index a59ee81b4a9dc..acfb760fbab7e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java @@ -33,6 +33,7 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/RoundRobinPartitioner.java b/clients/src/main/java/org/apache/kafka/clients/producer/RoundRobinPartitioner.java index 7fe51a6e383a9..be2bc24a509c5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/RoundRobinPartitioner.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/RoundRobinPartitioner.java @@ -16,16 +16,16 @@ */ package org.apache.kafka.clients.producer; +import org.apache.kafka.common.Cluster; +import org.apache.kafka.common.PartitionInfo; +import org.apache.kafka.common.utils.Utils; + import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.kafka.common.Cluster; -import org.apache.kafka.common.PartitionInfo; -import org.apache.kafka.common.utils.Utils; - /** * The "Round-Robin" partitioner * diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/UniformStickyPartitioner.java b/clients/src/main/java/org/apache/kafka/clients/producer/UniformStickyPartitioner.java index 59e69c59215e4..d9faa5f162427 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/UniformStickyPartitioner.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/UniformStickyPartitioner.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.clients.producer; -import java.util.Map; - import org.apache.kafka.clients.producer.internals.StickyPartitionCache; import org.apache.kafka.common.Cluster; +import java.util.Map; + /** * @deprecated Since 3.3.0, in order to use default partitioning logic diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BufferPool.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BufferPool.java index 67cf485f81a55..be4e843946032 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BufferPool.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BufferPool.java @@ -16,13 +16,6 @@ */ package org.apache.kafka.clients.producer.internals; -import java.nio.ByteBuffer; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.ReentrantLock; - import org.apache.kafka.clients.producer.BufferExhaustedException; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.MetricName; @@ -31,6 +24,13 @@ import org.apache.kafka.common.metrics.stats.Meter; import org.apache.kafka.common.utils.Time; +import java.nio.ByteBuffer; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; + /** * A pool of ByteBuffers kept under a given memory limit. This class is fairly specific to the needs of the producer. In diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java index aec624b2de94d..98386324f7bda 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/BuiltInPartitioner.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import java.util.Arrays; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ErrorLoggingCallback.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ErrorLoggingCallback.java index eb645a729e4ce..9ed09af3c78af 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ErrorLoggingCallback.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ErrorLoggingCallback.java @@ -18,6 +18,7 @@ import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.RecordMetadata; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerBatch.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerBatch.java index e4eb406098520..f70c1a338148f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerBatch.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerBatch.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.producer.internals; -import java.util.OptionalInt; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.TopicPartition; @@ -34,6 +33,7 @@ import org.apache.kafka.common.requests.ProduceResponse; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,6 +44,7 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; +import java.util.OptionalInt; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerInterceptors.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerInterceptors.java index dd72409770f6c..75bf8485e4737 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerInterceptors.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerInterceptors.java @@ -22,6 +22,7 @@ import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.record.RecordBatch; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java index 7d29479ec318c..852657275f473 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetadata.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetrics.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetrics.java index ad270f61562b9..1a9028f5da9b1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetrics.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/ProducerMetrics.java @@ -16,15 +16,15 @@ */ package org.apache.kafka.clients.producer.internals; +import org.apache.kafka.common.MetricNameTemplate; +import org.apache.kafka.common.metrics.MetricConfig; +import org.apache.kafka.common.metrics.Metrics; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.kafka.common.MetricNameTemplate; -import org.apache.kafka.common.metrics.MetricConfig; -import org.apache.kafka.common.metrics.Metrics; - public class ProducerMetrics { public final SenderMetricsRegistry senderMetrics; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java index 0e7b4a9dc5437..39b61efa4a2c8 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java @@ -16,34 +16,17 @@ */ package org.apache.kafka.clients.producer.internals; -import java.nio.ByteBuffer; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Deque; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.OptionalInt; -import java.util.Set; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicInteger; - import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.MetadataSnapshot; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.RecordMetadata; -import org.apache.kafka.common.compress.Compression; -import org.apache.kafka.common.utils.ExponentialBackoff; -import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.metrics.Metrics; @@ -55,10 +38,28 @@ import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.utils.CopyOnWriteMap; +import org.apache.kafka.common.utils.ExponentialBackoff; import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; +import java.nio.ByteBuffer; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.OptionalInt; +import java.util.Set; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicInteger; + /** * This class acts as a queue that accumulates records into {@link MemoryRecords} * instances to be sent to the server. diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java index b1a3ab9e293a6..39f5616465154 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java @@ -16,10 +16,6 @@ */ package org.apache.kafka.clients.producer.internals; -import static org.apache.kafka.common.requests.ProduceResponse.INVALID_OFFSET; - -import java.util.Optional; -import java.util.Set; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.ClientRequest; import org.apache.kafka.clients.ClientResponse; @@ -59,6 +55,7 @@ import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.io.IOException; @@ -69,9 +66,13 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; +import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; +import static org.apache.kafka.common.requests.ProduceResponse.INVALID_OFFSET; + /** * The background thread that handles the sending of produce requests to the Kafka cluster. This thread makes metadata * requests to renew its view of the cluster and then sends produce requests to the appropriate nodes. diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/SenderMetricsRegistry.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/SenderMetricsRegistry.java index 4880f1b05e814..f381e6948ddc0 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/SenderMetricsRegistry.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/SenderMetricsRegistry.java @@ -16,18 +16,18 @@ */ package org.apache.kafka.clients.producer.internals; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.kafka.common.MetricName; import org.apache.kafka.common.MetricNameTemplate; import org.apache.kafka.common.metrics.Measurable; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.metrics.Sensor; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + public class SenderMetricsRegistry { static final String TOPIC_METRIC_GROUP_NAME = "producer-topic-metrics"; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/StickyPartitionCache.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/StickyPartitionCache.java index f6312fda1b2e9..1a00473f06e8a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/StickyPartitionCache.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/StickyPartitionCache.java @@ -18,12 +18,12 @@ import org.apache.kafka.common.Cluster; import org.apache.kafka.common.PartitionInfo; +import org.apache.kafka.common.utils.Utils; import java.util.List; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentHashMap; -import org.apache.kafka.common.utils.Utils; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ThreadLocalRandom; /** * An internal class that implements a cache used for sticky partitioning behavior. The cache tracks the current sticky diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java index 6d3eb48a833b2..48bf291fbcfb0 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java @@ -69,6 +69,7 @@ import org.apache.kafka.common.requests.TxnOffsetCommitResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionEntry.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionEntry.java index 35684ea54cca4..963197cccd062 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionEntry.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionEntry.java @@ -17,17 +17,18 @@ package org.apache.kafka.clients.producer.internals; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.record.DefaultRecordBatch; +import org.apache.kafka.common.requests.ProduceResponse; +import org.apache.kafka.common.utils.PrimitiveRef; +import org.apache.kafka.common.utils.ProducerIdAndEpoch; + import java.util.Comparator; import java.util.OptionalInt; import java.util.OptionalLong; import java.util.SortedSet; import java.util.TreeSet; import java.util.function.Consumer; -import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.record.DefaultRecordBatch; -import org.apache.kafka.common.requests.ProduceResponse; -import org.apache.kafka.common.utils.PrimitiveRef; -import org.apache.kafka.common.utils.ProducerIdAndEpoch; class TxnPartitionEntry { static final int NO_LAST_ACKED_SEQUENCE_NUMBER = -1; diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java index 3b3a711990822..05a0fa3fbbc30 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/TxnPartitionMap.java @@ -17,17 +17,18 @@ package org.apache.kafka.clients.producer.internals; -import java.util.HashMap; -import java.util.Map; -import java.util.OptionalInt; -import java.util.OptionalLong; - import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.requests.ProduceResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; + import org.slf4j.Logger; +import java.util.HashMap; +import java.util.Map; +import java.util.OptionalInt; +import java.util.OptionalLong; + class TxnPartitionMap { private final Logger log; diff --git a/clients/src/main/java/org/apache/kafka/common/Endpoint.java b/clients/src/main/java/org/apache/kafka/common/Endpoint.java index 2353de26ec4df..8d5e8c6d16a55 100644 --- a/clients/src/main/java/org/apache/kafka/common/Endpoint.java +++ b/clients/src/main/java/org/apache/kafka/common/Endpoint.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common; -import java.util.Objects; -import java.util.Optional; - import org.apache.kafka.common.annotation.InterfaceStability; import org.apache.kafka.common.security.auth.SecurityProtocol; +import java.util.Objects; +import java.util.Optional; + /** * Represents a broker endpoint. */ diff --git a/clients/src/main/java/org/apache/kafka/common/MessageFormatter.java b/clients/src/main/java/org/apache/kafka/common/MessageFormatter.java index 390aa61ca7250..4b04255ba384c 100644 --- a/clients/src/main/java/org/apache/kafka/common/MessageFormatter.java +++ b/clients/src/main/java/org/apache/kafka/common/MessageFormatter.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common; +import org.apache.kafka.clients.consumer.ConsumerRecord; + import java.io.Closeable; import java.io.PrintStream; import java.util.Map; -import org.apache.kafka.clients.consumer.ConsumerRecord; - /** * This interface allows to define Formatters that can be used to parse and format records read by a * Consumer instance for display. diff --git a/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockInputStream.java b/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockInputStream.java index 75576eedb5d75..f33f37492dde0 100644 --- a/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockInputStream.java +++ b/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockInputStream.java @@ -16,6 +16,10 @@ */ package org.apache.kafka.common.compress; +import org.apache.kafka.common.compress.Lz4BlockOutputStream.BD; +import org.apache.kafka.common.compress.Lz4BlockOutputStream.FLG; +import org.apache.kafka.common.utils.BufferSupplier; + import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4Exception; import net.jpountz.lz4.LZ4Factory; @@ -23,10 +27,6 @@ import net.jpountz.xxhash.XXHash32; import net.jpountz.xxhash.XXHashFactory; -import org.apache.kafka.common.compress.Lz4BlockOutputStream.BD; -import org.apache.kafka.common.compress.Lz4BlockOutputStream.FLG; -import org.apache.kafka.common.utils.BufferSupplier; - import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; diff --git a/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockOutputStream.java b/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockOutputStream.java index 0f1d213f50e36..e55b84e286c18 100644 --- a/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockOutputStream.java +++ b/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockOutputStream.java @@ -16,9 +16,6 @@ */ package org.apache.kafka.common.compress; -import java.io.IOException; -import java.io.OutputStream; - import org.apache.kafka.common.utils.ByteUtils; import net.jpountz.lz4.LZ4Compressor; @@ -26,6 +23,9 @@ import net.jpountz.xxhash.XXHash32; import net.jpountz.xxhash.XXHashFactory; +import java.io.IOException; +import java.io.OutputStream; + /** * A partial implementation of the v1.5.1 LZ4 Frame format. * diff --git a/clients/src/main/java/org/apache/kafka/common/compress/SnappyCompression.java b/clients/src/main/java/org/apache/kafka/common/compress/SnappyCompression.java index 3ec09f2355935..f79328d80470e 100644 --- a/clients/src/main/java/org/apache/kafka/common/compress/SnappyCompression.java +++ b/clients/src/main/java/org/apache/kafka/common/compress/SnappyCompression.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.utils.ByteBufferInputStream; import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.ChunkedBytesStream; + import org.xerial.snappy.SnappyInputStream; import org.xerial.snappy.SnappyOutputStream; diff --git a/clients/src/main/java/org/apache/kafka/common/compress/ZstdCompression.java b/clients/src/main/java/org/apache/kafka/common/compress/ZstdCompression.java index 0664fd2dbb02c..4ddf23e78ded7 100644 --- a/clients/src/main/java/org/apache/kafka/common/compress/ZstdCompression.java +++ b/clients/src/main/java/org/apache/kafka/common/compress/ZstdCompression.java @@ -17,11 +17,6 @@ package org.apache.kafka.common.compress; -import com.github.luben.zstd.BufferPool; -import com.github.luben.zstd.RecyclingBufferPool; -import com.github.luben.zstd.Zstd; -import com.github.luben.zstd.ZstdInputStreamNoFinalizer; -import com.github.luben.zstd.ZstdOutputStreamNoFinalizer; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.record.CompressionType; import org.apache.kafka.common.utils.BufferSupplier; @@ -29,6 +24,12 @@ import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.ChunkedBytesStream; +import com.github.luben.zstd.BufferPool; +import com.github.luben.zstd.RecyclingBufferPool; +import com.github.luben.zstd.Zstd; +import com.github.luben.zstd.ZstdInputStreamNoFinalizer; +import com.github.luben.zstd.ZstdOutputStreamNoFinalizer; + import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java index f7632c8ca56df..247bab18d5565 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java +++ b/clients/src/main/java/org/apache/kafka/common/config/AbstractConfig.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.config.provider.ConfigProvider; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/config/SslConfigs.java b/clients/src/main/java/org/apache/kafka/common/config/SslConfigs.java index bdf8bc1da78a3..892bcc847fb67 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/SslConfigs.java +++ b/clients/src/main/java/org/apache/kafka/common/config/SslConfigs.java @@ -20,9 +20,10 @@ import org.apache.kafka.common.utils.Java; import org.apache.kafka.common.utils.Utils; +import java.util.Set; + import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.TrustManagerFactory; -import java.util.Set; public class SslConfigs { /* diff --git a/clients/src/main/java/org/apache/kafka/common/config/provider/DirectoryConfigProvider.java b/clients/src/main/java/org/apache/kafka/common/config/provider/DirectoryConfigProvider.java index 2baf15a35c577..86f991bf7a625 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/provider/DirectoryConfigProvider.java +++ b/clients/src/main/java/org/apache/kafka/common/config/provider/DirectoryConfigProvider.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.config.ConfigData; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.config.internals.AllowedPaths; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/config/provider/EnvVarConfigProvider.java b/clients/src/main/java/org/apache/kafka/common/config/provider/EnvVarConfigProvider.java index 40c7edb50f1e1..309811dbb38d5 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/provider/EnvVarConfigProvider.java +++ b/clients/src/main/java/org/apache/kafka/common/config/provider/EnvVarConfigProvider.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.config.ConfigData; import org.apache.kafka.common.config.ConfigException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/config/provider/FileConfigProvider.java b/clients/src/main/java/org/apache/kafka/common/config/provider/FileConfigProvider.java index 170ebd933c8a4..a96c761c986f1 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/provider/FileConfigProvider.java +++ b/clients/src/main/java/org/apache/kafka/common/config/provider/FileConfigProvider.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.config.ConfigData; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.config.internals.AllowedPaths; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/errors/InvalidTxnTimeoutException.java b/clients/src/main/java/org/apache/kafka/common/errors/InvalidTxnTimeoutException.java index f16af66da7c12..b2d8428fc874f 100644 --- a/clients/src/main/java/org/apache/kafka/common/errors/InvalidTxnTimeoutException.java +++ b/clients/src/main/java/org/apache/kafka/common/errors/InvalidTxnTimeoutException.java @@ -31,4 +31,3 @@ public InvalidTxnTimeoutException(String message) { super(message); } } - diff --git a/clients/src/main/java/org/apache/kafka/common/errors/RecordBatchTooLargeException.java b/clients/src/main/java/org/apache/kafka/common/errors/RecordBatchTooLargeException.java index b1ef77d4b93a4..d1ba8ff716095 100644 --- a/clients/src/main/java/org/apache/kafka/common/errors/RecordBatchTooLargeException.java +++ b/clients/src/main/java/org/apache/kafka/common/errors/RecordBatchTooLargeException.java @@ -40,4 +40,3 @@ public RecordBatchTooLargeException(Throwable cause) { } } - diff --git a/clients/src/main/java/org/apache/kafka/common/errors/TelemetryTooLargeException.java b/clients/src/main/java/org/apache/kafka/common/errors/TelemetryTooLargeException.java index 4be6ef50a4b83..75c9759953767 100644 --- a/clients/src/main/java/org/apache/kafka/common/errors/TelemetryTooLargeException.java +++ b/clients/src/main/java/org/apache/kafka/common/errors/TelemetryTooLargeException.java @@ -25,4 +25,3 @@ public TelemetryTooLargeException(String message) { super(message); } } - diff --git a/clients/src/main/java/org/apache/kafka/common/errors/UnknownSubscriptionIdException.java b/clients/src/main/java/org/apache/kafka/common/errors/UnknownSubscriptionIdException.java index e2041db0ed9d1..f7aa6b07f0f93 100644 --- a/clients/src/main/java/org/apache/kafka/common/errors/UnknownSubscriptionIdException.java +++ b/clients/src/main/java/org/apache/kafka/common/errors/UnknownSubscriptionIdException.java @@ -25,4 +25,3 @@ public UnknownSubscriptionIdException(String message) { super(message); } } - diff --git a/clients/src/main/java/org/apache/kafka/common/feature/BaseVersionRange.java b/clients/src/main/java/org/apache/kafka/common/feature/BaseVersionRange.java index 8c31e64cc5140..bc1121ba39526 100644 --- a/clients/src/main/java/org/apache/kafka/common/feature/BaseVersionRange.java +++ b/clients/src/main/java/org/apache/kafka/common/feature/BaseVersionRange.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.feature; -import static java.util.stream.Collectors.joining; +import org.apache.kafka.common.utils.Utils; import java.util.Map; import java.util.Objects; -import org.apache.kafka.common.utils.Utils; +import static java.util.stream.Collectors.joining; /** * Represents an immutable basic version range using 2 attributes: min and max, each of type short. diff --git a/clients/src/main/java/org/apache/kafka/common/feature/Features.java b/clients/src/main/java/org/apache/kafka/common/feature/Features.java index a39ee37e53dca..b2f0543faf0a5 100644 --- a/clients/src/main/java/org/apache/kafka/common/feature/Features.java +++ b/clients/src/main/java/org/apache/kafka/common/feature/Features.java @@ -18,8 +18,8 @@ import java.util.HashMap; import java.util.Map; -import java.util.stream.Collectors; import java.util.Objects; +import java.util.stream.Collectors; import static java.util.stream.Collectors.joining; diff --git a/clients/src/main/java/org/apache/kafka/common/header/internals/RecordHeader.java b/clients/src/main/java/org/apache/kafka/common/header/internals/RecordHeader.java index 2a29d9da28ece..e1ce6ad01a5bb 100644 --- a/clients/src/main/java/org/apache/kafka/common/header/internals/RecordHeader.java +++ b/clients/src/main/java/org/apache/kafka/common/header/internals/RecordHeader.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.common.header.internals; +import org.apache.kafka.common.header.Header; +import org.apache.kafka.common.utils.Utils; + import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Objects; -import org.apache.kafka.common.header.Header; -import org.apache.kafka.common.utils.Utils; - public class RecordHeader implements Header { private ByteBuffer keyBuffer; private String key; diff --git a/clients/src/main/java/org/apache/kafka/common/internals/KafkaFutureImpl.java b/clients/src/main/java/org/apache/kafka/common/internals/KafkaFutureImpl.java index 711bd25292228..fbcde6a1e24cd 100644 --- a/clients/src/main/java/org/apache/kafka/common/internals/KafkaFutureImpl.java +++ b/clients/src/main/java/org/apache/kafka/common/internals/KafkaFutureImpl.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.common.internals; +import org.apache.kafka.common.KafkaFuture; + import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; @@ -24,8 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.kafka.common.KafkaFuture; - /** * A flexible future which supports call chaining and other asynchronous programming patterns. */ diff --git a/clients/src/main/java/org/apache/kafka/common/memory/SimpleMemoryPool.java b/clients/src/main/java/org/apache/kafka/common/memory/SimpleMemoryPool.java index f1ab8f71854e7..843365a1087f4 100644 --- a/clients/src/main/java/org/apache/kafka/common/memory/SimpleMemoryPool.java +++ b/clients/src/main/java/org/apache/kafka/common/memory/SimpleMemoryPool.java @@ -16,14 +16,15 @@ */ package org.apache.kafka.common.memory; -import java.nio.ByteBuffer; -import java.util.concurrent.atomic.AtomicLong; - import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.nio.ByteBuffer; +import java.util.concurrent.atomic.AtomicLong; + /** * a simple pool implementation. this implementation just provides a limit on the total outstanding memory. diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java b/clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java index f8d5ad185f115..38d8dcfababec 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java @@ -22,9 +22,20 @@ import org.apache.kafka.common.utils.ConfigUtils; import org.apache.kafka.common.utils.Sanitizer; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.management.ManagementFactory; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Predicate; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; + import javax.management.Attribute; import javax.management.AttributeList; import javax.management.AttributeNotFoundException; @@ -35,15 +46,6 @@ import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import java.lang.management.ManagementFactory; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Predicate; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; /** * Register metrics in JMX as dynamic mbeans based on the metric names diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java b/clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java index 9e987aaedaed6..02a48f8d11539 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/Metrics.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.metrics.internals.MetricsUtils; import org.apache.kafka.common.utils.KafkaThread; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/MetricsReporter.java b/clients/src/main/java/org/apache/kafka/common/metrics/MetricsReporter.java index e9b4582096dd1..74ab062bbd714 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/MetricsReporter.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/MetricsReporter.java @@ -16,15 +16,15 @@ */ package org.apache.kafka.common.metrics; +import org.apache.kafka.common.Reconfigurable; +import org.apache.kafka.common.annotation.InterfaceStability; +import org.apache.kafka.common.config.ConfigException; + import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.kafka.common.Reconfigurable; -import org.apache.kafka.common.annotation.InterfaceStability; -import org.apache.kafka.common.config.ConfigException; - /** * A plugin interface to allow things to listen as new metrics are created so they can be reported. *

    diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/Sensor.java b/clients/src/main/java/org/apache/kafka/common/metrics/Sensor.java index 25f3c21a31365..b0761248894c5 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/Sensor.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/Sensor.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.metrics; -import java.util.function.Supplier; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.CompoundStat.NamedMeasurable; import org.apache.kafka.common.metrics.stats.TokenBucket; @@ -31,6 +30,7 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java b/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java index cd52759a39069..61ff49b0adfcc 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/internals/IntGaugeSuite.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.MetricValueProvider; import org.apache.kafka.common.metrics.Metrics; + import org.slf4j.Logger; import java.util.HashMap; diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Avg.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Avg.java index 4e6c3372575fc..f7c20eb15822d 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Avg.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Avg.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.metrics.stats; -import java.util.List; - import org.apache.kafka.common.metrics.MetricConfig; +import java.util.List; + /** * A {@link SampledStat} that maintains a simple average over its samples. */ @@ -46,4 +46,3 @@ public double combine(List samples, MetricConfig config, long now) { } } - diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Max.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Max.java index d91bf4099c174..6521a42324e71 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Max.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Max.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.metrics.stats; -import java.util.List; - import org.apache.kafka.common.metrics.MetricConfig; +import java.util.List; + /** * A {@link SampledStat} that gives the max over its samples. */ diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Meter.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Meter.java index 0eec0c42626a8..d97a7d39e6215 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Meter.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Meter.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.metrics.stats; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.TimeUnit; - import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.CompoundStat; import org.apache.kafka.common.metrics.MetricConfig; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.TimeUnit; + /** * A compound stat that includes a rate metric and a cumulative total metric. diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Min.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Min.java index 3b9925a0d1b45..05f20190634f5 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Min.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Min.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.metrics.stats; -import java.util.List; - import org.apache.kafka.common.metrics.MetricConfig; +import java.util.List; + /** * A {@link SampledStat} that gives the min over its samples. */ diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java index 4cdc2ce9ce12d..c7c882496bf8e 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Percentiles.java @@ -16,17 +16,18 @@ */ package org.apache.kafka.common.metrics.stats; -import java.util.ArrayList; -import java.util.List; - import org.apache.kafka.common.metrics.CompoundStat; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.stats.Histogram.BinScheme; import org.apache.kafka.common.metrics.stats.Histogram.ConstantBinScheme; import org.apache.kafka.common.metrics.stats.Histogram.LinearBinScheme; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; + /** * A compound stat that reports one or more percentiles */ diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Rate.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Rate.java index 4f15bb9607e1e..0db65ee3adb3a 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Rate.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Rate.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.metrics.stats; -import java.util.Locale; -import java.util.concurrent.TimeUnit; - import org.apache.kafka.common.metrics.MeasurableStat; import org.apache.kafka.common.metrics.MetricConfig; +import java.util.Locale; +import java.util.concurrent.TimeUnit; + import static org.apache.kafka.common.metrics.internals.MetricsUtils.convert; /** diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/SampledStat.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/SampledStat.java index f76fccc853bfa..b110feec949e1 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/SampledStat.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/SampledStat.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.metrics.stats; -import java.util.ArrayList; -import java.util.List; - import org.apache.kafka.common.metrics.MeasurableStat; import org.apache.kafka.common.metrics.MetricConfig; +import java.util.ArrayList; +import java.util.List; + /** * A SampledStat records a single scalar value measured over one or more samples. Each sample is recorded over a * configurable window. The window can be defined by number of events or elapsed time (or both, if both are given the diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/TokenBucket.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/TokenBucket.java index c86ff51548777..b2fe5a6983a16 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/TokenBucket.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/TokenBucket.java @@ -16,11 +16,12 @@ */ package org.apache.kafka.common.metrics.stats; -import java.util.concurrent.TimeUnit; import org.apache.kafka.common.metrics.MeasurableStat; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Quota; +import java.util.concurrent.TimeUnit; + import static org.apache.kafka.common.metrics.internals.MetricsUtils.convert; /** diff --git a/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilder.java b/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilder.java index f262b2ed1d9ae..2da0c3d942e84 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilder.java +++ b/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilder.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.network; -import java.nio.channels.SelectionKey; - -import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Configurable; +import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.memory.MemoryPool; +import java.nio.channels.SelectionKey; + /** * A ChannelBuilder interface to build Channel based on configs diff --git a/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilders.java b/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilders.java index b2760ae452d01..f393db85c93ec 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilders.java +++ b/clients/src/main/java/org/apache/kafka/common/network/ChannelBuilders.java @@ -22,17 +22,18 @@ import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; import org.apache.kafka.common.errors.InvalidConfigurationException; import org.apache.kafka.common.requests.ApiVersionsResponse; -import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.security.JaasContext; -import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder; import org.apache.kafka.common.security.auth.KafkaPrincipalBuilder; +import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.security.authenticator.CredentialCache; +import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder; import org.apache.kafka.common.security.kerberos.KerberosShortNamer; import org.apache.kafka.common.security.ssl.SslPrincipalMapper; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/network/NetworkReceive.java b/clients/src/main/java/org/apache/kafka/common/network/NetworkReceive.java index f6d08cf154f21..3a67ce077a6a3 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/NetworkReceive.java +++ b/clients/src/main/java/org/apache/kafka/common/network/NetworkReceive.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.network; import org.apache.kafka.common.memory.MemoryPool; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/network/PlaintextTransportLayer.java b/clients/src/main/java/org/apache/kafka/common/network/PlaintextTransportLayer.java index 5af796af18047..b4fcdbd025923 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/PlaintextTransportLayer.java +++ b/clients/src/main/java/org/apache/kafka/common/network/PlaintextTransportLayer.java @@ -20,16 +20,15 @@ * Transport layer for PLAINTEXT communication */ +import org.apache.kafka.common.security.auth.KafkaPrincipal; + import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import java.nio.channels.SocketChannel; import java.nio.channels.SelectionKey; - +import java.nio.channels.SocketChannel; import java.security.Principal; -import org.apache.kafka.common.security.auth.KafkaPrincipal; - public class PlaintextTransportLayer implements TransportLayer { private final SelectionKey key; private final SocketChannel socketChannel; diff --git a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java index 1f91fb8d90ec0..8ed333d24d559 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SaslChannelBuilder.java @@ -51,6 +51,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; @@ -59,8 +60,6 @@ import org.ietf.jgss.Oid; import org.slf4j.Logger; -import javax.security.auth.Subject; -import javax.security.auth.kerberos.KerberosPrincipal; import java.io.IOException; import java.net.Socket; import java.nio.channels.SelectionKey; @@ -72,6 +71,9 @@ import java.util.Set; import java.util.function.Supplier; +import javax.security.auth.Subject; +import javax.security.auth.kerberos.KerberosPrincipal; + public class SaslChannelBuilder implements ChannelBuilder, ListenerReconfigurable { static final String GSS_NATIVE_PROP = "sun.security.jgss.native"; diff --git a/clients/src/main/java/org/apache/kafka/common/network/Selector.java b/clients/src/main/java/org/apache/kafka/common/network/Selector.java index c2ffadf73ca1b..052dc5c8b454d 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/Selector.java +++ b/clients/src/main/java/org/apache/kafka/common/network/Selector.java @@ -32,6 +32,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import java.io.IOException; diff --git a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java index ef7f137e3660c..d047c79ce8a1c 100644 --- a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java +++ b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java @@ -16,15 +16,24 @@ */ package org.apache.kafka.common.network; -import java.io.IOException; +import org.apache.kafka.common.errors.SslAuthenticationException; +import org.apache.kafka.common.security.auth.KafkaPrincipal; +import org.apache.kafka.common.utils.ByteBufferUnmapper; +import org.apache.kafka.common.utils.ByteUtils; +import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.Utils; + +import org.slf4j.Logger; + import java.io.EOFException; +import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.channels.CancelledKeyException; import java.nio.channels.FileChannel; -import java.nio.channels.SocketChannel; import java.nio.channels.SelectionKey; -import java.nio.channels.CancelledKeyException; - +import java.nio.channels.SocketChannel; import java.security.Principal; + import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLEngineResult.HandshakeStatus; @@ -36,14 +45,6 @@ import javax.net.ssl.SSLProtocolException; import javax.net.ssl.SSLSession; -import org.apache.kafka.common.errors.SslAuthenticationException; -import org.apache.kafka.common.security.auth.KafkaPrincipal; -import org.apache.kafka.common.utils.ByteUtils; -import org.apache.kafka.common.utils.LogContext; -import org.apache.kafka.common.utils.ByteBufferUnmapper; -import org.apache.kafka.common.utils.Utils; -import org.slf4j.Logger; - /* * Transport layer for SSL communication * diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java index 10ae05aa850c9..cba3e439acfad 100644 --- a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java +++ b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java @@ -20,7 +20,6 @@ import org.apache.kafka.common.errors.ApiException; import org.apache.kafka.common.errors.BrokerIdNotRegisteredException; import org.apache.kafka.common.errors.BrokerNotAvailableException; -import org.apache.kafka.common.errors.TelemetryTooLargeException; import org.apache.kafka.common.errors.ClusterAuthorizationException; import org.apache.kafka.common.errors.ConcurrentTransactionsException; import org.apache.kafka.common.errors.ControllerMovedException; @@ -51,10 +50,10 @@ import org.apache.kafka.common.errors.GroupSubscribedToTopicException; import org.apache.kafka.common.errors.IllegalGenerationException; import org.apache.kafka.common.errors.IllegalSaslStateException; +import org.apache.kafka.common.errors.InconsistentClusterIdException; import org.apache.kafka.common.errors.InconsistentGroupProtocolException; import org.apache.kafka.common.errors.InconsistentTopicIdException; import org.apache.kafka.common.errors.InconsistentVoterSetException; -import org.apache.kafka.common.errors.InconsistentClusterIdException; import org.apache.kafka.common.errors.IneligibleReplicaException; import org.apache.kafka.common.errors.InvalidCommitOffsetSizeException; import org.apache.kafka.common.errors.InvalidConfigurationException; @@ -93,9 +92,9 @@ import org.apache.kafka.common.errors.NotEnoughReplicasException; import org.apache.kafka.common.errors.NotLeaderOrFollowerException; import org.apache.kafka.common.errors.OffsetMetadataTooLarge; +import org.apache.kafka.common.errors.OffsetMovedToTieredStorageException; import org.apache.kafka.common.errors.OffsetNotAvailableException; import org.apache.kafka.common.errors.OffsetOutOfRangeException; -import org.apache.kafka.common.errors.OffsetMovedToTieredStorageException; import org.apache.kafka.common.errors.OperationNotAttemptedException; import org.apache.kafka.common.errors.OutOfOrderSequenceException; import org.apache.kafka.common.errors.PolicyViolationException; @@ -116,21 +115,23 @@ import org.apache.kafka.common.errors.SnapshotNotFoundException; import org.apache.kafka.common.errors.StaleBrokerEpochException; import org.apache.kafka.common.errors.StaleMemberEpochException; +import org.apache.kafka.common.errors.TelemetryTooLargeException; import org.apache.kafka.common.errors.ThrottlingQuotaExceededException; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.TopicAuthorizationException; import org.apache.kafka.common.errors.TopicDeletionDisabledException; import org.apache.kafka.common.errors.TopicExistsException; +import org.apache.kafka.common.errors.TransactionAbortableException; import org.apache.kafka.common.errors.TransactionCoordinatorFencedException; import org.apache.kafka.common.errors.TransactionalIdAuthorizationException; import org.apache.kafka.common.errors.TransactionalIdNotFoundException; -import org.apache.kafka.common.errors.UnknownSubscriptionIdException; import org.apache.kafka.common.errors.UnacceptableCredentialException; import org.apache.kafka.common.errors.UnknownControllerIdException; import org.apache.kafka.common.errors.UnknownLeaderEpochException; import org.apache.kafka.common.errors.UnknownMemberIdException; import org.apache.kafka.common.errors.UnknownProducerIdException; import org.apache.kafka.common.errors.UnknownServerException; +import org.apache.kafka.common.errors.UnknownSubscriptionIdException; import org.apache.kafka.common.errors.UnknownTopicIdException; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.errors.UnreleasedInstanceIdException; @@ -142,7 +143,7 @@ import org.apache.kafka.common.errors.UnsupportedForMessageFormatException; import org.apache.kafka.common.errors.UnsupportedSaslMechanismException; import org.apache.kafka.common.errors.UnsupportedVersionException; -import org.apache.kafka.common.errors.TransactionAbortableException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/MessageUtil.java b/clients/src/main/java/org/apache/kafka/common/protocol/MessageUtil.java index 95bc01945ec7c..ab6600a7d059f 100644 --- a/clients/src/main/java/org/apache/kafka/common/protocol/MessageUtil.java +++ b/clients/src/main/java/org/apache/kafka/common/protocol/MessageUtil.java @@ -17,10 +17,11 @@ package org.apache.kafka.common.protocol; -import com.fasterxml.jackson.databind.JsonNode; import org.apache.kafka.common.protocol.types.RawTaggedField; import org.apache.kafka.common.utils.Utils; +import com.fasterxml.jackson.databind.JsonNode; + import java.io.IOException; import java.io.UncheckedIOException; import java.nio.ByteBuffer; diff --git a/clients/src/main/java/org/apache/kafka/common/record/ControlRecordType.java b/clients/src/main/java/org/apache/kafka/common/record/ControlRecordType.java index 8d0bbdba9eaa7..242278f628b8f 100644 --- a/clients/src/main/java/org/apache/kafka/common/record/ControlRecordType.java +++ b/clients/src/main/java/org/apache/kafka/common/record/ControlRecordType.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.protocol.types.Schema; import org.apache.kafka.common.protocol.types.Struct; import org.apache.kafka.common.protocol.types.Type; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/record/EndTransactionMarker.java b/clients/src/main/java/org/apache/kafka/common/record/EndTransactionMarker.java index 4bf1ebf94a098..9e7225c21106d 100644 --- a/clients/src/main/java/org/apache/kafka/common/record/EndTransactionMarker.java +++ b/clients/src/main/java/org/apache/kafka/common/record/EndTransactionMarker.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.protocol.types.Schema; import org.apache.kafka.common.protocol.types.Struct; import org.apache.kafka.common.protocol.types.Type; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/record/FileLogInputStream.java b/clients/src/main/java/org/apache/kafka/common/record/FileLogInputStream.java index 10837d650a6d1..bd966e79f032d 100644 --- a/clients/src/main/java/org/apache/kafka/common/record/FileLogInputStream.java +++ b/clients/src/main/java/org/apache/kafka/common/record/FileLogInputStream.java @@ -30,8 +30,8 @@ import java.util.Iterator; import java.util.Objects; -import static org.apache.kafka.common.record.Records.LOG_OVERHEAD; import static org.apache.kafka.common.record.Records.HEADER_SIZE_UP_TO_MAGIC; +import static org.apache.kafka.common.record.Records.LOG_OVERHEAD; import static org.apache.kafka.common.record.Records.MAGIC_OFFSET; import static org.apache.kafka.common.record.Records.OFFSET_OFFSET; import static org.apache.kafka.common.record.Records.SIZE_OFFSET; diff --git a/clients/src/main/java/org/apache/kafka/common/record/LegacyRecord.java b/clients/src/main/java/org/apache/kafka/common/record/LegacyRecord.java index 58fe9a0c9008a..e14a92d86511c 100644 --- a/clients/src/main/java/org/apache/kafka/common/record/LegacyRecord.java +++ b/clients/src/main/java/org/apache/kafka/common/record/LegacyRecord.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.record; -import java.util.zip.CRC32; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.utils.ByteBufferOutputStream; @@ -27,6 +26,7 @@ import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; +import java.util.zip.CRC32; import static org.apache.kafka.common.utils.Utils.wrapNullable; diff --git a/clients/src/main/java/org/apache/kafka/common/record/MemoryRecords.java b/clients/src/main/java/org/apache/kafka/common/record/MemoryRecords.java index ddf7b389d06e5..c01bca2496ed1 100644 --- a/clients/src/main/java/org/apache/kafka/common/record/MemoryRecords.java +++ b/clients/src/main/java/org/apache/kafka/common/record/MemoryRecords.java @@ -32,8 +32,8 @@ import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.CloseableIterator; import org.apache.kafka.common.utils.Time; - import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/record/Record.java b/clients/src/main/java/org/apache/kafka/common/record/Record.java index 4a387f74359b5..3b041cc501307 100644 --- a/clients/src/main/java/org/apache/kafka/common/record/Record.java +++ b/clients/src/main/java/org/apache/kafka/common/record/Record.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.record; -import java.nio.ByteBuffer; - import org.apache.kafka.common.header.Header; +import java.nio.ByteBuffer; + /** * A log record is a tuple consisting of a unique offset in the log, a sequence number assigned by * the producer, a timestamp, a key and a value. diff --git a/clients/src/main/java/org/apache/kafka/common/requests/AddPartitionsToTxnRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/AddPartitionsToTxnRequest.java index b83e997b199d1..1ae84c20c6145 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/AddPartitionsToTxnRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/AddPartitionsToTxnRequest.java @@ -19,9 +19,9 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTopic; +import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTopicCollection; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTransaction; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTransactionCollection; -import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTopicCollection; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnPartitionResult; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnPartitionResultCollection; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/AddPartitionsToTxnResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/AddPartitionsToTxnResponse.java index 645a03038a8c5..0abf85bf0239a 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/AddPartitionsToTxnResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/AddPartitionsToTxnResponse.java @@ -18,9 +18,9 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData; -import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnResult; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnPartitionResult; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnPartitionResultCollection; +import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnResult; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnTopicResult; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnTopicResultCollection; import org.apache.kafka.common.protocol.ApiKeys; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/AlterReplicaLogDirsRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/AlterReplicaLogDirsRequest.java index d828e1063be8f..6f909786e9ef9 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/AlterReplicaLogDirsRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/AlterReplicaLogDirsRequest.java @@ -19,6 +19,9 @@ import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.message.AlterReplicaLogDirsRequestData; +import org.apache.kafka.common.message.AlterReplicaLogDirsResponseData; +import org.apache.kafka.common.message.AlterReplicaLogDirsResponseData.AlterReplicaLogDirTopicResult; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; @@ -28,10 +31,6 @@ import java.util.Map; import java.util.stream.Collectors; -import org.apache.kafka.common.message.AlterReplicaLogDirsRequestData; -import org.apache.kafka.common.message.AlterReplicaLogDirsResponseData; -import org.apache.kafka.common.message.AlterReplicaLogDirsResponseData.AlterReplicaLogDirTopicResult; - public class AlterReplicaLogDirsRequest extends AbstractRequest { private final AlterReplicaLogDirsRequestData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsRequest.java index 4ae819ceb10b6..6a1165cbecb8c 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsRequest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.common.requests; -import java.util.regex.Pattern; import org.apache.kafka.common.message.ApiVersionsRequestData; import org.apache.kafka.common.message.ApiVersionsResponseData; import org.apache.kafka.common.message.ApiVersionsResponseData.ApiVersionCollection; @@ -26,6 +25,7 @@ import org.apache.kafka.common.utils.AppInfoParser; import java.nio.ByteBuffer; +import java.util.regex.Pattern; public class ApiVersionsRequest extends AbstractRequest { diff --git a/clients/src/main/java/org/apache/kafka/common/requests/AssignReplicasToDirsResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/AssignReplicasToDirsResponse.java index e92ebcb103bac..90912956029cc 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/AssignReplicasToDirsResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/AssignReplicasToDirsResponse.java @@ -22,7 +22,6 @@ import org.apache.kafka.common.protocol.Errors; import java.nio.ByteBuffer; - import java.util.Collections; import java.util.Map; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/CreateTopicsRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/CreateTopicsRequest.java index a003c2d3f7a59..6f713fcdaf3c2 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/CreateTopicsRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/CreateTopicsRequest.java @@ -16,9 +16,6 @@ */ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.stream.Collectors; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.CreateTopicsRequestData; import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopic; @@ -27,6 +24,10 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.stream.Collectors; + public class CreateTopicsRequest extends AbstractRequest { public static class Builder extends AbstractRequest.Builder { private final CreateTopicsRequestData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DeleteAclsRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/DeleteAclsRequest.java index 98fd6589b2280..fea08e38be8f0 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/DeleteAclsRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/DeleteAclsRequest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.requests; -import java.util.Collections; -import java.util.stream.Collectors; import org.apache.kafka.common.acl.AccessControlEntryFilter; import org.apache.kafka.common.acl.AclBindingFilter; import org.apache.kafka.common.acl.AclOperation; @@ -34,7 +32,9 @@ import org.apache.kafka.common.resource.ResourceType; import java.nio.ByteBuffer; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import static org.apache.kafka.common.protocol.ApiKeys.DELETE_ACLS; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DeleteAclsResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/DeleteAclsResponse.java index 2cf8dd40a15c9..6b759d7cee5f5 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/DeleteAclsResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/DeleteAclsResponse.java @@ -18,19 +18,20 @@ import org.apache.kafka.common.acl.AccessControlEntry; import org.apache.kafka.common.acl.AclBinding; -import org.apache.kafka.common.protocol.ApiKeys; -import org.apache.kafka.common.protocol.ByteBufferAccessor; -import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.acl.AclOperation; import org.apache.kafka.common.acl.AclPermissionType; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.DeleteAclsResponseData; import org.apache.kafka.common.message.DeleteAclsResponseData.DeleteAclsFilterResult; import org.apache.kafka.common.message.DeleteAclsResponseData.DeleteAclsMatchingAcl; +import org.apache.kafka.common.protocol.ApiKeys; +import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.resource.PatternType; +import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.resource.ResourceType; import org.apache.kafka.server.authorizer.AclDeleteResult; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DeleteTopicsRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/DeleteTopicsRequest.java index 60b4031725e80..97b3a58843745 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/DeleteTopicsRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/DeleteTopicsRequest.java @@ -18,9 +18,9 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.DeleteTopicsRequestData; +import org.apache.kafka.common.message.DeleteTopicsRequestData.DeleteTopicState; import org.apache.kafka.common.message.DeleteTopicsResponseData; import org.apache.kafka.common.message.DeleteTopicsResponseData.DeletableTopicResult; -import org.apache.kafka.common.message.DeleteTopicsRequestData.DeleteTopicState; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsResponse.java index 95f8d91bad711..424ff563a4c8a 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsResponse.java @@ -19,12 +19,18 @@ import org.apache.kafka.common.acl.AccessControlEntry; import org.apache.kafka.common.acl.AclBinding; +import org.apache.kafka.common.acl.AclOperation; +import org.apache.kafka.common.acl.AclPermissionType; +import org.apache.kafka.common.errors.UnsupportedVersionException; +import org.apache.kafka.common.message.DescribeAclsResponseData; +import org.apache.kafka.common.message.DescribeAclsResponseData.AclDescription; +import org.apache.kafka.common.message.DescribeAclsResponseData.DescribeAclsResource; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; +import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourcePattern; -import org.apache.kafka.common.errors.UnsupportedVersionException; -import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.resource.ResourceType; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -38,13 +44,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.kafka.common.acl.AclOperation; -import org.apache.kafka.common.acl.AclPermissionType; -import org.apache.kafka.common.message.DescribeAclsResponseData; -import org.apache.kafka.common.message.DescribeAclsResponseData.AclDescription; -import org.apache.kafka.common.message.DescribeAclsResponseData.DescribeAclsResource; -import org.apache.kafka.common.resource.ResourceType; - public class DescribeAclsResponse extends AbstractResponse { private final DescribeAclsResponseData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DescribeClusterRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/DescribeClusterRequest.java index 02f2ddab6bd46..9edd14cb45514 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/DescribeClusterRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/DescribeClusterRequest.java @@ -17,12 +17,13 @@ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; import org.apache.kafka.common.message.DescribeClusterRequestData; import org.apache.kafka.common.message.DescribeClusterResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; +import java.nio.ByteBuffer; + public class DescribeClusterRequest extends AbstractRequest { public static class Builder extends AbstractRequest.Builder { diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DescribeClusterResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/DescribeClusterResponse.java index fb48476e2467d..4964a8a8a9d17 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/DescribeClusterResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/DescribeClusterResponse.java @@ -17,16 +17,17 @@ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; import org.apache.kafka.common.Node; import org.apache.kafka.common.message.DescribeClusterResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; +import java.nio.ByteBuffer; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + public class DescribeClusterResponse extends AbstractResponse { private final DescribeClusterResponseData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DescribeTransactionsResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/DescribeTransactionsResponse.java index 5eef63b0ce4bb..8839778569a57 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/DescribeTransactionsResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/DescribeTransactionsResponse.java @@ -70,4 +70,3 @@ public void maybeSetThrottleTimeMs(int throttleTimeMs) { } } - diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ElectLeadersRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/ElectLeadersRequest.java index febb0302ed883..4de72069401a9 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ElectLeadersRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ElectLeadersRequest.java @@ -17,21 +17,22 @@ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; import org.apache.kafka.common.ElectionType; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.UnsupportedVersionException; -import org.apache.kafka.common.message.ElectLeadersRequestData.TopicPartitions; import org.apache.kafka.common.message.ElectLeadersRequestData; +import org.apache.kafka.common.message.ElectLeadersRequestData.TopicPartitions; import org.apache.kafka.common.message.ElectLeadersResponseData.PartitionResult; import org.apache.kafka.common.message.ElectLeadersResponseData.ReplicaElectionResult; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.MessageUtil; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public class ElectLeadersRequest extends AbstractRequest { public static class Builder extends AbstractRequest.Builder { private final ElectionType electionType; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ElectLeadersResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/ElectLeadersResponse.java index 2e82cd4c9a5ef..4cb1c70ba7e7f 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ElectLeadersResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ElectLeadersResponse.java @@ -17,19 +17,19 @@ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.ElectLeadersResponseData; -import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.message.ElectLeadersResponseData.ReplicaElectionResult; import org.apache.kafka.common.protocol.ApiKeys; +import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; +import java.nio.ByteBuffer; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + public class ElectLeadersResponse extends AbstractResponse { private final ElectLeadersResponseData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/EnvelopeRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/EnvelopeRequest.java index 5e8d3faea40ee..6e62aee75bd62 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/EnvelopeRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/EnvelopeRequest.java @@ -18,8 +18,8 @@ import org.apache.kafka.common.message.EnvelopeRequestData; import org.apache.kafka.common.message.EnvelopeResponseData; -import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.ApiKeys; +import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; import java.nio.ByteBuffer; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ExpireDelegationTokenRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/ExpireDelegationTokenRequest.java index 85b02382baf89..3660a45646059 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ExpireDelegationTokenRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ExpireDelegationTokenRequest.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; - import org.apache.kafka.common.message.ExpireDelegationTokenRequestData; import org.apache.kafka.common.message.ExpireDelegationTokenResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; +import java.nio.ByteBuffer; + public class ExpireDelegationTokenRequest extends AbstractRequest { private final ExpireDelegationTokenRequestData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ExpireDelegationTokenResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/ExpireDelegationTokenResponse.java index ec43f3371b569..945db7acdc09e 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ExpireDelegationTokenResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ExpireDelegationTokenResponse.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; -import java.util.Map; - import org.apache.kafka.common.message.ExpireDelegationTokenResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; +import java.nio.ByteBuffer; +import java.util.Map; + public class ExpireDelegationTokenResponse extends AbstractResponse { private final ExpireDelegationTokenResponseData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/FetchResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/FetchResponse.java index 919c0f9f77a9b..dbf73584b777c 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/FetchResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/FetchResponse.java @@ -17,8 +17,8 @@ package org.apache.kafka.common.requests; import org.apache.kafka.common.Node; -import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicIdPartition; +import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.FetchResponseData; import org.apache.kafka.common.protocol.ApiKeys; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsRequest.java index eb22f4658a410..cf19794fa5b3e 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsRequest.java @@ -19,7 +19,6 @@ import org.apache.kafka.common.message.GetTelemetrySubscriptionsRequestData; import org.apache.kafka.common.message.GetTelemetrySubscriptionsResponseData; - import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/LeaderAndIsrRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/LeaderAndIsrRequest.java index 9fc83cfd847a8..c812e29f6642a 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/LeaderAndIsrRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/LeaderAndIsrRequest.java @@ -20,11 +20,11 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.LeaderAndIsrRequestData; import org.apache.kafka.common.message.LeaderAndIsrRequestData.LeaderAndIsrLiveLeader; -import org.apache.kafka.common.message.LeaderAndIsrRequestData.LeaderAndIsrTopicState; import org.apache.kafka.common.message.LeaderAndIsrRequestData.LeaderAndIsrPartitionState; +import org.apache.kafka.common.message.LeaderAndIsrRequestData.LeaderAndIsrTopicState; import org.apache.kafka.common.message.LeaderAndIsrResponseData; -import org.apache.kafka.common.message.LeaderAndIsrResponseData.LeaderAndIsrTopicError; import org.apache.kafka.common.message.LeaderAndIsrResponseData.LeaderAndIsrPartitionError; +import org.apache.kafka.common.message.LeaderAndIsrResponseData.LeaderAndIsrTopicError; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ListClientMetricsResourcesResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/ListClientMetricsResourcesResponse.java index 189aad1eb308d..87b25a0a90444 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ListClientMetricsResourcesResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ListClientMetricsResourcesResponse.java @@ -24,8 +24,8 @@ import java.nio.ByteBuffer; import java.util.Collection; -import java.util.stream.Collectors; import java.util.Map; +import java.util.stream.Collectors; public class ListClientMetricsResourcesResponse extends AbstractResponse { private final ListClientMetricsResourcesResponseData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ListOffsetsRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/ListOffsetsRequest.java index 57aeb9de1bbb5..56dea5262f7eb 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ListOffsetsRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ListOffsetsRequest.java @@ -16,15 +16,6 @@ */ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.kafka.common.IsolationLevel; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.ListOffsetsRequestData; @@ -37,6 +28,15 @@ import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + public class ListOffsetsRequest extends AbstractRequest { public static final long EARLIEST_TIMESTAMP = -2L; public static final long LATEST_TIMESTAMP = -1L; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ListOffsetsResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/ListOffsetsResponse.java index 53356dd93be0a..c34a843ffbc3f 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ListOffsetsResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ListOffsetsResponse.java @@ -16,12 +16,6 @@ */ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.ListOffsetsResponseData; import org.apache.kafka.common.message.ListOffsetsResponseData.ListOffsetsPartitionResponse; @@ -31,6 +25,12 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.record.RecordBatch; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Possible error codes: * diff --git a/clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchRequest.java index 1b748dca28e61..7ece0700bfa96 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchRequest.java @@ -16,9 +16,6 @@ */ package org.apache.kafka.common.requests; -import java.util.Collections; -import java.util.Map.Entry; -import java.util.stream.Collectors; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.OffsetFetchRequestData; @@ -28,15 +25,19 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.nio.ByteBuffer; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Optional; +import java.util.stream.Collectors; public class OffsetFetchRequest extends AbstractRequest { diff --git a/clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchResponse.java index 9d0b4cb459ece..82b6cdb097951 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchResponse.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.requests; -import java.util.Map.Entry; -import java.util.stream.Collectors; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.OffsetFetchResponseData; @@ -36,8 +34,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; +import java.util.stream.Collectors; import static org.apache.kafka.common.record.RecordBatch.NO_PARTITION_LEADER_EPOCH; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/PushTelemetryResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/PushTelemetryResponse.java index 4be6fbbbae96d..230ea1d358488 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/PushTelemetryResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/PushTelemetryResponse.java @@ -70,4 +70,3 @@ public static PushTelemetryResponse parse(ByteBuffer buffer, short version) { new ByteBufferAccessor(buffer), version)); } } - diff --git a/clients/src/main/java/org/apache/kafka/common/requests/RenewDelegationTokenRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/RenewDelegationTokenRequest.java index 91a9f968d9d48..963097093dc2d 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/RenewDelegationTokenRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/RenewDelegationTokenRequest.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; - import org.apache.kafka.common.message.RenewDelegationTokenRequestData; import org.apache.kafka.common.message.RenewDelegationTokenResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; +import java.nio.ByteBuffer; + public class RenewDelegationTokenRequest extends AbstractRequest { private final RenewDelegationTokenRequestData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/RenewDelegationTokenResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/RenewDelegationTokenResponse.java index 8ea85d74db6c7..2baf992283e90 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/RenewDelegationTokenResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/RenewDelegationTokenResponse.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; -import java.util.Map; - import org.apache.kafka.common.message.RenewDelegationTokenResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; +import java.nio.ByteBuffer; +import java.util.Map; + public class RenewDelegationTokenResponse extends AbstractResponse { private final RenewDelegationTokenResponseData data; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/SaslAuthenticateRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/SaslAuthenticateRequest.java index e2080ce841bfc..47dd5fd315769 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/SaslAuthenticateRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/SaslAuthenticateRequest.java @@ -79,4 +79,3 @@ public static SaslAuthenticateRequest parse(ByteBuffer buffer, short version) { version); } } - diff --git a/clients/src/main/java/org/apache/kafka/common/requests/SaslHandshakeRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/SaslHandshakeRequest.java index 09d3a87c8e727..c623b2ee093e0 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/SaslHandshakeRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/SaslHandshakeRequest.java @@ -77,4 +77,3 @@ public static SaslHandshakeRequest parse(ByteBuffer buffer, short version) { return new SaslHandshakeRequest(new SaslHandshakeRequestData(new ByteBufferAccessor(buffer), version), version); } } - diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ShareFetchResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/ShareFetchResponse.java index b33969e0efa41..58ce62f6c14cc 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ShareFetchResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ShareFetchResponse.java @@ -29,13 +29,13 @@ import org.apache.kafka.common.record.Records; import java.nio.ByteBuffer; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Iterator; -import java.util.Collections; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; /** diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ShareGroupHeartbeatRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/ShareGroupHeartbeatRequest.java index 7e112ef29dd14..500f8561a0209 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ShareGroupHeartbeatRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ShareGroupHeartbeatRequest.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.requests; -import java.nio.ByteBuffer; - import org.apache.kafka.common.message.ShareGroupHeartbeatRequestData; import org.apache.kafka.common.message.ShareGroupHeartbeatResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; +import java.nio.ByteBuffer; + public class ShareGroupHeartbeatRequest extends AbstractRequest { /** * A member epoch of -1 means that the member wants to leave the group. diff --git a/clients/src/main/java/org/apache/kafka/common/requests/StopReplicaRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/StopReplicaRequest.java index 6245cb27c6c47..9241471265801 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/StopReplicaRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/StopReplicaRequest.java @@ -20,8 +20,8 @@ import org.apache.kafka.common.message.StopReplicaRequestData; import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaPartitionState; import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaPartitionV0; -import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaTopicV1; import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaTopicState; +import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaTopicV1; import org.apache.kafka.common.message.StopReplicaResponseData; import org.apache.kafka.common.message.StopReplicaResponseData.StopReplicaPartitionError; import org.apache.kafka.common.protocol.ApiKeys; diff --git a/clients/src/main/java/org/apache/kafka/common/security/JaasConfig.java b/clients/src/main/java/org/apache/kafka/common/security/JaasConfig.java index 5e837a69c1602..b3d31fcc178be 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/JaasConfig.java +++ b/clients/src/main/java/org/apache/kafka/common/security/JaasConfig.java @@ -16,6 +16,9 @@ */ package org.apache.kafka.common.security; +import org.apache.kafka.common.KafkaException; +import org.apache.kafka.common.config.SaslConfigs; + import java.io.IOException; import java.io.StreamTokenizer; import java.io.StringReader; @@ -26,11 +29,8 @@ import java.util.Map; import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; - -import org.apache.kafka.common.KafkaException; -import org.apache.kafka.common.config.SaslConfigs; +import javax.security.auth.login.Configuration; /** * JAAS configuration parser that constructs a JAAS configuration object with a single diff --git a/clients/src/main/java/org/apache/kafka/common/security/JaasContext.java b/clients/src/main/java/org/apache/kafka/common/security/JaasContext.java index b072baefbb266..6211c5355cc22 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/JaasContext.java +++ b/clients/src/main/java/org/apache/kafka/common/security/JaasContext.java @@ -19,11 +19,10 @@ import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.network.ListenerName; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -33,6 +32,9 @@ import java.util.Set; import java.util.stream.Collectors; +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.auth.login.Configuration; + import static org.apache.kafka.common.security.JaasUtils.DISALLOWED_LOGIN_MODULES_CONFIG; import static org.apache.kafka.common.security.JaasUtils.DISALLOWED_LOGIN_MODULES_DEFAULT; diff --git a/clients/src/main/java/org/apache/kafka/common/security/JaasUtils.java b/clients/src/main/java/org/apache/kafka/common/security/JaasUtils.java index 38a8b06de45c7..742319c4f49a3 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/JaasUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/security/JaasUtils.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.security; import org.apache.kafka.common.KafkaException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,4 +80,3 @@ public static boolean isZkSaslEnabled() { return foundLoginConfigEntry; } } - diff --git a/clients/src/main/java/org/apache/kafka/common/security/auth/KafkaPrincipal.java b/clients/src/main/java/org/apache/kafka/common/security/auth/KafkaPrincipal.java index 279bc091192d8..6f074c2cec4cf 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/auth/KafkaPrincipal.java +++ b/clients/src/main/java/org/apache/kafka/common/security/auth/KafkaPrincipal.java @@ -97,4 +97,3 @@ public boolean tokenAuthenticated() { return tokenAuthenticated; } } - diff --git a/clients/src/main/java/org/apache/kafka/common/security/auth/SaslAuthenticationContext.java b/clients/src/main/java/org/apache/kafka/common/security/auth/SaslAuthenticationContext.java index 5b22625d99314..db67b4bac4046 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/auth/SaslAuthenticationContext.java +++ b/clients/src/main/java/org/apache/kafka/common/security/auth/SaslAuthenticationContext.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.security.auth; -import javax.net.ssl.SSLSession; -import javax.security.sasl.SaslServer; - import java.net.InetAddress; import java.util.Optional; +import javax.net.ssl.SSLSession; +import javax.security.sasl.SaslServer; + public class SaslAuthenticationContext implements AuthenticationContext { private final SaslServer server; private final SecurityProtocol securityProtocol; diff --git a/clients/src/main/java/org/apache/kafka/common/security/auth/SaslExtensions.java b/clients/src/main/java/org/apache/kafka/common/security/auth/SaslExtensions.java index 662f50d0f6ff0..8156c6fe23199 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/auth/SaslExtensions.java +++ b/clients/src/main/java/org/apache/kafka/common/security/auth/SaslExtensions.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Set; import java.util.StringJoiner; + import javax.security.auth.Subject; /** diff --git a/clients/src/main/java/org/apache/kafka/common/security/auth/SslAuthenticationContext.java b/clients/src/main/java/org/apache/kafka/common/security/auth/SslAuthenticationContext.java index 88819f91cf82f..df98173292d0a 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/auth/SslAuthenticationContext.java +++ b/clients/src/main/java/org/apache/kafka/common/security/auth/SslAuthenticationContext.java @@ -16,9 +16,10 @@ */ package org.apache.kafka.common.security.auth; -import javax.net.ssl.SSLSession; import java.net.InetAddress; +import javax.net.ssl.SSLSession; + public class SslAuthenticationContext implements AuthenticationContext { private final SSLSession session; private final InetAddress clientAddress; diff --git a/clients/src/main/java/org/apache/kafka/common/security/auth/SslEngineFactory.java b/clients/src/main/java/org/apache/kafka/common/security/auth/SslEngineFactory.java index 586017d55f226..42e0ab6401cb2 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/auth/SslEngineFactory.java +++ b/clients/src/main/java/org/apache/kafka/common/security/auth/SslEngineFactory.java @@ -18,12 +18,13 @@ import org.apache.kafka.common.Configurable; -import javax.net.ssl.SSLEngine; import java.io.Closeable; import java.security.KeyStore; import java.util.Map; import java.util.Set; +import javax.net.ssl.SSLEngine; + /** * Plugin interface for allowing creation of SSLEngine object in a custom way. * For example, you can use this to customize loading your key material and trust material needed for SSLContext. diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/AbstractLogin.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/AbstractLogin.java index 7e1350864e438..da381421dcca4 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/AbstractLogin.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/AbstractLogin.java @@ -16,25 +16,26 @@ */ package org.apache.kafka.common.security.authenticator; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; -import javax.security.sasl.RealmCallback; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.Subject; - import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; import org.apache.kafka.common.security.auth.Login; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; import java.util.Map; +import javax.security.auth.Subject; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.auth.login.Configuration; +import javax.security.auth.login.LoginContext; +import javax.security.auth.login.LoginException; +import javax.security.sasl.RealmCallback; + /** * Base login class that implements methods common to typical SASL mechanisms. */ @@ -112,4 +113,3 @@ public void close() { } } } - diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/DefaultKafkaPrincipalBuilder.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/DefaultKafkaPrincipalBuilder.java index cae0796bfb7ad..fa654bcb9280d 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/DefaultKafkaPrincipalBuilder.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/DefaultKafkaPrincipalBuilder.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.security.authenticator; -import javax.security.auth.x500.X500Principal; - import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.errors.SerializationException; @@ -33,16 +31,17 @@ import org.apache.kafka.common.security.auth.SslAuthenticationContext; import org.apache.kafka.common.security.kerberos.KerberosName; import org.apache.kafka.common.security.kerberos.KerberosShortNamer; - -import javax.net.ssl.SSLPeerUnverifiedException; -import javax.net.ssl.SSLSession; -import javax.security.sasl.SaslServer; import org.apache.kafka.common.security.ssl.SslPrincipalMapper; import java.io.IOException; import java.nio.ByteBuffer; import java.security.Principal; +import javax.net.ssl.SSLPeerUnverifiedException; +import javax.net.ssl.SSLSession; +import javax.security.auth.x500.X500Principal; +import javax.security.sasl.SaslServer; + /** * Default implementation of {@link KafkaPrincipalBuilder} which provides basic support for * SSL authentication and SASL authentication. In the latter case, when GSSAPI is used, this diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/DefaultLogin.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/DefaultLogin.java index a902d7dfc4d29..dd83e75c3000d 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/DefaultLogin.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/DefaultLogin.java @@ -27,4 +27,3 @@ public String serviceName() { public void close() { } } - diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/LoginManager.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/LoginManager.java index 49e537c1f3a1f..d5540e1ddb872 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/LoginManager.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/LoginManager.java @@ -27,16 +27,18 @@ import org.apache.kafka.common.security.oauthbearer.internals.unsecured.OAuthBearerUnsecuredLoginCallbackHandler; import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.security.auth.Subject; -import javax.security.auth.login.LoginException; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import javax.security.auth.Subject; +import javax.security.auth.login.LoginException; + public class LoginManager { private static final Logger LOGGER = LoggerFactory.getLogger(LoginManager.class); diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java index de3d42a41a6a2..a327c4b6c1b59 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java @@ -51,12 +51,9 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; -import javax.security.auth.Subject; -import javax.security.sasl.Sasl; -import javax.security.sasl.SaslClient; -import javax.security.sasl.SaslException; import java.io.IOException; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; @@ -74,6 +71,11 @@ import java.util.Random; import java.util.Set; +import javax.security.auth.Subject; +import javax.security.sasl.Sasl; +import javax.security.sasl.SaslClient; +import javax.security.sasl.SaslException; + public class SaslClientAuthenticator implements Authenticator { /** * The internal state transitions for initial authentication of a channel are diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientCallbackHandler.java index e141bb652af3e..fc27feb0502e5 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientCallbackHandler.java @@ -16,6 +16,13 @@ */ package org.apache.kafka.common.security.authenticator; +import org.apache.kafka.common.config.SaslConfigs; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.auth.SaslExtensions; +import org.apache.kafka.common.security.auth.SaslExtensionsCallback; +import org.apache.kafka.common.security.scram.ScramExtensionsCallback; +import org.apache.kafka.common.security.scram.internals.ScramMechanism; + import java.security.AccessController; import java.util.List; import java.util.Map; @@ -29,13 +36,6 @@ import javax.security.sasl.AuthorizeCallback; import javax.security.sasl.RealmCallback; -import org.apache.kafka.common.config.SaslConfigs; -import org.apache.kafka.common.security.auth.SaslExtensionsCallback; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.auth.SaslExtensions; -import org.apache.kafka.common.security.scram.ScramExtensionsCallback; -import org.apache.kafka.common.security.scram.internals.ScramMechanism; - /** * Default callback handler for Sasl clients. The callbacks required for the SASL mechanism * configured for the client should be supported by this callback handler. See diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticator.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticator.java index ee0ed8007d83c..d44a0a64296a1 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticator.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticator.java @@ -27,12 +27,12 @@ import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.SaslAuthenticateResponseData; import org.apache.kafka.common.message.SaslHandshakeResponseData; -import org.apache.kafka.common.network.InvalidReceiveException; import org.apache.kafka.common.network.Authenticator; import org.apache.kafka.common.network.ByteBufferSend; import org.apache.kafka.common.network.ChannelBuilders; import org.apache.kafka.common.network.ChannelMetadataRegistry; import org.apache.kafka.common.network.ClientInformation; +import org.apache.kafka.common.network.InvalidReceiveException; import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.network.NetworkReceive; import org.apache.kafka.common.network.ReauthenticationContext; @@ -64,14 +64,10 @@ import org.apache.kafka.common.security.scram.internals.ScramMechanism; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLSession; -import javax.security.auth.Subject; -import javax.security.sasl.Sasl; -import javax.security.sasl.SaslException; -import javax.security.sasl.SaslServer; import java.io.Closeable; import java.io.IOException; import java.net.InetAddress; @@ -88,6 +84,12 @@ import java.util.Optional; import java.util.function.Supplier; +import javax.net.ssl.SSLSession; +import javax.security.auth.Subject; +import javax.security.sasl.Sasl; +import javax.security.sasl.SaslException; +import javax.security.sasl.SaslServer; + public class SaslServerAuthenticator implements Authenticator { private static final Logger LOG = LoggerFactory.getLogger(SaslServerAuthenticator.class); diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerCallbackHandler.java index d3d43cbfa26d2..2cd21a8437027 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslServerCallbackHandler.java @@ -16,6 +16,12 @@ */ package org.apache.kafka.common.security.authenticator; +import org.apache.kafka.common.config.SaslConfigs; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.List; import java.util.Map; @@ -25,12 +31,6 @@ import javax.security.sasl.AuthorizeCallback; import javax.security.sasl.RealmCallback; -import org.apache.kafka.common.config.SaslConfigs; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Default callback handler for Sasl servers. The callbacks required for all the SASL * mechanisms enabled in the server should be supported by this callback handler. See diff --git a/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosClientCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosClientCallbackHandler.java index fa9cad261c589..0154be08f8fd9 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosClientCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosClientCallbackHandler.java @@ -19,6 +19,9 @@ import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import java.util.List; +import java.util.Map; + import javax.security.auth.callback.Callback; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; @@ -26,8 +29,6 @@ import javax.security.auth.login.AppConfigurationEntry; import javax.security.sasl.AuthorizeCallback; import javax.security.sasl.RealmCallback; -import java.util.List; -import java.util.Map; /** * Callback handler for SASL/GSSAPI clients. diff --git a/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosError.java b/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosError.java index 811cf509975e7..631b322f904ce 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosError.java +++ b/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosError.java @@ -19,13 +19,15 @@ import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.security.authenticator.SaslClientAuthenticator; import org.apache.kafka.common.utils.Java; + import org.ietf.jgss.GSSException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.security.sasl.SaslClient; import java.lang.reflect.Method; +import javax.security.sasl.SaslClient; + /** * Kerberos exceptions that may require special handling. The standard Kerberos error codes * for these errors are retrieved using KrbException#errorCode() from the underlying Kerberos diff --git a/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosLogin.java b/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosLogin.java index f7809e4cac5bc..cbe4fd6e96d83 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosLogin.java +++ b/clients/src/main/java/org/apache/kafka/common/security/kerberos/KerberosLogin.java @@ -16,22 +16,15 @@ */ package org.apache.kafka.common.security.kerberos; -import javax.security.auth.kerberos.KerberosPrincipal; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; -import javax.security.auth.kerberos.KerberosTicket; -import javax.security.auth.Subject; - +import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.security.JaasContext; import org.apache.kafka.common.security.JaasUtils; import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; import org.apache.kafka.common.security.authenticator.AbstractLogin; -import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.utils.KafkaThread; import org.apache.kafka.common.utils.Shell; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,6 +35,14 @@ import java.util.Random; import java.util.Set; +import javax.security.auth.Subject; +import javax.security.auth.kerberos.KerberosPrincipal; +import javax.security.auth.kerberos.KerberosTicket; +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.auth.login.Configuration; +import javax.security.auth.login.LoginContext; +import javax.security.auth.login.LoginException; + /** * This class is responsible for refreshing Kerberos credentials for * logins for both Kafka client and server. diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerExtensionsValidatorCallback.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerExtensionsValidatorCallback.java index eab208baa6f2b..e17cfd1746d4b 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerExtensionsValidatorCallback.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerExtensionsValidatorCallback.java @@ -18,12 +18,13 @@ import org.apache.kafka.common.security.auth.SaslExtensions; -import javax.security.auth.callback.Callback; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import javax.security.auth.callback.Callback; + import static org.apache.kafka.common.utils.CollectionUtils.subtractMap; /** diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandler.java index 8d19424497078..fc9e689611520 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandler.java @@ -17,17 +17,6 @@ package org.apache.kafka.common.security.oauthbearer; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; - -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.sasl.SaslException; - import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; @@ -41,9 +30,22 @@ import org.apache.kafka.common.security.oauthbearer.internals.secured.AccessTokenValidatorFactory; import org.apache.kafka.common.security.oauthbearer.internals.secured.JaasOptionsUtils; import org.apache.kafka.common.security.oauthbearer.internals.secured.ValidateException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.sasl.SaslException; + +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; + /** *

    * OAuthBearerLoginCallbackHandler is an {@link AuthenticateCallbackHandler} that diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginModule.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginModule.java index e7976b5550605..ddbbd1a787a1a 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginModule.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginModule.java @@ -16,6 +16,17 @@ */ package org.apache.kafka.common.security.oauthbearer; +import org.apache.kafka.common.config.SaslConfigs; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.auth.Login; +import org.apache.kafka.common.security.auth.SaslExtensions; +import org.apache.kafka.common.security.auth.SaslExtensionsCallback; +import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslClientProvider; +import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslServerProvider; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.Collections; import java.util.Iterator; @@ -29,16 +40,6 @@ import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import org.apache.kafka.common.config.SaslConfigs; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.auth.Login; -import org.apache.kafka.common.security.auth.SaslExtensionsCallback; -import org.apache.kafka.common.security.auth.SaslExtensions; -import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslClientProvider; -import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslServerProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * The {@code LoginModule} for the SASL/OAUTHBEARER mechanism. When a client * (whether a non-broker client or a broker when SASL/OAUTHBEARER is the diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerToken.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerToken.java index 94c3c957145b5..63491dd0ab105 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerToken.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerToken.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.security.oauthbearer; -import java.util.Set; - import org.apache.kafka.common.annotation.InterfaceStability; +import java.util.Set; + /** * The b64token value as defined in * RFC 6750 Section diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallback.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallback.java index 3f4f269606ab2..b0c3846d66f2b 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallback.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallback.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.security.oauthbearer; +import org.apache.kafka.common.annotation.InterfaceStability; + import java.util.Objects; import javax.security.auth.callback.Callback; -import org.apache.kafka.common.annotation.InterfaceStability; - /** * A {@code Callback} for use by the {@code SaslClient} and {@code Login} * implementations when they require an OAuth 2 bearer token. Callback handlers diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallback.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallback.java index 36bcf089ac322..dc7ca43a01619 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallback.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallback.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.security.oauthbearer; +import org.apache.kafka.common.annotation.InterfaceStability; + import java.util.Objects; import javax.security.auth.callback.Callback; -import org.apache.kafka.common.annotation.InterfaceStability; - /** * A {@code Callback} for use by the {@code SaslServer} implementation when it * needs to provide an OAuth 2 bearer token compact serialization for diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackHandler.java index d39a06787fb54..f9422370db18b 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackHandler.java @@ -17,16 +17,6 @@ package org.apache.kafka.common.security.oauthbearer; -import java.io.IOException; -import java.security.Key; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicInteger; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; import org.apache.kafka.common.security.oauthbearer.internals.secured.AccessTokenValidator; @@ -36,12 +26,25 @@ import org.apache.kafka.common.security.oauthbearer.internals.secured.RefreshingHttpsJwksVerificationKeyResolver; import org.apache.kafka.common.security.oauthbearer.internals.secured.ValidateException; import org.apache.kafka.common.security.oauthbearer.internals.secured.VerificationKeyResolverFactory; + import org.jose4j.jws.JsonWebSignature; import org.jose4j.jwx.JsonWebStructure; import org.jose4j.lang.UnresolvableKeyException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.security.Key; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicInteger; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.AppConfigurationEntry; + /** *

    * OAuthBearerValidatorCallbackHandler is an {@link AuthenticateCallbackHandler} that diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerClientInitialResponse.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerClientInitialResponse.java index 6fd57cadbd73d..3e29841baa5b4 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerClientInitialResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerClientInitialResponse.java @@ -19,13 +19,14 @@ import org.apache.kafka.common.security.auth.SaslExtensions; import org.apache.kafka.common.utils.Utils; -import javax.security.sasl.SaslException; import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.security.sasl.SaslException; + public class OAuthBearerClientInitialResponse { static final String SEPARATOR = "\u0001"; diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerRefreshingLogin.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerRefreshingLogin.java index 4adbe394d0874..9c8ee63e4f2d7 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerRefreshingLogin.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerRefreshingLogin.java @@ -16,14 +16,6 @@ */ package org.apache.kafka.common.security.oauthbearer.internals; -import java.util.Map; -import java.util.Set; - -import javax.security.auth.Subject; -import javax.security.auth.login.Configuration; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; - import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; import org.apache.kafka.common.security.auth.Login; @@ -32,9 +24,18 @@ import org.apache.kafka.common.security.oauthbearer.internals.expiring.ExpiringCredential; import org.apache.kafka.common.security.oauthbearer.internals.expiring.ExpiringCredentialRefreshConfig; import org.apache.kafka.common.security.oauthbearer.internals.expiring.ExpiringCredentialRefreshingLogin; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Map; +import java.util.Set; + +import javax.security.auth.Subject; +import javax.security.auth.login.Configuration; +import javax.security.auth.login.LoginContext; +import javax.security.auth.login.LoginException; + /** * This class is responsible for refreshing logins for both Kafka client and * server when the credential is an OAuth 2 bearer token communicated over diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClient.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClient.java index e56c5c8b045a1..6561f12f503a9 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClient.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClient.java @@ -16,6 +16,17 @@ */ package org.apache.kafka.common.security.oauthbearer.internals; +import org.apache.kafka.common.errors.IllegalSaslStateException; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.auth.SaslExtensions; +import org.apache.kafka.common.security.auth.SaslExtensionsCallback; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerTokenCallback; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -29,16 +40,6 @@ import javax.security.sasl.SaslClientFactory; import javax.security.sasl.SaslException; -import org.apache.kafka.common.errors.IllegalSaslStateException; -import org.apache.kafka.common.security.auth.SaslExtensions; -import org.apache.kafka.common.security.auth.SaslExtensionsCallback; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerTokenCallback; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * {@code SaslClient} implementation for SASL/OAUTHBEARER in Kafka. This * implementation requires an instance of {@code AuthenticateCallbackHandler} diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientCallbackHandler.java index b1e7cb0e95bb9..e4e845a8deac9 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientCallbackHandler.java @@ -16,6 +16,16 @@ */ package org.apache.kafka.common.security.oauthbearer.internals; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.auth.SaslExtensions; +import org.apache.kafka.common.security.auth.SaslExtensionsCallback; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerTokenCallback; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.security.AccessController; import java.util.Collections; @@ -32,15 +42,6 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.AppConfigurationEntry; -import org.apache.kafka.common.security.auth.SaslExtensionsCallback; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.auth.SaslExtensions; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerTokenCallback; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * An implementation of {@code AuthenticateCallbackHandler} that recognizes * {@link OAuthBearerTokenCallback} and retrieves OAuth 2 Bearer Token that was diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientProvider.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientProvider.java index 519a7720c491f..a3dd3d71d9986 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientProvider.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientProvider.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.security.oauthbearer.internals; -import java.security.Provider; -import java.security.Security; - import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslClient.OAuthBearerSaslClientFactory; +import java.security.Provider; +import java.security.Security; + public class OAuthBearerSaslClientProvider extends Provider { private static final long serialVersionUID = 1L; diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServer.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServer.java index 9991acad3a649..bf5c4723ee1a3 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServer.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServer.java @@ -16,6 +16,19 @@ */ package org.apache.kafka.common.security.oauthbearer.internals; +import org.apache.kafka.common.errors.SaslAuthenticationException; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.auth.SaslExtensions; +import org.apache.kafka.common.security.authenticator.SaslInternalConfigs; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerExtensionsValidatorCallback; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallback; +import org.apache.kafka.common.utils.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -30,18 +43,6 @@ import javax.security.sasl.SaslServer; import javax.security.sasl.SaslServerFactory; -import org.apache.kafka.common.errors.SaslAuthenticationException; -import org.apache.kafka.common.security.auth.SaslExtensions; -import org.apache.kafka.common.security.authenticator.SaslInternalConfigs; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerExtensionsValidatorCallback; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallback; -import org.apache.kafka.common.utils.Utils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * {@code SaslServer} implementation for SASL/OAUTHBEARER in Kafka. An instance * of {@link OAuthBearerToken} is available upon successful authentication via diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServerProvider.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServerProvider.java index a902abc40b8a1..8e40ac42b8dbf 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServerProvider.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServerProvider.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.security.oauthbearer.internals; -import java.security.Provider; -import java.security.Security; - import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslServer.OAuthBearerSaslServerFactory; +import java.security.Provider; +import java.security.Security; + public class OAuthBearerSaslServerProvider extends Provider { private static final long serialVersionUID = 1L; diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshConfig.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshConfig.java index 1df69f756a4e0..d1a24b84c89fe 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshConfig.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshConfig.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.expiring; +import org.apache.kafka.common.config.SaslConfigs; + import java.util.Map; import java.util.Objects; -import org.apache.kafka.common.config.SaslConfigs; - /** * Immutable refresh-related configuration for expiring credentials that can be * parsed from a producer/consumer/broker config. diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLogin.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLogin.java index e1ce365e64a97..b12ee7ffe6146 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLogin.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLogin.java @@ -16,6 +16,14 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.expiring; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.auth.Login; +import org.apache.kafka.common.utils.KafkaThread; +import org.apache.kafka.common.utils.Time; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.Date; import java.util.Objects; import java.util.Random; @@ -25,13 +33,6 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.auth.Login; -import org.apache.kafka.common.utils.KafkaThread; -import org.apache.kafka.common.utils.Time; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * This class is responsible for refreshing logins for both Kafka client and * server when the login is a type that has a limited lifetime/will expire. The diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenRetrieverFactory.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenRetrieverFactory.java index ac224730597ea..e797518eb310b 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenRetrieverFactory.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenRetrieverFactory.java @@ -17,6 +17,12 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; +import java.net.URL; +import java.util.Locale; +import java.util.Map; + +import javax.net.ssl.SSLSocketFactory; + import static org.apache.kafka.common.config.SaslConfigs.SASL_LOGIN_CONNECT_TIMEOUT_MS; import static org.apache.kafka.common.config.SaslConfigs.SASL_LOGIN_READ_TIMEOUT_MS; import static org.apache.kafka.common.config.SaslConfigs.SASL_LOGIN_RETRY_BACKOFF_MAX_MS; @@ -26,11 +32,6 @@ import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_SECRET_CONFIG; import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.SCOPE_CONFIG; -import java.net.URL; -import java.util.Locale; -import java.util.Map; -import javax.net.ssl.SSLSocketFactory; - public class AccessTokenRetrieverFactory { /** diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorFactory.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorFactory.java index cba51c3b855d9..5fa4c620d902f 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorFactory.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorFactory.java @@ -17,18 +17,19 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_EXPECTED_AUDIENCE; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_EXPECTED_ISSUER; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_SCOPE_CLAIM_NAME; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_SUB_CLAIM_NAME; +import org.jose4j.keys.resolvers.VerificationKeyResolver; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.jose4j.keys.resolvers.VerificationKeyResolver; + +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS; +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_EXPECTED_AUDIENCE; +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_EXPECTED_ISSUER; +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_SCOPE_CLAIM_NAME; +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_SUB_CLAIM_NAME; public class AccessTokenValidatorFactory { diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/BasicOAuthBearerToken.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/BasicOAuthBearerToken.java index c35dfa7b17cee..48ef89844070c 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/BasicOAuthBearerToken.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/BasicOAuthBearerToken.java @@ -17,9 +17,10 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; + import java.util.Set; import java.util.StringJoiner; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; /** * An implementation of the {@link OAuthBearerToken} that fairly straightforwardly stores the values diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CloseableVerificationKeyResolver.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CloseableVerificationKeyResolver.java index d18b8273bbb31..bf8ca0cb82211 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CloseableVerificationKeyResolver.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/CloseableVerificationKeyResolver.java @@ -17,12 +17,13 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import java.io.Closeable; -import java.io.IOException; - import org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallbackHandler; + import org.jose4j.keys.resolvers.VerificationKeyResolver; +import java.io.Closeable; +import java.io.IOException; + /** * The {@link OAuthBearerValidatorCallbackHandler} uses a {@link VerificationKeyResolver} as * part of its validation of the incoming JWT. Some of the VerificationKeyResolver diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtils.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtils.java index 99bc20661bbc0..5b878130ba374 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtils.java @@ -17,6 +17,9 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; +import org.apache.kafka.common.config.ConfigException; +import org.apache.kafka.common.network.ListenerName; + import java.io.File; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -24,8 +27,6 @@ import java.nio.file.Path; import java.util.Locale; import java.util.Map; -import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.network.ListenerName; /** * ConfigurationUtils is a utility class to perform basic configuration-related diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/FileTokenRetriever.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/FileTokenRetriever.java index 1b8ab46a556d8..c145cf7596959 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/FileTokenRetriever.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/FileTokenRetriever.java @@ -17,9 +17,10 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; +import org.apache.kafka.common.utils.Utils; + import java.io.IOException; import java.nio.file.Path; -import org.apache.kafka.common.utils.Utils; /** * FileTokenRetriever is an {@link AccessTokenRetriever} that will load the contents, diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/HttpAccessTokenRetriever.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/HttpAccessTokenRetriever.java index da46d1490451f..6fb3821fd0275 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/HttpAccessTokenRetriever.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/HttpAccessTokenRetriever.java @@ -17,8 +17,17 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; +import org.apache.kafka.common.KafkaException; +import org.apache.kafka.common.config.SaslConfigs; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler; +import org.apache.kafka.common.utils.Utils; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,14 +45,9 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.ExecutionException; + import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSocketFactory; -import org.apache.kafka.common.KafkaException; -import org.apache.kafka.common.config.SaslConfigs; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler; -import org.apache.kafka.common.utils.Utils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * HttpAccessTokenRetriever is an {@link AccessTokenRetriever} that will diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JaasOptionsUtils.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JaasOptionsUtils.java index 83976de73ab65..3336922d7b0b6 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JaasOptionsUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JaasOptionsUtils.java @@ -17,13 +17,6 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import java.net.URL; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.net.ssl.SSLSocketFactory; -import javax.security.auth.login.AppConfigurationEntry; import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; @@ -31,9 +24,19 @@ import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.ssl.DefaultSslEngineFactory; import org.apache.kafka.common.security.ssl.SslFactory; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.net.URL; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import javax.net.ssl.SSLSocketFactory; +import javax.security.auth.login.AppConfigurationEntry; + /** * JaasOptionsUtils is a utility class to perform logic for the JAAS options and * is separated out here for easier, more direct testing. diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JwksFileVerificationKeyResolver.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JwksFileVerificationKeyResolver.java index 605ee45b9295d..27cdccb286c2c 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JwksFileVerificationKeyResolver.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JwksFileVerificationKeyResolver.java @@ -17,11 +17,8 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import java.io.IOException; -import java.nio.file.Path; -import java.security.Key; -import java.util.List; import org.apache.kafka.common.utils.Utils; + import org.jose4j.jwk.JsonWebKeySet; import org.jose4j.jws.JsonWebSignature; import org.jose4j.jwx.JsonWebStructure; @@ -32,6 +29,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.nio.file.Path; +import java.security.Key; +import java.util.List; + /** * JwksFileVerificationKeyResolver is a {@link VerificationKeyResolver} implementation * that will load the JWKS from the given file system directory. diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/LoginAccessTokenValidator.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/LoginAccessTokenValidator.java index 34cca07d3e822..773311ff0ab18 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/LoginAccessTokenValidator.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/LoginAccessTokenValidator.java @@ -17,19 +17,21 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_SCOPE_CLAIM_NAME; -import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_SUB_CLAIM_NAME; - -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.Set; import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; import org.apache.kafka.common.security.oauthbearer.internals.unsecured.OAuthBearerIllegalTokenException; import org.apache.kafka.common.security.oauthbearer.internals.unsecured.OAuthBearerUnsecuredJws; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + +import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_SCOPE_CLAIM_NAME; +import static org.apache.kafka.common.config.SaslConfigs.DEFAULT_SASL_OAUTHBEARER_SUB_CLAIM_NAME; + /** * LoginAccessTokenValidator is an implementation of {@link AccessTokenValidator} that is used * by the client to perform some rudimentary validation of the JWT access token that is received diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwks.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwks.java index 590c5d8b7499e..3618005ebe1d7 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwks.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwks.java @@ -17,6 +17,14 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; +import org.apache.kafka.common.utils.Time; + +import org.jose4j.jwk.HttpsJwks; +import org.jose4j.jwk.JsonWebKey; +import org.jose4j.lang.JoseException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.Closeable; import java.io.IOException; import java.util.Collections; @@ -27,18 +35,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; - import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.kafka.common.utils.Time; -import org.jose4j.jwk.HttpsJwks; -import org.jose4j.jwk.JsonWebKey; -import org.jose4j.lang.JoseException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Implementation of {@link HttpsJwks} that will periodically refresh the JWKS cache to reduce or * even prevent HTTP/HTTPS traffic in the hot path of validation. It is assumed that it's diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwksVerificationKeyResolver.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwksVerificationKeyResolver.java index a910dfdf02d33..52d0c6c39785f 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwksVerificationKeyResolver.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwksVerificationKeyResolver.java @@ -17,9 +17,6 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import java.io.IOException; -import java.security.Key; -import java.util.List; import org.jose4j.jwk.HttpsJwks; import org.jose4j.jwk.JsonWebKey; import org.jose4j.jwk.VerificationJwkSelector; @@ -31,6 +28,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.security.Key; +import java.util.List; + /** * RefreshingHttpsJwksVerificationKeyResolver is a * {@link VerificationKeyResolver} implementation that will periodically refresh the diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/Retry.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/Retry.java index db52e8b15e87e..0da92e4fc7f72 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/Retry.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/Retry.java @@ -17,11 +17,13 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import java.util.concurrent.ExecutionException; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.concurrent.ExecutionException; + /** * Retry encapsulates the mechanism to perform a retry and then exponential * backoff using provided wait times between attempts. diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidateException.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidateException.java index 7ebb4deb989ed..430b9007830cb 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidateException.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidateException.java @@ -17,9 +17,10 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import javax.security.auth.callback.Callback; import org.apache.kafka.common.KafkaException; +import javax.security.auth.callback.Callback; + /** * ValidateException is thrown in cases where a JWT access token cannot be determined to be * valid for one reason or another. It is intended to be used when errors arise within the diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidatorAccessTokenValidator.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidatorAccessTokenValidator.java index d07663b723e7e..c7ae8edae9d93 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidatorAccessTokenValidator.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidatorAccessTokenValidator.java @@ -17,12 +17,8 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.jose4j.jwa.AlgorithmConstraints.DISALLOW_NONE; - -import java.util.Collection; -import java.util.Collections; -import java.util.Set; import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; + import org.jose4j.jwt.JwtClaims; import org.jose4j.jwt.MalformedClaimException; import org.jose4j.jwt.NumericDate; @@ -35,6 +31,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; + +import static org.jose4j.jwa.AlgorithmConstraints.DISALLOW_NONE; + /** * ValidatorAccessTokenValidator is an implementation of {@link AccessTokenValidator} that is used * by the broker to perform more extensive validation of the JWT access token that is received diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactory.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactory.java index 3eb8dd64ba164..0422045fc029d 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactory.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/secured/VerificationKeyResolverFactory.java @@ -17,19 +17,22 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_URL; +import org.apache.kafka.common.utils.Time; + +import org.jose4j.http.Get; +import org.jose4j.jwk.HttpsJwks; import java.net.URL; import java.nio.file.Path; import java.util.Locale; import java.util.Map; + import javax.net.ssl.SSLSocketFactory; -import org.apache.kafka.common.utils.Time; -import org.jose4j.http.Get; -import org.jose4j.jwk.HttpsJwks; + +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS; +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS; +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS; +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_URL; public class VerificationKeyResolverFactory { diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerIllegalTokenException.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerIllegalTokenException.java index 78859003f7e42..4c55f79a5cac2 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerIllegalTokenException.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerIllegalTokenException.java @@ -16,10 +16,10 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.unsecured; -import java.util.Objects; - import org.apache.kafka.common.KafkaException; +import java.util.Objects; + /** * Exception thrown when token validation fails due to a problem with the token * itself (as opposed to a missing remote resource or a configuration problem) diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredJws.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredJws.java index e804bfc95a8c8..64f5ddf070b00 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredJws.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredJws.java @@ -16,6 +16,13 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.unsecured; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; +import org.apache.kafka.common.utils.Utils; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.JsonNodeType; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -30,13 +37,6 @@ import java.util.Objects; import java.util.Set; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; -import org.apache.kafka.common.utils.Utils; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.JsonNodeType; - /** * A simple unsecured JWS implementation. The '{@code nbf}' claim is ignored if * it is given because the related logic is not required for Kafka testing and diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java index 629053e6550c3..daae977d72729 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandler.java @@ -16,6 +16,20 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.unsecured; +import org.apache.kafka.common.KafkaException; +import org.apache.kafka.common.config.ConfigException; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.auth.SaslExtensions; +import org.apache.kafka.common.security.auth.SaslExtensionsCallback; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerTokenCallback; +import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerClientInitialResponse; +import org.apache.kafka.common.utils.Time; +import org.apache.kafka.common.utils.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -36,19 +50,6 @@ import javax.security.auth.login.AppConfigurationEntry; import javax.security.sasl.SaslException; -import org.apache.kafka.common.KafkaException; -import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.auth.SaslExtensionsCallback; -import org.apache.kafka.common.security.auth.SaslExtensions; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerTokenCallback; -import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerClientInitialResponse; -import org.apache.kafka.common.utils.Time; -import org.apache.kafka.common.utils.Utils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * A {@code CallbackHandler} that recognizes {@link OAuthBearerTokenCallback} * to return an unsecured OAuth 2 bearer token and {@link SaslExtensionsCallback} to return SASL extensions diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredValidatorCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredValidatorCallbackHandler.java index e9fa9e8bce850..a817d7b8f2773 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredValidatorCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredValidatorCallbackHandler.java @@ -16,24 +16,25 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.unsecured; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; - import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; import org.apache.kafka.common.security.oauthbearer.OAuthBearerExtensionsValidatorCallback; import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallback; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.AppConfigurationEntry; + /** * A {@code CallbackHandler} that recognizes * {@link OAuthBearerValidatorCallback} and validates an unsecured OAuth 2 diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerValidationUtils.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerValidationUtils.java index 4dc720ac59771..d056f1a6327c0 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerValidationUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerValidationUtils.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.unsecured; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; + import java.util.List; import java.util.Objects; import java.util.Set; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; - public class OAuthBearerValidationUtils { /** * Validate the given claim for existence and type. It can be required to exist diff --git a/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainSaslServer.java b/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainSaslServer.java index 7a65fe67acd30..6dcb6d62b1621 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainSaslServer.java +++ b/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainSaslServer.java @@ -16,6 +16,9 @@ */ package org.apache.kafka.common.security.plain.internals; +import org.apache.kafka.common.errors.SaslAuthenticationException; +import org.apache.kafka.common.security.plain.PlainAuthenticateCallback; + import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -30,9 +33,6 @@ import javax.security.sasl.SaslServer; import javax.security.sasl.SaslServerFactory; -import org.apache.kafka.common.errors.SaslAuthenticationException; -import org.apache.kafka.common.security.plain.PlainAuthenticateCallback; - /** * Simple SaslServer implementation for SASL/PLAIN. In order to make this implementation * fully pluggable, authentication of username/password is fully contained within the diff --git a/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainSaslServerProvider.java b/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainSaslServerProvider.java index 807deb4c5a7c4..11ba71572cfa0 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainSaslServerProvider.java +++ b/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainSaslServerProvider.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.common.security.plain.internals; +import org.apache.kafka.common.security.plain.internals.PlainSaslServer.PlainSaslServerFactory; + import java.security.Provider; import java.security.Security; -import org.apache.kafka.common.security.plain.internals.PlainSaslServer.PlainSaslServerFactory; - public class PlainSaslServerProvider extends Provider { private static final long serialVersionUID = 1L; diff --git a/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainServerCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainServerCallbackHandler.java index 10f5817a9b359..7930fed033bd3 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainServerCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/plain/internals/PlainServerCallbackHandler.java @@ -17,9 +17,9 @@ package org.apache.kafka.common.security.plain.internals; +import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.security.JaasContext; import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.security.plain.PlainAuthenticateCallback; import org.apache.kafka.common.security.plain.PlainLoginModule; import org.apache.kafka.common.utils.Utils; diff --git a/clients/src/main/java/org/apache/kafka/common/security/scram/ScramExtensionsCallback.java b/clients/src/main/java/org/apache/kafka/common/security/scram/ScramExtensionsCallback.java index b83c94e04bcc4..23ab1aaa8e497 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/scram/ScramExtensionsCallback.java +++ b/clients/src/main/java/org/apache/kafka/common/security/scram/ScramExtensionsCallback.java @@ -16,10 +16,11 @@ */ package org.apache.kafka.common.security.scram; -import javax.security.auth.callback.Callback; import java.util.Collections; import java.util.Map; +import javax.security.auth.callback.Callback; + /** * Optional callback used for SCRAM mechanisms if any extensions need to be set diff --git a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramCredentialUtils.java b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramCredentialUtils.java index 0ce51a5ea16e4..f622dd4383eaa 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramCredentialUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramCredentialUtils.java @@ -16,13 +16,13 @@ */ package org.apache.kafka.common.security.scram.internals; +import org.apache.kafka.common.security.authenticator.CredentialCache; +import org.apache.kafka.common.security.scram.ScramCredential; + import java.util.Base64; import java.util.Collection; import java.util.Properties; -import org.apache.kafka.common.security.authenticator.CredentialCache; -import org.apache.kafka.common.security.scram.ScramCredential; - /** * SCRAM Credential persistence utility functions. Implements format conversion used * for the credential store implemented in Kafka. Credentials are persisted as a comma-separated diff --git a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramFormatter.java b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramFormatter.java index 4c03fa158b80e..8bc99a757abcb 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramFormatter.java +++ b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramFormatter.java @@ -16,6 +16,12 @@ */ package org.apache.kafka.common.security.scram.internals; +import org.apache.kafka.common.KafkaException; +import org.apache.kafka.common.security.scram.ScramCredential; +import org.apache.kafka.common.security.scram.internals.ScramMessages.ClientFinalMessage; +import org.apache.kafka.common.security.scram.internals.ScramMessages.ClientFirstMessage; +import org.apache.kafka.common.security.scram.internals.ScramMessages.ServerFirstMessage; + import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; @@ -28,12 +34,6 @@ import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -import org.apache.kafka.common.KafkaException; -import org.apache.kafka.common.security.scram.ScramCredential; -import org.apache.kafka.common.security.scram.internals.ScramMessages.ClientFinalMessage; -import org.apache.kafka.common.security.scram.internals.ScramMessages.ClientFirstMessage; -import org.apache.kafka.common.security.scram.internals.ScramMessages.ServerFirstMessage; - /** * Scram message salt and hash functions defined in RFC 5802. */ diff --git a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslClient.java b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslClient.java index 536e4097470c1..852875b9e5fe7 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslClient.java +++ b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslClient.java @@ -16,6 +16,15 @@ */ package org.apache.kafka.common.security.scram.internals; +import org.apache.kafka.common.errors.IllegalSaslStateException; +import org.apache.kafka.common.security.scram.ScramExtensionsCallback; +import org.apache.kafka.common.security.scram.internals.ScramMessages.ClientFinalMessage; +import org.apache.kafka.common.security.scram.internals.ScramMessages.ServerFinalMessage; +import org.apache.kafka.common.security.scram.internals.ScramMessages.ServerFirstMessage; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; import java.security.MessageDigest; @@ -33,14 +42,6 @@ import javax.security.sasl.SaslClientFactory; import javax.security.sasl.SaslException; -import org.apache.kafka.common.errors.IllegalSaslStateException; -import org.apache.kafka.common.security.scram.ScramExtensionsCallback; -import org.apache.kafka.common.security.scram.internals.ScramMessages.ClientFinalMessage; -import org.apache.kafka.common.security.scram.internals.ScramMessages.ServerFinalMessage; -import org.apache.kafka.common.security.scram.internals.ScramMessages.ServerFirstMessage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * SaslClient implementation for SASL/SCRAM. *

    diff --git a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslClientProvider.java b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslClientProvider.java index 126febf952516..7472feede288c 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslClientProvider.java +++ b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslClientProvider.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.common.security.scram.internals; +import org.apache.kafka.common.security.scram.internals.ScramSaslClient.ScramSaslClientFactory; + import java.security.Provider; import java.security.Security; -import org.apache.kafka.common.security.scram.internals.ScramSaslClient.ScramSaslClientFactory; - public class ScramSaslClientProvider extends Provider { private static final long serialVersionUID = 1L; diff --git a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslServer.java b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslServer.java index 28c2e5568ee40..cea3ddf71fd39 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslServer.java +++ b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslServer.java @@ -16,21 +16,6 @@ */ package org.apache.kafka.common.security.scram.internals; -import java.security.InvalidKeyException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Map; -import java.util.Set; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.NameCallback; -import javax.security.sasl.SaslException; -import javax.security.sasl.SaslServer; -import javax.security.sasl.SaslServerFactory; - import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.errors.IllegalSaslStateException; import org.apache.kafka.common.errors.SaslAuthenticationException; @@ -44,9 +29,25 @@ import org.apache.kafka.common.security.scram.internals.ScramMessages.ServerFirstMessage; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCredentialCallback; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.security.InvalidKeyException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; +import java.util.Set; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.sasl.SaslException; +import javax.security.sasl.SaslServer; +import javax.security.sasl.SaslServerFactory; + /** * SaslServer implementation for SASL/SCRAM. This server is configured with a callback * handler for integration with a credential manager. Kafka brokers provide callbacks diff --git a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslServerProvider.java b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslServerProvider.java index 7a39a2adbd8fa..5b752347a10bb 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslServerProvider.java +++ b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramSaslServerProvider.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.common.security.scram.internals; +import org.apache.kafka.common.security.scram.internals.ScramSaslServer.ScramSaslServerFactory; + import java.security.Provider; import java.security.Security; -import org.apache.kafka.common.security.scram.internals.ScramSaslServer.ScramSaslServerFactory; - public class ScramSaslServerProvider extends Provider { private static final long serialVersionUID = 1L; diff --git a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramServerCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramServerCallbackHandler.java index 1af38e9d41801..68ce30fe56c48 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramServerCallbackHandler.java +++ b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramServerCallbackHandler.java @@ -16,14 +16,6 @@ */ package org.apache.kafka.common.security.scram.internals; -import java.util.List; -import java.util.Map; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; - import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; import org.apache.kafka.common.security.authenticator.CredentialCache; import org.apache.kafka.common.security.scram.ScramCredential; @@ -32,6 +24,14 @@ import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCredentialCallback; +import java.util.List; +import java.util.Map; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.AppConfigurationEntry; + public class ScramServerCallbackHandler implements AuthenticateCallbackHandler { private final CredentialCache.Cache credentialCache; diff --git a/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingSslEngineFactory.java b/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingSslEngineFactory.java index f683feadf09fb..01c3e2e91eee5 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingSslEngineFactory.java +++ b/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingSslEngineFactory.java @@ -18,8 +18,8 @@ import java.security.KeyStore; -import java.security.NoSuchAlgorithmException; import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; import javax.net.ssl.TrustManager; diff --git a/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapper.java b/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapper.java index 3b82813f2c16f..cae9e19ad2d6b 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapper.java +++ b/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapper.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.security.ssl; import org.apache.kafka.common.KafkaException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactory.java b/clients/src/main/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactory.java index 3bdf9b70f2a0a..de23000215e60 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactory.java +++ b/clients/src/main/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactory.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.security.auth.SslEngineFactory; import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,11 +36,11 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.security.GeneralSecurityException; -import java.security.NoSuchAlgorithmException; -import java.security.KeyStoreException; import java.security.Key; import java.security.KeyFactory; import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; import java.security.SecureRandom; import java.security.cert.Certificate; @@ -69,8 +70,8 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLParameters; -import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; public class DefaultSslEngineFactory implements SslEngineFactory { diff --git a/clients/src/main/java/org/apache/kafka/common/security/ssl/SslFactory.java b/clients/src/main/java/org/apache/kafka/common/security/ssl/SslFactory.java index 0d4091b8eab8e..7113a48d969ae 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/ssl/SslFactory.java +++ b/clients/src/main/java/org/apache/kafka/common/security/ssl/SslFactory.java @@ -25,31 +25,33 @@ import org.apache.kafka.common.security.auth.SslEngineFactory; import org.apache.kafka.common.utils.ConfigUtils; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLEngineResult; -import javax.net.ssl.SSLException; import java.io.Closeable; import java.net.InetSocketAddress; import java.net.Socket; import java.nio.ByteBuffer; -import java.security.cert.Certificate; -import java.security.cert.X509Certificate; import java.security.GeneralSecurityException; import java.security.KeyStore; import java.security.Principal; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.HashSet; + +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLEngineResult; +import javax.net.ssl.SSLException; public class SslFactory implements Reconfigurable, Closeable { private static final Logger log = LoggerFactory.getLogger(SslFactory.class); diff --git a/clients/src/main/java/org/apache/kafka/common/security/ssl/SslPrincipalMapper.java b/clients/src/main/java/org/apache/kafka/common/security/ssl/SslPrincipalMapper.java index bd8c50a0a8b7f..1afeca988604f 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/ssl/SslPrincipalMapper.java +++ b/clients/src/main/java/org/apache/kafka/common/security/ssl/SslPrincipalMapper.java @@ -17,8 +17,8 @@ package org.apache.kafka.common.security.ssl; import java.io.IOException; -import java.util.List; import java.util.ArrayList; +import java.util.List; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/clients/src/main/java/org/apache/kafka/common/serialization/BytesSerializer.java b/clients/src/main/java/org/apache/kafka/common/serialization/BytesSerializer.java index 62ea6ec321fd3..f19305da63713 100644 --- a/clients/src/main/java/org/apache/kafka/common/serialization/BytesSerializer.java +++ b/clients/src/main/java/org/apache/kafka/common/serialization/BytesSerializer.java @@ -26,4 +26,3 @@ public byte[] serialize(String topic, Bytes data) { return data.get(); } } - diff --git a/clients/src/main/java/org/apache/kafka/common/serialization/ListDeserializer.java b/clients/src/main/java/org/apache/kafka/common/serialization/ListDeserializer.java index ad82c0bde8958..4fe1313bda72e 100644 --- a/clients/src/main/java/org/apache/kafka/common/serialization/ListDeserializer.java +++ b/clients/src/main/java/org/apache/kafka/common/serialization/ListDeserializer.java @@ -16,9 +16,15 @@ */ package org.apache.kafka.common.serialization; -import static org.apache.kafka.common.serialization.Serdes.ListSerde.SerializationStrategy; -import static org.apache.kafka.common.utils.Utils.mkEntry; -import static org.apache.kafka.common.utils.Utils.mkMap; +import org.apache.kafka.clients.CommonClientConfigs; +import org.apache.kafka.common.KafkaException; +import org.apache.kafka.common.config.ConfigException; +import org.apache.kafka.common.errors.SerializationException; +import org.apache.kafka.common.serialization.Serdes.ListSerde; +import org.apache.kafka.common.utils.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.ByteArrayInputStream; import java.io.DataInputStream; @@ -28,15 +34,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.kafka.clients.CommonClientConfigs; -import org.apache.kafka.common.KafkaException; -import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.errors.SerializationException; -import org.apache.kafka.common.serialization.Serdes.ListSerde; -import org.apache.kafka.common.utils.Utils; +import static org.apache.kafka.common.serialization.Serdes.ListSerde.SerializationStrategy; +import static org.apache.kafka.common.utils.Utils.mkEntry; +import static org.apache.kafka.common.utils.Utils.mkMap; public class ListDeserializer implements Deserializer> { diff --git a/clients/src/main/java/org/apache/kafka/common/serialization/ListSerializer.java b/clients/src/main/java/org/apache/kafka/common/serialization/ListSerializer.java index 2c15256c29401..99c6ef5ce85be 100644 --- a/clients/src/main/java/org/apache/kafka/common/serialization/ListSerializer.java +++ b/clients/src/main/java/org/apache/kafka/common/serialization/ListSerializer.java @@ -16,21 +16,22 @@ */ package org.apache.kafka.common.serialization; -import java.util.ArrayList; -import java.util.Iterator; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.utils.Utils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Iterator; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static org.apache.kafka.common.serialization.Serdes.ListSerde.SerializationStrategy; diff --git a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryProvider.java b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryProvider.java index 2e7e195be3129..e6ee5a45cd3a2 100644 --- a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryProvider.java +++ b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryProvider.java @@ -16,10 +16,6 @@ */ package org.apache.kafka.common.telemetry.internals; -import io.opentelemetry.proto.common.v1.AnyValue; -import io.opentelemetry.proto.common.v1.KeyValue; -import io.opentelemetry.proto.resource.v1.Resource; - import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; @@ -31,6 +27,10 @@ import java.util.Map; import java.util.stream.Collectors; +import io.opentelemetry.proto.common.v1.AnyValue; +import io.opentelemetry.proto.common.v1.KeyValue; +import io.opentelemetry.proto.resource.v1.Resource; + public class ClientTelemetryProvider implements Configurable { public static final String DOMAIN = "org.apache.kafka"; diff --git a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporter.java b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporter.java index fd2a3c695a1b6..1fbf32011e92f 100644 --- a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporter.java +++ b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporter.java @@ -16,11 +16,6 @@ */ package org.apache.kafka.common.telemetry.internals; -import io.opentelemetry.proto.metrics.v1.Metric; -import io.opentelemetry.proto.metrics.v1.MetricsData; -import io.opentelemetry.proto.metrics.v1.ResourceMetrics; -import io.opentelemetry.proto.metrics.v1.ScopeMetrics; - import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Uuid; @@ -42,6 +37,7 @@ import org.apache.kafka.common.requests.PushTelemetryResponse; import org.apache.kafka.common.telemetry.ClientTelemetryState; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,6 +57,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Predicate; +import io.opentelemetry.proto.metrics.v1.Metric; +import io.opentelemetry.proto.metrics.v1.MetricsData; +import io.opentelemetry.proto.metrics.v1.ResourceMetrics; +import io.opentelemetry.proto.metrics.v1.ScopeMetrics; + /** * The implementation of the {@link MetricsReporter} for client telemetry which manages the life-cycle * of the client telemetry collection process. The client telemetry reporter is responsible for diff --git a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetrySender.java b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetrySender.java index e6bb9d40e731c..17a6da664f803 100644 --- a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetrySender.java +++ b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetrySender.java @@ -17,7 +17,6 @@ package org.apache.kafka.common.telemetry.internals; -import java.time.Duration; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.InterruptException; @@ -25,6 +24,7 @@ import org.apache.kafka.common.requests.GetTelemetrySubscriptionsResponse; import org.apache.kafka.common.requests.PushTelemetryResponse; +import java.time.Duration; import java.util.Optional; /** diff --git a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java index 2da01f8911b04..c78fc4eeb494e 100644 --- a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.telemetry.internals; -import io.opentelemetry.proto.metrics.v1.MetricsData; - import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.compress.Compression; @@ -28,8 +26,10 @@ import org.apache.kafka.common.utils.BufferSupplier; import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -42,6 +42,8 @@ import java.util.Optional; import java.util.function.Predicate; +import io.opentelemetry.proto.metrics.v1.MetricsData; + public class ClientTelemetryUtils { private static final Logger log = LoggerFactory.getLogger(ClientTelemetryUtils.class); diff --git a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/KafkaMetricsCollector.java b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/KafkaMetricsCollector.java index e18a8d54ea1f2..b9aa92cab0d45 100644 --- a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/KafkaMetricsCollector.java +++ b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/KafkaMetricsCollector.java @@ -34,6 +34,7 @@ import org.apache.kafka.common.metrics.stats.WindowedCount; import org.apache.kafka.common.telemetry.internals.LastValueTracker.InstantAndValue; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/MetricsEmitter.java b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/MetricsEmitter.java index 6c8655d21b022..3b6a3864aa216 100644 --- a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/MetricsEmitter.java +++ b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/MetricsEmitter.java @@ -16,11 +16,10 @@ */ package org.apache.kafka.common.telemetry.internals; +import java.io.Closeable; import java.util.Collections; import java.util.List; -import java.io.Closeable; - /** * An {@code MetricsEmitter} emits the values held by the {@link SinglePointMetric}, likely first converting them * to a format suitable for exposure, storage, or transmission. The telemetry reporter is likely diff --git a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/SinglePointMetric.java b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/SinglePointMetric.java index e43814d578a01..ec02f220fc549 100644 --- a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/SinglePointMetric.java +++ b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/SinglePointMetric.java @@ -16,17 +16,17 @@ */ package org.apache.kafka.common.telemetry.internals; +import java.time.Instant; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; + import io.opentelemetry.proto.common.v1.AnyValue; import io.opentelemetry.proto.common.v1.KeyValue; import io.opentelemetry.proto.metrics.v1.AggregationTemporality; import io.opentelemetry.proto.metrics.v1.Metric; import io.opentelemetry.proto.metrics.v1.NumberDataPoint; -import java.time.Instant; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; - /** * This class represents a telemetry metric that does not yet contain resource tags. * These additional resource tags will be added before emitting metrics by the telemetry reporter. diff --git a/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java b/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java index 46ffdd6743857..f9ebd82ea11cf 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java @@ -16,6 +16,14 @@ */ package org.apache.kafka.common.utils; +import org.apache.kafka.common.MetricName; +import org.apache.kafka.common.metrics.Gauge; +import org.apache.kafka.common.metrics.MetricConfig; +import org.apache.kafka.common.metrics.Metrics; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.InputStream; import java.lang.management.ManagementFactory; import java.util.Properties; @@ -24,13 +32,6 @@ import javax.management.MBeanServer; import javax.management.ObjectName; -import org.apache.kafka.common.MetricName; -import org.apache.kafka.common.metrics.Gauge; -import org.apache.kafka.common.metrics.MetricConfig; -import org.apache.kafka.common.metrics.Metrics; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class AppInfoParser { private static final Logger log = LoggerFactory.getLogger(AppInfoParser.class); private static final String VERSION; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/CollectionUtils.java b/clients/src/main/java/org/apache/kafka/common/utils/CollectionUtils.java index 3ebbd913cca7f..c4d427a7070b1 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/CollectionUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/CollectionUtils.java @@ -19,10 +19,10 @@ import org.apache.kafka.common.TopicPartition; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Collection; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ConfigUtils.java b/clients/src/main/java/org/apache/kafka/common/utils/ConfigUtils.java index 43834464d5be5..ad150afee6344 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/ConfigUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/ConfigUtils.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.ConfigKey; import org.apache.kafka.common.config.ConfigDef.Type; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java b/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java index ce6812f6522cf..61d29a1a35302 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.common.utils; +import org.apache.kafka.common.KafkaException; + import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; @@ -24,8 +26,6 @@ import javax.management.ObjectName; -import org.apache.kafka.common.KafkaException; - /** * Utility class for sanitizing/desanitizing/quoting values used in JMX metric names * or as ZooKeeper node name. diff --git a/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java b/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java index dacd7162113d4..47a280fee5808 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java @@ -20,8 +20,9 @@ import org.apache.kafka.common.acl.AclPermissionType; import org.apache.kafka.common.config.SecurityConfig; import org.apache.kafka.common.resource.ResourceType; -import org.apache.kafka.common.security.auth.SecurityProviderCreator; import org.apache.kafka.common.security.auth.KafkaPrincipal; +import org.apache.kafka.common.security.auth.SecurityProviderCreator; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Shell.java b/clients/src/main/java/org/apache/kafka/common/utils/Shell.java index 8cf8e2f188f39..09ea398fb2e6b 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/Shell.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/Shell.java @@ -16,6 +16,9 @@ */ package org.apache.kafka.common.utils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -23,8 +26,6 @@ import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.atomic.AtomicBoolean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A base class for running a Unix command. diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Utils.java b/clients/src/main/java/org/apache/kafka/common/utils/Utils.java index a48d6cbd7a305..79f41c732ab0d 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/Utils.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/Utils.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.network.TransferableChannel; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.event.Level; diff --git a/clients/src/main/java/org/apache/kafka/server/authorizer/AclDeleteResult.java b/clients/src/main/java/org/apache/kafka/server/authorizer/AclDeleteResult.java index 994d6fde74f1c..26dffd84e2645 100644 --- a/clients/src/main/java/org/apache/kafka/server/authorizer/AclDeleteResult.java +++ b/clients/src/main/java/org/apache/kafka/server/authorizer/AclDeleteResult.java @@ -17,14 +17,14 @@ package org.apache.kafka.server.authorizer; -import java.util.Collections; -import java.util.Collection; -import java.util.Optional; - import org.apache.kafka.common.acl.AclBinding; import org.apache.kafka.common.annotation.InterfaceStability; import org.apache.kafka.common.errors.ApiException; +import java.util.Collection; +import java.util.Collections; +import java.util.Optional; + @InterfaceStability.Evolving public class AclDeleteResult { private final ApiException exception; diff --git a/clients/src/main/java/org/apache/kafka/server/authorizer/Action.java b/clients/src/main/java/org/apache/kafka/server/authorizer/Action.java index 5f2e300c7dd86..1c3d492991acb 100644 --- a/clients/src/main/java/org/apache/kafka/server/authorizer/Action.java +++ b/clients/src/main/java/org/apache/kafka/server/authorizer/Action.java @@ -17,11 +17,12 @@ package org.apache.kafka.server.authorizer; -import java.util.Objects; import org.apache.kafka.common.acl.AclOperation; import org.apache.kafka.common.annotation.InterfaceStability; import org.apache.kafka.common.resource.ResourcePattern; +import java.util.Objects; + @InterfaceStability.Evolving public class Action { diff --git a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizableRequestContext.java b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizableRequestContext.java index f68b9381ce1d9..19e3e09b93427 100644 --- a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizableRequestContext.java +++ b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizableRequestContext.java @@ -17,11 +17,12 @@ package org.apache.kafka.server.authorizer; -import java.net.InetAddress; import org.apache.kafka.common.annotation.InterfaceStability; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.SecurityProtocol; +import java.net.InetAddress; + /** * Request context interface that provides data from request header as well as connection * and authentication information to plugins. diff --git a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizerServerInfo.java b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizerServerInfo.java index eb03c117b6c95..9650337f4de19 100644 --- a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizerServerInfo.java +++ b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizerServerInfo.java @@ -17,11 +17,12 @@ package org.apache.kafka.server.authorizer; -import java.util.Collection; import org.apache.kafka.common.ClusterResource; import org.apache.kafka.common.Endpoint; import org.apache.kafka.common.annotation.InterfaceStability; +import java.util.Collection; + /** * Runtime broker configuration metadata provided to authorizers during start up. */ diff --git a/clients/src/main/java/org/apache/kafka/server/quota/ClientQuotaCallback.java b/clients/src/main/java/org/apache/kafka/server/quota/ClientQuotaCallback.java index bb1a5deafe02a..f557daecdaf1e 100644 --- a/clients/src/main/java/org/apache/kafka/server/quota/ClientQuotaCallback.java +++ b/clients/src/main/java/org/apache/kafka/server/quota/ClientQuotaCallback.java @@ -103,4 +103,3 @@ public interface ClientQuotaCallback extends Configurable { */ void close(); } - diff --git a/clients/src/test/java/org/apache/kafka/clients/ApiVersionsTest.java b/clients/src/test/java/org/apache/kafka/clients/ApiVersionsTest.java index 89065536435c2..37ed426581731 100644 --- a/clients/src/test/java/org/apache/kafka/clients/ApiVersionsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/ApiVersionsTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.ApiVersionsResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.record.RecordBatch; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/ClientUtilsTest.java b/clients/src/test/java/org/apache/kafka/clients/ClientUtilsTest.java index 9e54df834119f..071bf7635fd8a 100644 --- a/clients/src/test/java/org/apache/kafka/clients/ClientUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/ClientUtilsTest.java @@ -16,14 +16,16 @@ */ package org.apache.kafka.clients; +import org.apache.kafka.common.config.ConfigException; + +import org.junit.jupiter.api.Test; + import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.apache.kafka.common.config.ConfigException; -import org.junit.jupiter.api.Test; import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java b/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java index 8f066c668c919..f647d95445f00 100644 --- a/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java @@ -17,28 +17,28 @@ package org.apache.kafka.clients; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; +import org.apache.kafka.common.errors.AuthenticationException; +import org.apache.kafka.common.utils.LogContext; +import org.apache.kafka.common.utils.MockTime; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.UnknownHostException; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import org.apache.kafka.common.errors.AuthenticationException; -import org.apache.kafka.common.utils.LogContext; -import org.apache.kafka.common.utils.MockTime; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ClusterConnectionStatesTest { diff --git a/clients/src/test/java/org/apache/kafka/clients/CommonClientConfigsTest.java b/clients/src/test/java/org/apache/kafka/clients/CommonClientConfigsTest.java index d53630f121153..dbda406c2d849 100644 --- a/clients/src/test/java/org/apache/kafka/clients/CommonClientConfigsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/CommonClientConfigsTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.metrics.MetricsReporter; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/FetchSessionHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/FetchSessionHandlerTest.java index a14b1b34b3984..3166206f0a41f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/FetchSessionHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/FetchSessionHandlerTest.java @@ -16,16 +16,17 @@ */ package org.apache.kafka.clients; -import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicIdPartition; +import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.message.FetchResponseData; +import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.FetchMetadata; import org.apache.kafka.common.requests.FetchRequest; import org.apache.kafka.common.requests.FetchResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; @@ -44,8 +45,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.stream.Stream; import java.util.TreeSet; +import java.util.stream.Stream; import static org.apache.kafka.common.requests.FetchMetadata.INITIAL_EPOCH; import static org.apache.kafka.common.requests.FetchMetadata.INVALID_SESSION_ID; diff --git a/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java b/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java index 78952286aebe2..006de9d06d987 100644 --- a/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/InFlightRequestsTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/MetadataSnapshotTest.java b/clients/src/test/java/org/apache/kafka/clients/MetadataSnapshotTest.java index 1012709926a72..6e722ba8a176e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/MetadataSnapshotTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/MetadataSnapshotTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients; -import java.util.OptionalInt; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; @@ -24,6 +23,7 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.MetadataResponse; + import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -31,6 +31,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; +import java.util.OptionalInt; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java index a6371c6db6086..3573e5b6575a8 100644 --- a/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/MetadataTest.java @@ -16,11 +16,6 @@ */ package org.apache.kafka.clients; -import java.util.OptionalInt; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import org.apache.kafka.common.Cluster; import org.apache.kafka.common.ClusterResourceListener; import org.apache.kafka.common.Node; @@ -48,6 +43,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.MockClusterResourceListener; + import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -62,7 +58,12 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.OptionalInt; import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; diff --git a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java index 25c7450b13915..18442a2f928ca 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java @@ -54,6 +54,7 @@ import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java b/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java index 11cca0c60bda8..f5201bacd1e56 100644 --- a/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/NodeApiVersionsTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.requests.ApiVersionsResponse; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientConfigTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientConfigTest.java index 92dc56fde46a3..252aa63109a89 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientConfigTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientConfigTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.MetadataRecoveryStrategy; import org.apache.kafka.common.config.ConfigException; + import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientTestUtils.java b/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientTestUtils.java index a84927c735f58..6a79299d3b278 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientTestUtils.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/AdminClientTestUtils.java @@ -16,12 +16,6 @@ */ package org.apache.kafka.clients.admin; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.stream.Collectors; - import org.apache.kafka.clients.HostResolver; import org.apache.kafka.clients.admin.CreateTopicsResult.TopicMetadataAndConfig; import org.apache.kafka.clients.admin.internals.CoordinatorKey; @@ -33,6 +27,12 @@ import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.internals.KafkaFutureImpl; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.stream.Collectors; + public class AdminClientTestUtils { /** diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/ConfigTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/ConfigTest.java index 7d70d58a71ac2..d09cca7ad665b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/ConfigTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/ConfigTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.clients.admin; import org.apache.kafka.clients.admin.ConfigEntry.ConfigType; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java index e0e0d5b4c0d13..b7dcab344bc82 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResultTest.java @@ -20,9 +20,9 @@ import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.internals.KafkaFutureImpl; - import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteTopicsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteTopicsResultTest.java index 3c2add40db20f..3d6edeb4c3c43 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/DeleteTopicsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/DeleteTopicsResultTest.java @@ -19,15 +19,17 @@ import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.internals.KafkaFutureImpl; + import org.junit.jupiter.api.Test; + +import java.util.Collections; +import java.util.Map; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.Collections; -import java.util.Map; - public class DeleteTopicsResultTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/DescribeTopicsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/DescribeTopicsResultTest.java index c73c8a1b952af..399e3a6834898 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/DescribeTopicsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/DescribeTopicsResultTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.Uuid; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResultTest.java index 13119e9f2cf5e..8953a25aac8ce 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResultTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.message.DescribeUserScramCredentialsResponseData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java index ea73b6685411f..133dc467eb759 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java @@ -227,6 +227,7 @@ import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.MockMetricsReporter; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java index 769c50b8518c1..80b5a0e35a60e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/ListTransactionsResultTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import java.util.Collection; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/MemberDescriptionTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/MemberDescriptionTest.java index f0140f7d2edd1..0bddc618cfc03 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/MemberDescriptionTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/MemberDescriptionTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.admin; import org.apache.kafka.common.TopicPartition; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java index 5c8894db5e5d8..8ff65b51a2293 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java @@ -35,6 +35,8 @@ import org.apache.kafka.common.acl.AclBindingFilter; import org.apache.kafka.common.acl.AclOperation; import org.apache.kafka.common.config.ConfigResource; +import org.apache.kafka.common.errors.DelegationTokenNotFoundException; +import org.apache.kafka.common.errors.InvalidPrincipalTypeException; import org.apache.kafka.common.errors.InvalidReplicationFactorException; import org.apache.kafka.common.errors.InvalidRequestException; import org.apache.kafka.common.errors.InvalidUpdateVersionException; @@ -49,12 +51,14 @@ import org.apache.kafka.common.quota.ClientQuotaAlteration; import org.apache.kafka.common.quota.ClientQuotaFilter; import org.apache.kafka.common.requests.DescribeLogDirsResponse; -import org.apache.kafka.common.errors.DelegationTokenNotFoundException; -import org.apache.kafka.common.errors.InvalidPrincipalTypeException; +import org.apache.kafka.common.security.auth.KafkaPrincipal; +import org.apache.kafka.common.security.token.delegation.DelegationToken; +import org.apache.kafka.common.security.token.delegation.TokenInformation; +import org.apache.kafka.common.utils.Time; import java.time.Duration; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -63,10 +67,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.apache.kafka.common.security.auth.KafkaPrincipal; -import org.apache.kafka.common.security.token.delegation.DelegationToken; -import org.apache.kafka.common.security.token.delegation.TokenInformation; -import org.apache.kafka.common.utils.Time; public class MockAdminClient extends AdminClient { public static final String DEFAULT_CLUSTER_ID = "I4ZmrWqfT2e-upky_4fdPA"; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/NewTopicTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/NewTopicTest.java index 78591cf20cab3..68882242c7898 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/NewTopicTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/NewTopicTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.admin; import org.apache.kafka.common.message.CreateTopicsRequestData; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java index b0ea46e877dc2..40f7f5ff49969 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java @@ -20,9 +20,9 @@ import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.message.LeaveGroupRequestData.MemberIdentity; - import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/ScramMechanismTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/ScramMechanismTest.java index 03ee0516b6521..74cde808e71f9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/ScramMechanismTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/ScramMechanismTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.clients.admin; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + class ScramMechanismTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/TopicCollectionTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/TopicCollectionTest.java index a8ee16670e2f9..d782f2d7c3737 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/TopicCollectionTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/TopicCollectionTest.java @@ -16,16 +16,18 @@ */ package org.apache.kafka.clients.admin; -import org.apache.kafka.common.Uuid; import org.apache.kafka.common.TopicCollection; import org.apache.kafka.common.TopicCollection.TopicIdCollection; import org.apache.kafka.common.TopicCollection.TopicNameCollection; +import org.apache.kafka.common.Uuid; + import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TopicCollectionTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandlerTest.java index e0e4e9b202523..453b49b328431 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandlerTest.java @@ -30,6 +30,7 @@ import org.apache.kafka.common.requests.WriteTxnMarkersRequest; import org.apache.kafka.common.requests.WriteTxnMarkersResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import static java.util.Collections.emptyList; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminApiDriverTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminApiDriverTest.java index 4f4092ef25b89..c183dbbc6222e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminApiDriverTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminApiDriverTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import java.util.concurrent.ConcurrentHashMap; - import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.internals.AdminApiDriver.RequestSpec; import org.apache.kafka.clients.admin.internals.AdminApiHandler.ApiResult; @@ -36,6 +34,7 @@ import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -48,6 +47,7 @@ import java.util.Optional; import java.util.OptionalInt; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminBootstrapAddressesTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminBootstrapAddressesTest.java index 2b6923e5bcbc9..a61a7bdfda5f1 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminBootstrapAddressesTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminBootstrapAddressesTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.common.config.ConfigException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java index 1e23e0148adf2..54ac41755823e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.common.errors.AuthenticationException; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java index cd68341125f30..395688d03752b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyIntegrationTest.java @@ -31,6 +31,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyTest.java index 8c30d93038f70..3fdfd3f15a07c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AllBrokersStrategyTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandlerTest.java index 80453cc9b85d4..3fa80e584a2a8 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AlterConsumerGroupOffsetsHandlerTest.java @@ -16,17 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import static java.util.Collections.emptyMap; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptySet; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - import org.apache.kafka.clients.admin.internals.AdminApiHandler.ApiResult; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.Node; @@ -39,6 +28,17 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import static java.util.Collections.emptyList; +import static java.util.Collections.emptyMap; +import static java.util.Collections.emptySet; +import static java.util.Collections.singleton; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class AlterConsumerGroupOffsetsHandlerTest { private final LogContext logContext = new LogContext(); diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategyTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategyTest.java index 823d4b39b1e9a..d0b69339c3655 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategyTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/CoordinatorStrategyTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.requests.FindCoordinatorRequest.CoordinatorType; import org.apache.kafka.common.requests.FindCoordinatorResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandlerTest.java index 9be96c2c60cdc..e975b2acbaed6 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupOffsetsHandlerTest.java @@ -16,20 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptySet; -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.GroupAuthorizationException; @@ -45,8 +31,23 @@ import org.apache.kafka.common.requests.OffsetDeleteRequest; import org.apache.kafka.common.requests.OffsetDeleteResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; +import static java.util.Collections.singleton; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + public class DeleteConsumerGroupOffsetsHandlerTest { private final LogContext logContext = new LogContext(); diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandlerTest.java index efdde52770fb9..8c4d9eb0eff9a 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteConsumerGroupsHandlerTest.java @@ -16,13 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptySet; -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; - import org.apache.kafka.common.Node; import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.errors.GroupIdNotFoundException; @@ -35,8 +28,16 @@ import org.apache.kafka.common.requests.DeleteGroupsRequest; import org.apache.kafka.common.requests.DeleteGroupsResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; +import static java.util.Collections.singleton; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + public class DeleteConsumerGroupsHandlerTest { private final LogContext logContext = new LogContext(); diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandlerTest.java index 58492696c4da8..b85f2d40d939b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandlerTest.java @@ -16,14 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import org.apache.kafka.clients.admin.DeletedRecords; import org.apache.kafka.clients.admin.RecordsToDelete; import org.apache.kafka.clients.admin.internals.AdminApiLookupStrategy.LookupResult; @@ -41,13 +33,21 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; import static java.util.Collections.singleton; - import static org.apache.kafka.common.utils.Utils.mkSet; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandlerTest.java index e974ee0f9f541..1c6afc7208f44 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeConsumerGroupsHandlerTest.java @@ -16,25 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptySet; -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; -import static org.apache.kafka.common.utils.Utils.mkSet; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Optional; -import java.util.Set; - import org.apache.kafka.clients.admin.ConsumerGroupDescription; import org.apache.kafka.clients.admin.MemberAssignment; import org.apache.kafka.clients.admin.MemberDescription; @@ -61,10 +42,30 @@ import org.apache.kafka.common.requests.DescribeGroupsResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.Optional; +import java.util.Set; + +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; +import static java.util.Collections.singleton; +import static java.util.Collections.singletonList; +import static org.apache.kafka.common.utils.Utils.mkSet; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class DescribeConsumerGroupsHandlerTest { private final LogContext logContext = new LogContext(); diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandlerTest.java index 6ecf328819240..e865c0d2d5181 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeProducersHandlerTest.java @@ -35,6 +35,7 @@ import org.apache.kafka.common.requests.DescribeProducersResponse; import org.apache.kafka.common.utils.CollectionUtils; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import java.util.HashSet; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandlerTest.java index b744795cd98ec..16f437d299126 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/DescribeTransactionsHandlerTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.requests.DescribeTransactionsRequest; import org.apache.kafka.common.requests.DescribeTransactionsResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import java.util.HashSet; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/FenceProducersHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/FenceProducersHandlerTest.java index 62258289a9021..6f338f5efb89c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/FenceProducersHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/FenceProducersHandlerTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.requests.InitProducerIdResponse; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.ProducerIdAndEpoch; + import org.junit.jupiter.api.Test; import java.util.Set; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandlerTest.java index 6484b842dd817..2ddca0e7dbc5f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListConsumerGroupOffsetsHandlerTest.java @@ -16,28 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptySet; -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsSpec; import org.apache.kafka.clients.admin.internals.AdminApiHandler.RequestAndKeys; import org.apache.kafka.clients.consumer.OffsetAndMetadata; @@ -54,8 +32,30 @@ import org.apache.kafka.common.requests.OffsetFetchResponse.PartitionData; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; +import static java.util.Collections.singleton; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ListConsumerGroupOffsetsHandlerTest { private final LogContext logContext = new LogContext(); diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandlerTest.java index ccdc71803468d..fe02303706aa3 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandlerTest.java @@ -16,21 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptyMap; -import static java.util.Collections.emptySet; -import static java.util.Collections.singleton; -import static org.apache.kafka.common.utils.Utils.mkSet; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; import org.apache.kafka.clients.admin.ListOffsetsOptions; import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; import org.apache.kafka.clients.admin.OffsetSpec; @@ -48,8 +33,25 @@ import org.apache.kafka.common.requests.ListOffsetsRequest; import org.apache.kafka.common.requests.ListOffsetsResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import static java.util.Collections.emptyList; +import static java.util.Collections.emptyMap; +import static java.util.Collections.emptySet; +import static java.util.Collections.singleton; +import static org.apache.kafka.common.utils.Utils.mkSet; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public final class ListOffsetsHandlerTest { private final LogContext logContext = new LogContext(); diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandlerTest.java index 89582529212da..52073551e3d79 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/ListTransactionsHandlerTest.java @@ -28,6 +28,7 @@ import org.apache.kafka.common.requests.ListTransactionsRequest; import org.apache.kafka.common.requests.ListTransactionsResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import java.util.Collection; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyTest.java index d17443b8be071..9ce2cd43ec9f9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/PartitionLeaderStrategyTest.java @@ -29,6 +29,7 @@ import org.apache.kafka.common.requests.MetadataRequest; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandlerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandlerTest.java index d443af968312b..eb84e4780bfd8 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/RemoveMembersFromConsumerGroupHandlerTest.java @@ -16,18 +16,6 @@ */ package org.apache.kafka.clients.admin.internals; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptySet; -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; - import org.apache.kafka.common.Node; import org.apache.kafka.common.errors.GroupAuthorizationException; import org.apache.kafka.common.errors.UnknownServerException; @@ -38,8 +26,21 @@ import org.apache.kafka.common.requests.LeaveGroupRequest; import org.apache.kafka.common.requests.LeaveGroupResponse; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; +import static java.util.Collections.singleton; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + public class RemoveMembersFromConsumerGroupHandlerTest { private final LogContext logContext = new LogContext(); diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerConfigTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerConfigTest.java index 0fc8e6ca48567..e4cc699484e14 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerConfigTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerConfigTest.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.serialization.ByteArrayDeserializer; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringDeserializer; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerGroupMetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerGroupMetadataTest.java index a34e1dd88a4f8..b5f8b14cdafe3 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerGroupMetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerGroupMetadataTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.consumer; import org.apache.kafka.common.requests.JoinGroupRequest; + import org.junit.jupiter.api.Test; import java.util.Optional; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerPartitionAssignorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerPartitionAssignorTest.java index 3cab19a6a10c0..ab33c8f45d7fd 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerPartitionAssignorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerPartitionAssignorTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.Configurable; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.serialization.StringDeserializer; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerRecordTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerRecordTest.java index 848f75c678d19..d5d45b6abcb3e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerRecordTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerRecordTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.record.TimestampType; + import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerRecordsTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerRecordsTest.java index 2473fd9be28a5..78f6754d87c7b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/ConsumerRecordsTest.java @@ -16,6 +16,12 @@ */ package org.apache.kafka.clients.consumer; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.header.internals.RecordHeaders; +import org.apache.kafka.common.record.TimestampType; + +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -26,11 +32,6 @@ import java.util.Map; import java.util.Optional; -import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.header.internals.RecordHeaders; -import org.apache.kafka.common.record.TimestampType; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/CooperativeStickyAssignorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/CooperativeStickyAssignorTest.java index 23c8836395dc9..b85d000e167b9 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/CooperativeStickyAssignorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/CooperativeStickyAssignorTest.java @@ -24,6 +24,10 @@ import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collections; @@ -33,17 +37,13 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; +import static java.util.Collections.emptyList; import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.TEST_NAME_WITH_RACK_CONFIG; import static org.apache.kafka.clients.consumer.internals.AbstractStickyAssignor.DEFAULT_GENERATION; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static java.util.Collections.emptyList; public class CooperativeStickyAssignorTest extends AbstractStickyAssignorTest { diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java index cfe4d03e6a84b..efb4406965a1a 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java @@ -96,6 +96,7 @@ import org.apache.kafka.test.MockConsumerInterceptor; import org.apache.kafka.test.MockMetricsReporter; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; @@ -134,6 +135,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.management.MBeanServer; import javax.management.ObjectName; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/MockConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/MockConsumerTest.java index c03be92fb9a1d..a9b0c2843d988 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/MockConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/MockConsumerTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.record.TimestampType; + import org.junit.jupiter.api.Test; import java.time.Duration; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/MockShareConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/MockShareConsumerTest.java index 79ba87d459711..63725071ada8f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/MockShareConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/MockShareConsumerTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.record.TimestampType; + import org.junit.jupiter.api.Test; import java.time.Duration; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/OffsetAndMetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/OffsetAndMetadataTest.java index 5e4ef68027447..3035703ff37ab 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/OffsetAndMetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/OffsetAndMetadataTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.consumer; import org.apache.kafka.common.utils.Serializer; + import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/RangeAssignorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/RangeAssignorTest.java index 0fffa69981b25..5fb2c1696105a 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/RangeAssignorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/RangeAssignorTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.RackConfig; import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -42,8 +43,8 @@ import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.ALL_RACKS; import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.TEST_NAME_WITH_CONSUMER_RACK; import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.TEST_NAME_WITH_RACK_CONFIG; -import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.racks; import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.nullRacks; +import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.racks; import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.verifyRackAssignment; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/RoundRobinAssignorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/RoundRobinAssignorTest.java index 686bf9d95584c..def6ec9e7679e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/RoundRobinAssignorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/RoundRobinAssignorTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignor; import org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignor.MemberInfo; import org.apache.kafka.common.TopicPartition; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/StickyAssignorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/StickyAssignorTest.java index 6eaed58694901..65ea13100eb76 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/StickyAssignorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/StickyAssignorTest.java @@ -16,23 +16,6 @@ */ package org.apache.kafka.clients.consumer; -import static org.apache.kafka.clients.consumer.StickyAssignor.serializeTopicPartitionAssignment; -import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.TEST_NAME_WITH_RACK_CONFIG; -import static org.apache.kafka.clients.consumer.internals.AbstractStickyAssignor.DEFAULT_GENERATION; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; import org.apache.kafka.clients.consumer.ConsumerPartitionAssignor.Subscription; import org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.RackConfig; import org.apache.kafka.clients.consumer.internals.AbstractStickyAssignor; @@ -42,13 +25,31 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.protocol.types.Struct; import org.apache.kafka.common.utils.CollectionUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import static java.util.Collections.emptyList; +import static org.apache.kafka.clients.consumer.StickyAssignor.serializeTopicPartitionAssignment; +import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.TEST_NAME_WITH_RACK_CONFIG; +import static org.apache.kafka.clients.consumer.internals.AbstractStickyAssignor.DEFAULT_GENERATION; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class StickyAssignorTest extends AbstractStickyAssignorTest { diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java index 7984aaf6d98f3..f82bb011b8412 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java @@ -58,6 +58,7 @@ import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractPartitionAssignorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractPartitionAssignorTest.java index 048d168bd99a1..3b58fa3101899 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractPartitionAssignorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractPartitionAssignorTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignorTest.java index 7fe35977e458e..31334b7b19c52 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignorTest.java @@ -16,19 +16,6 @@ */ package org.apache.kafka.clients.consumer.internals; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.Set; -import java.util.stream.Collectors; - import org.apache.kafka.clients.consumer.ConsumerPartitionAssignor.Subscription; import org.apache.kafka.clients.consumer.CooperativeStickyAssignor; import org.apache.kafka.clients.consumer.StickyAssignor; @@ -37,6 +24,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.utils.CollectionUtils; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -44,10 +32,23 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Random; +import java.util.Set; +import java.util.stream.Collectors; + import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.TEST_NAME_WITH_RACK_CONFIG; import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.TEST_NAME_WITH_CONSUMER_RACK; +import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.TEST_NAME_WITH_RACK_CONFIG; import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.nullRacks; import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.racks; import static org.apache.kafka.clients.consumer.internals.AbstractPartitionAssignorTest.verifyRackAssignment; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java index 9b15938c460ab..192f2655a6510 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java @@ -50,10 +50,10 @@ import org.apache.kafka.clients.consumer.internals.events.SyncCommitEvent; import org.apache.kafka.clients.consumer.internals.events.UnsubscribeEvent; import org.apache.kafka.clients.consumer.internals.events.ValidatePositionsEvent; +import org.apache.kafka.common.Cluster; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Metric; import org.apache.kafka.common.Node; -import org.apache.kafka.common.Cluster; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.FencedInstanceIdException; import org.apache.kafka.common.errors.GroupAuthorizationException; @@ -72,6 +72,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.test.MockConsumerInterceptor; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; @@ -130,6 +131,7 @@ import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; @@ -139,7 +141,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.mockito.Mockito.clearInvocations; @SuppressWarnings("unchecked") public class AsyncKafkaConsumerTest { @@ -2178,4 +2179,3 @@ private void forceCommitCallbackInvocation() { consumer.commitAsync(); } } - diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java index 7314074360360..dc16d31c6345e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java @@ -44,6 +44,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java index f5832a56dc2a4..f7be3a58ffd7d 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java @@ -44,6 +44,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java index b5be02d6a1b37..7eaf0c8bd5a36 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinatorTest.java @@ -83,6 +83,7 @@ import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerInterceptorsTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerInterceptorsTest.java index 27404877ec014..a917f87246c90 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerInterceptorsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerInterceptorsTest.java @@ -17,20 +17,21 @@ package org.apache.kafka.clients.consumer.internals; -import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerInterceptor; +import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.record.TimestampType; + import org.junit.jupiter.api.Test; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadataTest.java index a6864a5c7b308..ca0f9e42ae3f8 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerMetadataTest.java @@ -29,6 +29,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java index a2ec3125aac93..a21001d510236 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkClientTest.java @@ -40,6 +40,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.time.Duration; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java index e02c983ed374e..3b44d03ca0551 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerNetworkThreadTest.java @@ -36,6 +36,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestCondition; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -48,10 +49,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.List; -import java.util.LinkedList; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.stream.Stream; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerProtocolTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerProtocolTest.java index 27fc21a93a476..1f465a5ef5420 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerProtocolTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerProtocolTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.protocol.types.Schema; import org.apache.kafka.common.protocol.types.Struct; import org.apache.kafka.common.protocol.types.Type; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManagerTest.java index 01ba51134d23f..c003574a23f82 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CoordinatorRequestManagerTest.java @@ -30,6 +30,7 @@ import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/EagerConsumerCoordinatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/EagerConsumerCoordinatorTest.java index 5bcfc8c33c901..d005318cb8d21 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/EagerConsumerCoordinatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/EagerConsumerCoordinatorTest.java @@ -23,4 +23,3 @@ public EagerConsumerCoordinatorTest() { super(ConsumerPartitionAssignor.RebalanceProtocol.EAGER); } } - diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java index 967a5bb2aab8b..1f33a6e020fd3 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java @@ -27,6 +27,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java index 4667b12d4e5fa..60d54f863db6a 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java @@ -36,6 +36,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchConfigTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchConfigTest.java index f38a6294624ad..34d6b16b9b069 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchConfigTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchConfigTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.IsolationLevel; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringSerializer; + import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchMetricsManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchMetricsManagerTest.java index a86255cb47799..4fec94d96a493 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchMetricsManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchMetricsManagerTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java index b16cb6482e4fd..ce242e4bc74d5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java @@ -92,6 +92,7 @@ import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java index d0167e9b9897a..cb48a2289a16d 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java @@ -34,8 +34,8 @@ import org.apache.kafka.common.MetricName; import org.apache.kafka.common.MetricNameTemplate; import org.apache.kafka.common.Node; -import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicIdPartition; +import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.RecordTooLargeException; @@ -44,8 +44,8 @@ import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.internals.ClusterResourceListeners; -import org.apache.kafka.common.message.FetchResponseData; import org.apache.kafka.common.message.ApiMessageType; +import org.apache.kafka.common.message.FetchResponseData; import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData; import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.EpochEndOffset; import org.apache.kafka.common.message.OffsetForLeaderEpochResponseData.OffsetForLeaderTopicResult; @@ -55,9 +55,6 @@ import org.apache.kafka.common.network.NetworkReceive; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; -import org.apache.kafka.common.requests.FetchMetadata; -import org.apache.kafka.common.requests.FetchRequest.PartitionData; -import org.apache.kafka.common.utils.BufferSupplier; import org.apache.kafka.common.record.CompressionType; import org.apache.kafka.common.record.ControlRecordType; import org.apache.kafka.common.record.DefaultRecordBatch; @@ -71,7 +68,9 @@ import org.apache.kafka.common.record.SimpleRecord; import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.common.requests.ApiVersionsResponse; +import org.apache.kafka.common.requests.FetchMetadata; import org.apache.kafka.common.requests.FetchRequest; +import org.apache.kafka.common.requests.FetchRequest.PartitionData; import org.apache.kafka.common.requests.FetchResponse; import org.apache.kafka.common.requests.MetadataResponse; import org.apache.kafka.common.requests.OffsetsForLeaderEpochResponse; @@ -80,6 +79,7 @@ import org.apache.kafka.common.serialization.BytesDeserializer; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.utils.BufferSupplier; import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; @@ -88,13 +88,14 @@ import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.EnumSource; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.ArgumentCaptor; import java.io.DataOutputStream; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManagerTest.java index f63dd55754a76..bb2680b2e0b76 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManagerTest.java @@ -45,6 +45,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImplTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImplTest.java index 44de312087a41..46f22bd96b235 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImplTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/MembershipManagerImplTest.java @@ -38,6 +38,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/MockRebalanceListener.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/MockRebalanceListener.java index be802542e26a0..98e742d6c1efc 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/MockRebalanceListener.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/MockRebalanceListener.java @@ -16,10 +16,11 @@ */ package org.apache.kafka.clients.consumer.internals; -import java.util.Collection; import org.apache.kafka.clients.consumer.ConsumerRebalanceListener; import org.apache.kafka.common.TopicPartition; +import java.util.Collection; + public class MockRebalanceListener implements ConsumerRebalanceListener { public Collection lost; public Collection revoked; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java index 720e6456644c8..10e454499431f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/NetworkClientDelegateTest.java @@ -35,6 +35,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvokerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvokerTest.java index a2e5288ac023a..cf54f10f385fa 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvokerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvokerTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.clients.consumer.OffsetCommitCallback; import org.apache.kafka.common.TopicPartition; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java index 2029d608f032a..b12da4bb6257b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetFetcherTest.java @@ -60,6 +60,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetForLeaderEpochClientTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetForLeaderEpochClientTest.java index 8a10fb73755c1..721f1560f562c 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetForLeaderEpochClientTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetForLeaderEpochClientTest.java @@ -31,6 +31,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java index dc252aae31152..c28202efa01cc 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetsRequestManagerTest.java @@ -44,6 +44,7 @@ import org.apache.kafka.common.requests.RequestHeader; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java index 640c7e98e4225..4413adfed66ca 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestManagersTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.Test; import java.util.Optional; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestStateTest.java index d8f58d83cf069..ecca5e90fdd9e 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/RequestStateTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.consumer.internals; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import java.util.function.BiConsumer; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java index a70e559fcc676..160507271a3b5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java @@ -31,6 +31,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TimedRequestStateTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TimedRequestStateTest.java index e0f4e579be60c..a7ae9cf9bb4d7 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TimedRequestStateTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TimedRequestStateTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Timer; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcherTest.java index 79f44f2f55037..e5b2833b154b5 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataFetcherTest.java @@ -33,6 +33,7 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManagerTest.java index 56eff5b4f4b58..c977c3ebf3da8 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicMetadataRequestManagerTest.java @@ -35,6 +35,7 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicPartitionComparatorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicPartitionComparatorTest.java index 5877304dbfe2e..6b2039700b5ba 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicPartitionComparatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/TopicPartitionComparatorTest.java @@ -16,13 +16,14 @@ */ package org.apache.kafka.clients.consumer.internals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.apache.kafka.clients.consumer.internals.Utils.TopicPartitionComparator; import org.apache.kafka.common.TopicPartition; + import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TopicPartitionComparatorTest { private static final TopicPartition TP1 = new TopicPartition("t1", 0); private static final TopicPartition TP1_COPY = new TopicPartition("t1", 0); diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/WakeupTriggerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/WakeupTriggerTest.java index b4164431e475b..5b63badba73bf 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/WakeupTriggerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/WakeupTriggerTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.consumer.internals; import org.apache.kafka.common.errors.WakeupException; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.junit.jupiter.MockitoSettings; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java index 3202266a33a81..9edfab9a0fbff 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventProcessorTest.java @@ -27,6 +27,7 @@ import org.apache.kafka.clients.consumer.internals.RequestManagers; import org.apache.kafka.clients.consumer.internals.TopicMetadataRequestManager; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaperTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaperTest.java index 460b7368fb9e6..eabcb8773e17f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaperTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/events/CompletableEventReaperTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/HeartbeatMetricsManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/HeartbeatMetricsManagerTest.java index 6a01daa9b8237..fe7f8a0a02385 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/HeartbeatMetricsManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/HeartbeatMetricsManagerTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.Test; import java.util.Random; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/OffsetCommitMetricsManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/OffsetCommitMetricsManagerTest.java index de5a29445be0e..4d0f3f619a1db 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/OffsetCommitMetricsManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/OffsetCommitMetricsManagerTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/RebalanceCallbackMetricsManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/RebalanceCallbackMetricsManagerTest.java index 45dd1c42a75f5..876d06a99673f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/RebalanceCallbackMetricsManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/metrics/RebalanceCallbackMetricsManagerTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java index e0445929eca6e..5312d9d267e20 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java @@ -86,6 +86,7 @@ import org.apache.kafka.test.MockProducerInterceptor; import org.apache.kafka.test.MockSerializer; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; @@ -119,6 +120,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; + import javax.management.MBeanServer; import javax.management.ObjectName; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/MockProducerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/MockProducerTest.java index 61950cce34a9c..d27a297d30a9b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/MockProducerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/MockProducerTest.java @@ -27,6 +27,7 @@ import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.test.MockSerializer; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/ProducerConfigTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/ProducerConfigTest.java index eba5e8a0a7b16..f3ec9ca96c2ee 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/ProducerConfigTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/ProducerConfigTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.Serializer; import org.apache.kafka.common.serialization.StringSerializer; + import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/RecordMetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/RecordMetadataTest.java index b6207fba8c305..1c4b4e25a28b7 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/RecordMetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/RecordMetadataTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.clients.producer; import org.apache.kafka.common.TopicPartition; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/RecordSendTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/RecordSendTest.java index 6dd93f7fc647d..0fd2dd8c459ce 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/RecordSendTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/RecordSendTest.java @@ -16,25 +16,25 @@ */ package org.apache.kafka.clients.producer; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - - import org.apache.kafka.clients.producer.internals.FutureRecordMetadata; import org.apache.kafka.clients.producer.internals.ProduceRequestResult; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.Test; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class RecordSendTest { private final TopicPartition topicPartition = new TopicPartition("test", 0); diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/RoundRobinPartitionerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/RoundRobinPartitionerTest.java index b77b453f716d1..37f35b0a5a31f 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/RoundRobinPartitionerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/RoundRobinPartitionerTest.java @@ -19,12 +19,14 @@ import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; + import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/UniformStickyPartitionerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/UniformStickyPartitionerTest.java index 74a23d5820f7a..dbaa9dcdecd84 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/UniformStickyPartitionerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/UniformStickyPartitionerTest.java @@ -19,12 +19,14 @@ import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; + import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -207,4 +209,3 @@ public void testRoundRobinWithNullKeyBytes() { assertEquals(60, partitionCount.get(newPart).intValue()); } } - diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java index 1578c2e22492a..7b72643411305 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BufferPoolTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -31,8 +32,8 @@ import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executors; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BuiltInPartitionerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BuiltInPartitionerTest.java index 71f06a635428e..dbd7ed6628a75 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/BuiltInPartitionerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/BuiltInPartitionerTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/DefaultPartitionerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/DefaultPartitionerTest.java index 8c95c6a1f07dc..353e07b366af6 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/DefaultPartitionerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/DefaultPartitionerTest.java @@ -20,10 +20,12 @@ import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; + import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; + import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/FutureRecordMetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/FutureRecordMetadataTest.java index 1fd7a438e3a43..a132c65c1c795 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/FutureRecordMetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/FutureRecordMetadataTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutionException; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java index e2b3d855a747f..ab9a56f2b3eb7 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerBatchTest.java @@ -16,7 +16,6 @@ */ package org.apache.kafka.clients.producer.internals; -import java.util.OptionalInt; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.KafkaException; @@ -31,6 +30,7 @@ import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.record.TimestampType; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; @@ -40,6 +40,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.OptionalInt; import java.util.concurrent.ExecutionException; import java.util.function.Function; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerInterceptorsTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerInterceptorsTest.java index 31d417a56dc03..13d4957a78e4b 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerInterceptorsTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerInterceptorsTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.TopicPartition; + import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -205,4 +206,3 @@ public void testOnAcknowledgementWithErrorChain() { interceptors.close(); } } - diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerMetadataTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerMetadataTest.java index dd77c0493b860..64a1b41a14ec2 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerMetadataTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/ProducerMetadataTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.requests.RequestTestUtils; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java index 84fac3060756a..3d8f132a487bd 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/RecordAccumulatorTest.java @@ -16,9 +16,6 @@ */ package org.apache.kafka.clients.producer.internals; -import java.util.Optional; -import java.util.OptionalInt; -import java.util.function.Function; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.MetadataSnapshot; @@ -52,6 +49,7 @@ import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -67,11 +65,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.OptionalInt; import java.util.Random; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java index cfeefc0ae5f33..2297109b14836 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java @@ -42,10 +42,10 @@ import org.apache.kafka.common.errors.RecordTooLargeException; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.TopicAuthorizationException; +import org.apache.kafka.common.errors.TransactionAbortableException; import org.apache.kafka.common.errors.TransactionAbortedException; import org.apache.kafka.common.errors.UnsupportedForMessageFormatException; import org.apache.kafka.common.errors.UnsupportedVersionException; -import org.apache.kafka.common.errors.TransactionAbortableException; import org.apache.kafka.common.internals.ClusterResourceListeners; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData; import org.apache.kafka.common.message.ApiMessageType; @@ -89,6 +89,7 @@ import org.apache.kafka.test.DelayedReceive; import org.apache.kafka.test.MockSelector; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/StickyPartitionCacheTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/StickyPartitionCacheTest.java index 8d319be276137..8f8f1c06bd988 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/StickyPartitionCacheTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/StickyPartitionCacheTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.Cluster; import org.apache.kafka.common.Node; import org.apache.kafka.common.PartitionInfo; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java index f112e424a2de7..1c2c04d4f8cae 100644 --- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java @@ -35,10 +35,10 @@ import org.apache.kafka.common.errors.ProducerFencedException; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.TopicAuthorizationException; +import org.apache.kafka.common.errors.TransactionAbortableException; import org.apache.kafka.common.errors.TransactionalIdAuthorizationException; import org.apache.kafka.common.errors.UnsupportedForMessageFormatException; import org.apache.kafka.common.errors.UnsupportedVersionException; -import org.apache.kafka.common.errors.TransactionAbortableException; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.internals.ClusterResourceListeners; import org.apache.kafka.common.message.AddOffsetsToTxnResponseData; @@ -79,6 +79,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.ProducerIdAndEpoch; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/ClusterTest.java b/clients/src/test/java/org/apache/kafka/common/ClusterTest.java index e8fda2ac4f219..d02cecb7af03b 100644 --- a/clients/src/test/java/org/apache/kafka/common/ClusterTest.java +++ b/clients/src/test/java/org/apache/kafka/common/ClusterTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import java.net.InetSocketAddress; diff --git a/clients/src/test/java/org/apache/kafka/common/KafkaFutureTest.java b/clients/src/test/java/org/apache/kafka/common/KafkaFutureTest.java index ad904d6e73cc0..454c2a0b34530 100644 --- a/clients/src/test/java/org/apache/kafka/common/KafkaFutureTest.java +++ b/clients/src/test/java/org/apache/kafka/common/KafkaFutureTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.internals.KafkaFutureImpl; import org.apache.kafka.common.utils.Java; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -34,13 +35,13 @@ import java.util.concurrent.TimeoutException; import java.util.function.Supplier; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertEquals; /** * A unit test for KafkaFuture. diff --git a/clients/src/test/java/org/apache/kafka/common/TopicIdPartitionTest.java b/clients/src/test/java/org/apache/kafka/common/TopicIdPartitionTest.java index d39481c5b37d1..b962b08bf1d51 100644 --- a/clients/src/test/java/org/apache/kafka/common/TopicIdPartitionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/TopicIdPartitionTest.java @@ -17,11 +17,12 @@ package org.apache.kafka.common; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; +import org.junit.jupiter.api.Test; import java.util.Objects; -import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; class TopicIdPartitionTest { diff --git a/clients/src/test/java/org/apache/kafka/common/TopicPartitionTest.java b/clients/src/test/java/org/apache/kafka/common/TopicPartitionTest.java index d130f1c6a40ea..b61a6497fded9 100644 --- a/clients/src/test/java/org/apache/kafka/common/TopicPartitionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/TopicPartitionTest.java @@ -17,12 +17,13 @@ package org.apache.kafka.common; import org.apache.kafka.common.utils.Serializer; + import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; /** * This test ensures TopicPartition class is serializable and is serialization compatible. diff --git a/clients/src/test/java/org/apache/kafka/common/acl/AclBindingTest.java b/clients/src/test/java/org/apache/kafka/common/acl/AclBindingTest.java index 5330395781c94..99f97a205148e 100644 --- a/clients/src/test/java/org/apache/kafka/common/acl/AclBindingTest.java +++ b/clients/src/test/java/org/apache/kafka/common/acl/AclBindingTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.resource.ResourcePatternFilter; import org.apache.kafka.common.resource.ResourceType; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/acl/ResourcePatternFilterTest.java b/clients/src/test/java/org/apache/kafka/common/acl/ResourcePatternFilterTest.java index 98b004e78ee25..7c17fcf9e9dd3 100644 --- a/clients/src/test/java/org/apache/kafka/common/acl/ResourcePatternFilterTest.java +++ b/clients/src/test/java/org/apache/kafka/common/acl/ResourcePatternFilterTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.resource.ResourcePatternFilter; + import org.junit.jupiter.api.Test; import static org.apache.kafka.common.resource.PatternType.LITERAL; diff --git a/clients/src/test/java/org/apache/kafka/common/acl/ResourcePatternTest.java b/clients/src/test/java/org/apache/kafka/common/acl/ResourcePatternTest.java index 9ffa7b75a2260..64db25dc4c000 100644 --- a/clients/src/test/java/org/apache/kafka/common/acl/ResourcePatternTest.java +++ b/clients/src/test/java/org/apache/kafka/common/acl/ResourcePatternTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.resource.ResourceType; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/compress/GzipCompressionTest.java b/clients/src/test/java/org/apache/kafka/common/compress/GzipCompressionTest.java index 394eae4c924e3..2837d96a5d0dc 100644 --- a/clients/src/test/java/org/apache/kafka/common/compress/GzipCompressionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/compress/GzipCompressionTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.utils.BufferSupplier; import org.apache.kafka.common.utils.ByteBufferOutputStream; + import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/common/compress/Lz4CompressionTest.java b/clients/src/test/java/org/apache/kafka/common/compress/Lz4CompressionTest.java index 70a1cd00db234..a4f1152830da6 100644 --- a/clients/src/test/java/org/apache/kafka/common/compress/Lz4CompressionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/compress/Lz4CompressionTest.java @@ -16,12 +16,13 @@ */ package org.apache.kafka.common.compress; -import net.jpountz.xxhash.XXHashFactory; - import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.utils.BufferSupplier; import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.ChunkedBytesStream; + +import net.jpountz.xxhash.XXHashFactory; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/compress/NoCompressionTest.java b/clients/src/test/java/org/apache/kafka/common/compress/NoCompressionTest.java index fa3617265cac2..86f7b79e1f38a 100644 --- a/clients/src/test/java/org/apache/kafka/common/compress/NoCompressionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/compress/NoCompressionTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.utils.BufferSupplier; import org.apache.kafka.common.utils.ByteBufferOutputStream; + import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/common/compress/SnappyCompressionTest.java b/clients/src/test/java/org/apache/kafka/common/compress/SnappyCompressionTest.java index 0b36bdf651677..9ca07591cb225 100644 --- a/clients/src/test/java/org/apache/kafka/common/compress/SnappyCompressionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/compress/SnappyCompressionTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.utils.BufferSupplier; import org.apache.kafka.common.utils.ByteBufferOutputStream; + import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/common/compress/ZstdCompressionTest.java b/clients/src/test/java/org/apache/kafka/common/compress/ZstdCompressionTest.java index 2e16d4b36b8d7..176291b8c56c8 100644 --- a/clients/src/test/java/org/apache/kafka/common/compress/ZstdCompressionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/compress/ZstdCompressionTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.utils.BufferSupplier; import org.apache.kafka.common.utils.ByteBufferOutputStream; + import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/common/config/AbstractConfigTest.java b/clients/src/test/java/org/apache/kafka/common/config/AbstractConfigTest.java index bf018aebbfcb9..ccc48e5d45961 100644 --- a/clients/src/test/java/org/apache/kafka/common/config/AbstractConfigTest.java +++ b/clients/src/test/java/org/apache/kafka/common/config/AbstractConfigTest.java @@ -20,15 +20,16 @@ import org.apache.kafka.common.config.ConfigDef.Importance; import org.apache.kafka.common.config.ConfigDef.Type; import org.apache.kafka.common.config.provider.FileConfigProvider; +import org.apache.kafka.common.config.provider.MockFileConfigProvider; +import org.apache.kafka.common.config.provider.MockVaultConfigProvider; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.metrics.FakeMetricsReporter; import org.apache.kafka.common.metrics.JmxReporter; import org.apache.kafka.common.metrics.MetricsReporter; import org.apache.kafka.common.security.TestSecurityConfig; -import org.apache.kafka.common.config.provider.MockVaultConfigProvider; -import org.apache.kafka.common.config.provider.MockFileConfigProvider; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.MockConsumerInterceptor; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -41,12 +42,12 @@ import java.util.Properties; import java.util.UUID; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static org.junit.jupiter.api.Assertions.assertEquals; public class AbstractConfigTest { diff --git a/clients/src/test/java/org/apache/kafka/common/config/ConfigDefTest.java b/clients/src/test/java/org/apache/kafka/common/config/ConfigDefTest.java index 7d8ca5fdff7ee..6e1f0e232429b 100644 --- a/clients/src/test/java/org/apache/kafka/common/config/ConfigDefTest.java +++ b/clients/src/test/java/org/apache/kafka/common/config/ConfigDefTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.config.ConfigDef.Validator; import org.apache.kafka.common.config.ConfigDef.Width; import org.apache.kafka.common.config.types.Password; + import org.junit.jupiter.api.Test; import java.time.Duration; diff --git a/clients/src/test/java/org/apache/kafka/common/config/ConfigTransformerTest.java b/clients/src/test/java/org/apache/kafka/common/config/ConfigTransformerTest.java index 50f8fd647f6d6..3a5ec650fab42 100644 --- a/clients/src/test/java/org/apache/kafka/common/config/ConfigTransformerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/config/ConfigTransformerTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.config; import org.apache.kafka.common.config.provider.ConfigProvider; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/config/SaslConfigsTest.java b/clients/src/test/java/org/apache/kafka/common/config/SaslConfigsTest.java index 7e8b63c9d034f..b762edaa30091 100644 --- a/clients/src/test/java/org/apache/kafka/common/config/SaslConfigsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/config/SaslConfigsTest.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.config; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class SaslConfigsTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/config/provider/AllowedPathsTest.java b/clients/src/test/java/org/apache/kafka/common/config/provider/AllowedPathsTest.java index f23d19ab7e93d..ebcaf63f8800b 100644 --- a/clients/src/test/java/org/apache/kafka/common/config/provider/AllowedPathsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/config/provider/AllowedPathsTest.java @@ -18,15 +18,16 @@ import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.config.internals.AllowedPaths; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.junit.jupiter.api.io.TempDir; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/clients/src/test/java/org/apache/kafka/common/config/provider/DirectoryConfigProviderTest.java b/clients/src/test/java/org/apache/kafka/common/config/provider/DirectoryConfigProviderTest.java index b351b0e6e6cae..17608b7627a7b 100644 --- a/clients/src/test/java/org/apache/kafka/common/config/provider/DirectoryConfigProviderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/config/provider/DirectoryConfigProviderTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.config.provider; import org.apache.kafka.common.config.ConfigData; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -24,10 +25,10 @@ import java.io.File; import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import java.util.Locale; @@ -37,7 +38,6 @@ import java.util.stream.StreamSupport; import static java.util.Arrays.asList; - import static org.apache.kafka.common.config.provider.DirectoryConfigProvider.ALLOWED_PATHS_CONFIG; import static org.apache.kafka.test.TestUtils.toSet; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -218,4 +218,3 @@ public void testNonConfiguredProvider() { assertEquals("The provider has not been configured yet.", ise.getMessage()); } } - diff --git a/clients/src/test/java/org/apache/kafka/common/config/provider/EnvVarConfigProviderTest.java b/clients/src/test/java/org/apache/kafka/common/config/provider/EnvVarConfigProviderTest.java index f83f68c1192b9..9509d398305b4 100644 --- a/clients/src/test/java/org/apache/kafka/common/config/provider/EnvVarConfigProviderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/config/provider/EnvVarConfigProviderTest.java @@ -18,15 +18,16 @@ import org.apache.kafka.common.config.ConfigData; import org.apache.kafka.common.config.ConfigException; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.util.Collections; import java.util.Arrays; -import java.util.Set; -import java.util.Map; -import java.util.HashSet; +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import static org.apache.kafka.common.config.provider.EnvVarConfigProvider.ALLOWLIST_PATTERN_CONFIG; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/config/provider/FileConfigProviderTest.java b/clients/src/test/java/org/apache/kafka/common/config/provider/FileConfigProviderTest.java index 22fb05bfc715e..e690e9d26a9d6 100644 --- a/clients/src/test/java/org/apache/kafka/common/config/provider/FileConfigProviderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/config/provider/FileConfigProviderTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.config.provider; import org.apache.kafka.common.config.ConfigData; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/clients/src/test/java/org/apache/kafka/common/feature/FeaturesTest.java b/clients/src/test/java/org/apache/kafka/common/feature/FeaturesTest.java index dcec356571001..eb66625a2f74e 100644 --- a/clients/src/test/java/org/apache/kafka/common/feature/FeaturesTest.java +++ b/clients/src/test/java/org/apache/kafka/common/feature/FeaturesTest.java @@ -17,18 +17,18 @@ package org.apache.kafka.common.feature; +import org.junit.jupiter.api.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.Test; - import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class FeaturesTest { diff --git a/clients/src/test/java/org/apache/kafka/common/feature/SupportedVersionRangeTest.java b/clients/src/test/java/org/apache/kafka/common/feature/SupportedVersionRangeTest.java index 47f312d9d9024..1d6679e62ce2b 100644 --- a/clients/src/test/java/org/apache/kafka/common/feature/SupportedVersionRangeTest.java +++ b/clients/src/test/java/org/apache/kafka/common/feature/SupportedVersionRangeTest.java @@ -17,10 +17,10 @@ package org.apache.kafka.common.feature; -import java.util.Map; - import org.junit.jupiter.api.Test; +import java.util.Map; + import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/header/internals/RecordHeadersTest.java b/clients/src/test/java/org/apache/kafka/common/header/internals/RecordHeadersTest.java index 30f0d1ce3ff6b..0cdb9b170f43b 100644 --- a/clients/src/test/java/org/apache/kafka/common/header/internals/RecordHeadersTest.java +++ b/clients/src/test/java/org/apache/kafka/common/header/internals/RecordHeadersTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; + import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/common/internals/PartitionStatesTest.java b/clients/src/test/java/org/apache/kafka/common/internals/PartitionStatesTest.java index 11c58ab734fab..5ca34849cdc31 100644 --- a/clients/src/test/java/org/apache/kafka/common/internals/PartitionStatesTest.java +++ b/clients/src/test/java/org/apache/kafka/common/internals/PartitionStatesTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.internals; import org.apache.kafka.common.TopicPartition; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java b/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java index 03c0811fa4509..2eb4a7802a990 100644 --- a/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java +++ b/clients/src/test/java/org/apache/kafka/common/internals/TopicTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.errors.InvalidTopicException; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/memory/GarbageCollectedMemoryPoolTest.java b/clients/src/test/java/org/apache/kafka/common/memory/GarbageCollectedMemoryPoolTest.java index 0bf90bf05140a..a623461041c6c 100644 --- a/clients/src/test/java/org/apache/kafka/common/memory/GarbageCollectedMemoryPoolTest.java +++ b/clients/src/test/java/org/apache/kafka/common/memory/GarbageCollectedMemoryPoolTest.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.memory; -import java.nio.ByteBuffer; -import java.util.concurrent.TimeUnit; - import org.apache.kafka.common.utils.Utils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import java.nio.ByteBuffer; +import java.util.concurrent.TimeUnit; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/clients/src/test/java/org/apache/kafka/common/message/ApiMessageTypeTest.java b/clients/src/test/java/org/apache/kafka/common/message/ApiMessageTypeTest.java index fb37cc80a1a9a..10d95134399a7 100644 --- a/clients/src/test/java/org/apache/kafka/common/message/ApiMessageTypeTest.java +++ b/clients/src/test/java/org/apache/kafka/common/message/ApiMessageTypeTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.protocol.types.Schema; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -27,9 +28,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; @Timeout(120) public class ApiMessageTypeTest { diff --git a/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java b/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java index 755d2fbda8195..6f2a54a8d07b5 100644 --- a/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java +++ b/clients/src/test/java/org/apache/kafka/common/message/MessageTest.java @@ -17,8 +17,6 @@ package org.apache.kafka.common.message; -import com.fasterxml.jackson.databind.JsonNode; - import org.apache.kafka.common.IsolationLevel; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.UnsupportedVersionException; @@ -58,6 +56,9 @@ import org.apache.kafka.common.protocol.MessageUtil; import org.apache.kafka.common.protocol.ObjectSerializationCache; import org.apache.kafka.common.protocol.types.RawTaggedField; + +import com.fasterxml.jackson.databind.JsonNode; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/clients/src/test/java/org/apache/kafka/common/message/NullableStructMessageTest.java b/clients/src/test/java/org/apache/kafka/common/message/NullableStructMessageTest.java index 731c67135e04d..a171520b2c3ee 100644 --- a/clients/src/test/java/org/apache/kafka/common/message/NullableStructMessageTest.java +++ b/clients/src/test/java/org/apache/kafka/common/message/NullableStructMessageTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.MessageUtil; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/message/RecordsSerdeTest.java b/clients/src/test/java/org/apache/kafka/common/message/RecordsSerdeTest.java index 72ccee41c6361..82e63ca5541ce 100644 --- a/clients/src/test/java/org/apache/kafka/common/message/RecordsSerdeTest.java +++ b/clients/src/test/java/org/apache/kafka/common/message/RecordsSerdeTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.protocol.MessageUtil; import org.apache.kafka.common.record.MemoryRecords; import org.apache.kafka.common.record.SimpleRecord; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/message/SimpleArraysMessageTest.java b/clients/src/test/java/org/apache/kafka/common/message/SimpleArraysMessageTest.java index 1b78adbb96227..963553a6f2f30 100644 --- a/clients/src/test/java/org/apache/kafka/common/message/SimpleArraysMessageTest.java +++ b/clients/src/test/java/org/apache/kafka/common/message/SimpleArraysMessageTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.message; import org.apache.kafka.common.protocol.ByteBufferAccessor; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/message/SimpleExampleMessageTest.java b/clients/src/test/java/org/apache/kafka/common/message/SimpleExampleMessageTest.java index c69e56525a7cf..9fc49f9506054 100644 --- a/clients/src/test/java/org/apache/kafka/common/message/SimpleExampleMessageTest.java +++ b/clients/src/test/java/org/apache/kafka/common/message/SimpleExampleMessageTest.java @@ -16,13 +16,15 @@ */ package org.apache.kafka.common.message; -import com.fasterxml.jackson.databind.JsonNode; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.MessageUtil; import org.apache.kafka.common.protocol.ObjectSerializationCache; import org.apache.kafka.common.utils.ByteUtils; + +import com.fasterxml.jackson.databind.JsonNode; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/JmxReporterTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/JmxReporterTest.java index 3f71a45628f26..f1d60d83bf216 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/JmxReporterTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/JmxReporterTest.java @@ -20,16 +20,18 @@ import org.apache.kafka.common.metrics.stats.Avg; import org.apache.kafka.common.metrics.stats.CumulativeSum; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.Test; -import javax.management.MBeanServer; -import javax.management.ObjectName; import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import javax.management.MBeanServer; +import javax.management.ObjectName; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMbeanTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMbeanTest.java index c0cd5bab721af..6ee50d1623f52 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMbeanTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMbeanTest.java @@ -19,18 +19,20 @@ import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.stats.WindowedCount; import org.apache.kafka.common.metrics.stats.WindowedSum; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.lang.management.ManagementFactory; +import java.util.List; + import javax.management.Attribute; import javax.management.AttributeList; import javax.management.AttributeNotFoundException; import javax.management.MBeanServer; import javax.management.ObjectName; import javax.management.RuntimeMBeanException; -import java.lang.management.ManagementFactory; -import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMetricTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMetricTest.java index eacf23a7ffe86..ab6f349ac53be 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMetricTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMetricTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.MetricName; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMetricsContextTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMetricsContextTest.java index 8a5a8a8ad7aa0..67be9797b7cfe 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMetricsContextTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/KafkaMetricsContextTest.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.common.metrics; -import java.util.HashMap; -import java.util.Map; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.HashMap; +import java.util.Map; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/MetricsTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/MetricsTest.java index f4113b00e38ce..8f50e35b6e3f8 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/MetricsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/MetricsTest.java @@ -16,33 +16,6 @@ */ package org.apache.kafka.common.metrics; -import static java.util.Collections.emptyList; -import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.fail; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Deque; -import java.util.List; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; -import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Function; - import org.apache.kafka.common.Metric; import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.internals.MetricsUtils; @@ -55,17 +28,44 @@ import org.apache.kafka.common.metrics.stats.Percentiles; import org.apache.kafka.common.metrics.stats.Percentiles.BucketSizing; import org.apache.kafka.common.metrics.stats.Rate; -import org.apache.kafka.common.metrics.stats.WindowedCount; -import org.apache.kafka.common.metrics.stats.WindowedSum; import org.apache.kafka.common.metrics.stats.SimpleRate; import org.apache.kafka.common.metrics.stats.Value; +import org.apache.kafka.common.metrics.stats.WindowedCount; +import org.apache.kafka.common.metrics.stats.WindowedSum; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Function; + +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; + public class MetricsTest { private static final Logger log = LoggerFactory.getLogger(MetricsTest.class); private static final double EPS = 0.000001; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/SampleMetrics.java b/clients/src/test/java/org/apache/kafka/common/metrics/SampleMetrics.java index 1e3e8173c96dd..3eae7e7d35cde 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/SampleMetrics.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/SampleMetrics.java @@ -28,4 +28,3 @@ public class SampleMetrics { public static final MetricNameTemplate METRIC_WITH_INHERITED_TAGS = new MetricNameTemplate("inherited.tags", "group", "inherited.tags in testMetricName", "parent-tag", "child-tag"); } - diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/SensorTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/SensorTest.java index 681e108d1d891..5cdcebc858d6b 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/SensorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/SensorTest.java @@ -25,7 +25,9 @@ import org.apache.kafka.common.metrics.stats.WindowedSum; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import java.util.ArrayList; import java.util.Collections; @@ -37,7 +39,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.mockito.Mockito; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/TokenBucketTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/TokenBucketTest.java index f0e58a494a72c..b493a99f16c65 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/TokenBucketTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/TokenBucketTest.java @@ -16,15 +16,17 @@ */ package org.apache.kafka.common.metrics; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.concurrent.TimeUnit; import org.apache.kafka.common.metrics.stats.TokenBucket; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.concurrent.TimeUnit; + +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TokenBucketTest { Time time; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/internals/IntGaugeSuiteTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/internals/IntGaugeSuiteTest.java index f94aceed202b9..6b847807fbbd7 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/internals/IntGaugeSuiteTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/internals/IntGaugeSuiteTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.metrics.Metrics; + import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/stats/FrequenciesTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/stats/FrequenciesTest.java index 62b4884af2cc5..17304e636ed0d 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/stats/FrequenciesTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/stats/FrequenciesTest.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/stats/HistogramTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/stats/HistogramTest.java index fe2760dedec46..66fe2211024d8 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/stats/HistogramTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/stats/HistogramTest.java @@ -16,17 +16,17 @@ */ package org.apache.kafka.common.metrics.stats; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Arrays; -import java.util.Random; - - import org.apache.kafka.common.metrics.stats.Histogram.BinScheme; import org.apache.kafka.common.metrics.stats.Histogram.ConstantBinScheme; import org.apache.kafka.common.metrics.stats.Histogram.LinearBinScheme; + import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Random; + +import static org.junit.jupiter.api.Assertions.assertEquals; + public class HistogramTest { private static final double EPS = 0.0000001d; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/stats/MeterTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/stats/MeterTest.java index 1d88ba24bc406..b1847c41d1368 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/stats/MeterTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/stats/MeterTest.java @@ -16,16 +16,17 @@ */ package org.apache.kafka.common.metrics.stats; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.apache.kafka.common.MetricName; +import org.apache.kafka.common.metrics.CompoundStat.NamedMeasurable; +import org.apache.kafka.common.metrics.MetricConfig; + +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.kafka.common.MetricName; -import org.apache.kafka.common.metrics.CompoundStat.NamedMeasurable; -import org.apache.kafka.common.metrics.MetricConfig; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MeterTest { diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/stats/RateTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/stats/RateTest.java index 2e8662f1f96c9..7fabf683570d2 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/stats/RateTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/stats/RateTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.metrics.internals.MetricsUtils; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/metrics/stats/SampledStatTest.java b/clients/src/test/java/org/apache/kafka/common/metrics/stats/SampledStatTest.java index 7b45131b9b481..680d7651c081f 100644 --- a/clients/src/test/java/org/apache/kafka/common/metrics/stats/SampledStatTest.java +++ b/clients/src/test/java/org/apache/kafka/common/metrics/stats/SampledStatTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.metrics.MetricConfig; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/CertStores.java b/clients/src/test/java/org/apache/kafka/common/network/CertStores.java index 1b013d933e279..96859d1cea550 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/CertStores.java +++ b/clients/src/test/java/org/apache/kafka/common/network/CertStores.java @@ -16,19 +16,19 @@ */ package org.apache.kafka.common.network; -import java.util.ArrayList; -import java.util.List; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestSslUtils; +import org.apache.kafka.test.TestSslUtils.SslConfigsBuilder; +import org.apache.kafka.test.TestUtils; import java.io.File; import java.net.InetAddress; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.kafka.test.TestSslUtils.SslConfigsBuilder; -import org.apache.kafka.test.TestUtils; public class CertStores { diff --git a/clients/src/test/java/org/apache/kafka/common/network/ChannelBuildersTest.java b/clients/src/test/java/org/apache/kafka/common/network/ChannelBuildersTest.java index 36c9d6f6e2fef..e84c7c5e7c2e0 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/ChannelBuildersTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/ChannelBuildersTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.common.security.auth.AuthenticationContext; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.KafkaPrincipalBuilder; + import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/clients/src/test/java/org/apache/kafka/common/network/EchoServer.java b/clients/src/test/java/org/apache/kafka/common/network/EchoServer.java index 8063d8c6d89aa..bfe8393e69585 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/EchoServer.java +++ b/clients/src/test/java/org/apache/kafka/common/network/EchoServer.java @@ -20,8 +20,6 @@ import org.apache.kafka.common.security.ssl.DefaultSslEngineFactory; import org.apache.kafka.common.security.ssl.SslFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocket; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -29,10 +27,13 @@ import java.net.Socket; import java.util.ArrayList; import java.util.Collections; -import java.util.Map; import java.util.List; +import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocket; + /** * A simple server that takes size delimited byte arrays and just echos them back to the sender. diff --git a/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java b/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java index bd03a60935107..87b5b0ac453df 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/KafkaChannelTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.memory.MemoryPool; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java b/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java index ec18c269942cd..80e7e9ce10143 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NetworkReceiveTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.network; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; diff --git a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java index 1d379a15cbe63..51db46d7d777e 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NetworkTestUtils.java @@ -16,25 +16,25 @@ */ package org.apache.kafka.common.network; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.apache.kafka.common.config.AbstractConfig; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.security.authenticator.CredentialCache; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; +import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Common utility functions used by transport layer and authenticator tests. */ diff --git a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java index 9a994c991fa17..14d01cbfb475f 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java +++ b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java @@ -33,6 +33,9 @@ import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; @@ -50,8 +53,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java index 2863b4906aa77..2169d7ac73bd0 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SaslChannelBuilderTest.java @@ -23,10 +23,10 @@ import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; import org.apache.kafka.common.message.ApiMessageType; import org.apache.kafka.common.requests.ApiVersionsResponse; +import org.apache.kafka.common.security.JaasContext; import org.apache.kafka.common.security.TestSecurityConfig; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.SecurityProtocol; -import org.apache.kafka.common.security.JaasContext; import org.apache.kafka.common.security.authenticator.TestJaasConfig; import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; import org.apache.kafka.common.security.plain.PlainLoginModule; @@ -34,6 +34,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestUtils; + import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSManager; @@ -43,16 +44,17 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import javax.security.auth.Subject; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.login.LoginException; -import javax.security.auth.spi.LoginModule; import java.lang.reflect.Field; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; +import javax.security.auth.Subject; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.login.LoginException; +import javax.security.auth.spi.LoginModule; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java index f805ba807d69d..782c429e91757 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java @@ -27,6 +27,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java index 3f7660d5fbdbd..bb31d5cf44ba7 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslSelectorTest.java @@ -16,10 +16,6 @@ */ package org.apache.kafka.common.network; -import java.nio.channels.SelectionKey; -import java.security.GeneralSecurityException; -import javax.net.ssl.SSLEngine; - import org.apache.kafka.common.config.SecurityConfig; import org.apache.kafka.common.memory.MemoryPool; import org.apache.kafka.common.memory.SimpleMemoryPool; @@ -34,6 +30,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestSslUtils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -41,8 +38,10 @@ import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; +import java.nio.channels.SelectionKey; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; +import java.security.GeneralSecurityException; import java.security.Security; import java.util.Collection; import java.util.Collections; @@ -52,6 +51,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; +import javax.net.ssl.SSLEngine; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslSender.java b/clients/src/test/java/org/apache/kafka/common/network/SslSender.java index dce170d0465fa..353a503c94ae1 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslSender.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslSender.java @@ -16,16 +16,17 @@ */ package org.apache.kafka.common.network; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import java.io.OutputStream; import java.net.InetSocketAddress; import java.security.cert.X509Certificate; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocket; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + public class SslSender extends Thread { private final String tlsProtocol; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java index e56ce7abbad0b..0ed557ba7449f 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java @@ -35,6 +35,7 @@ import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestSslUtils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -80,8 +81,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslTransportTls12Tls13Test.java b/clients/src/test/java/org/apache/kafka/common/network/SslTransportTls12Tls13Test.java index 425ab23532bb8..8977872e60f66 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslTransportTls12Tls13Test.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslTransportTls12Tls13Test.java @@ -16,23 +16,25 @@ */ package org.apache.kafka.common.network; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.TestSecurityConfig; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; + public class SslTransportTls12Tls13Test { private static final int BUFFER_SIZE = 4 * 1024; private static final Time TIME = Time.SYSTEM; diff --git a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java index 105f25b51d726..66ae5746386f8 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/SslVersionsTransportLayerTest.java @@ -16,16 +16,6 @@ */ package org.apache.kafka.common.network; -import java.net.InetSocketAddress; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.security.TestSecurityConfig; @@ -34,10 +24,21 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java index 750f75f50753c..82deb367b5570 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/Tls12SelectorTest.java @@ -17,7 +17,10 @@ package org.apache.kafka.common.network; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.kafka.common.config.SslConfigs; +import org.apache.kafka.test.TestSslUtils; + +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; @@ -27,9 +30,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.kafka.common.config.SslConfigs; -import org.apache.kafka.test.TestSslUtils; -import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class Tls12SelectorTest extends SslSelectorTest { diff --git a/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java b/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java index 2313ec4748e96..ff521fade2716 100644 --- a/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/network/Tls13SelectorTest.java @@ -17,8 +17,13 @@ package org.apache.kafka.common.network; -import static java.util.Arrays.asList; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.apache.kafka.common.config.SslConfigs; +import org.apache.kafka.test.TestSslUtils; +import org.apache.kafka.test.TestUtils; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; import java.io.File; import java.io.IOException; @@ -29,12 +34,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.kafka.common.config.SslConfigs; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestUtils; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledForJreRange; -import org.junit.jupiter.api.condition.JRE; + +import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertEquals; @EnabledForJreRange(min = JRE.JAVA_11) // TLS 1.3 is only supported with Java 11 and newer public class Tls13SelectorTest extends SslSelectorTest { diff --git a/clients/src/test/java/org/apache/kafka/common/protocol/ApiKeysTest.java b/clients/src/test/java/org/apache/kafka/common/protocol/ApiKeysTest.java index b9fc6e57ec39c..c3775df992c36 100644 --- a/clients/src/test/java/org/apache/kafka/common/protocol/ApiKeysTest.java +++ b/clients/src/test/java/org/apache/kafka/common/protocol/ApiKeysTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.protocol.types.BoundField; import org.apache.kafka.common.protocol.types.Schema; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/common/protocol/DataOutputStreamWritableTest.java b/clients/src/test/java/org/apache/kafka/common/protocol/DataOutputStreamWritableTest.java index 9e06d13a9ac2a..3003bbb809bdf 100644 --- a/clients/src/test/java/org/apache/kafka/common/protocol/DataOutputStreamWritableTest.java +++ b/clients/src/test/java/org/apache/kafka/common/protocol/DataOutputStreamWritableTest.java @@ -16,13 +16,15 @@ */ package org.apache.kafka.common.protocol; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.apache.kafka.common.utils.ByteBufferOutputStream; + +import org.junit.jupiter.api.Test; import java.io.DataOutputStream; import java.nio.ByteBuffer; -import org.apache.kafka.common.utils.ByteBufferOutputStream; -import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DataOutputStreamWritableTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/protocol/ErrorsTest.java b/clients/src/test/java/org/apache/kafka/common/protocol/ErrorsTest.java index 44523f47768b6..23c49412ab9e9 100644 --- a/clients/src/test/java/org/apache/kafka/common/protocol/ErrorsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/protocol/ErrorsTest.java @@ -16,16 +16,17 @@ */ package org.apache.kafka.common.protocol; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import org.apache.kafka.common.errors.ApiException; +import org.apache.kafka.common.errors.TimeoutException; + +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.Set; -import org.apache.kafka.common.errors.ApiException; -import org.apache.kafka.common.errors.TimeoutException; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class ErrorsTest { diff --git a/clients/src/test/java/org/apache/kafka/common/protocol/MessageUtilTest.java b/clients/src/test/java/org/apache/kafka/common/protocol/MessageUtilTest.java index b3181907b52a4..81d87134f56c6 100755 --- a/clients/src/test/java/org/apache/kafka/common/protocol/MessageUtilTest.java +++ b/clients/src/test/java/org/apache/kafka/common/protocol/MessageUtilTest.java @@ -17,20 +17,24 @@ package org.apache.kafka.common.protocol; +import org.apache.kafka.common.protocol.types.RawTaggedField; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.BinaryNode; import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.TextNode; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; + import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collections; -import org.apache.kafka.common.protocol.types.RawTaggedField; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Timeout; + import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/common/protocol/SendBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/protocol/SendBuilderTest.java index a4df5f384b0cb..df8fe9fa3d7cd 100644 --- a/clients/src/test/java/org/apache/kafka/common/protocol/SendBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/protocol/SendBuilderTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.record.UnalignedMemoryRecords; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/protocol/types/ProtocolSerializationTest.java b/clients/src/test/java/org/apache/kafka/common/protocol/types/ProtocolSerializationTest.java index 5fc4b2f3bb349..027dca8bf84fc 100644 --- a/clients/src/test/java/org/apache/kafka/common/protocol/types/ProtocolSerializationTest.java +++ b/clients/src/test/java/org/apache/kafka/common/protocol/types/ProtocolSerializationTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.protocol.types; import org.apache.kafka.common.utils.ByteUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/protocol/types/RawTaggedFieldWriterTest.java b/clients/src/test/java/org/apache/kafka/common/protocol/types/RawTaggedFieldWriterTest.java index bd7f208831f68..78d0c1cf56dd1 100644 --- a/clients/src/test/java/org/apache/kafka/common/protocol/types/RawTaggedFieldWriterTest.java +++ b/clients/src/test/java/org/apache/kafka/common/protocol/types/RawTaggedFieldWriterTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.common.protocol.types; import org.apache.kafka.common.protocol.ByteBufferAccessor; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/clients/src/test/java/org/apache/kafka/common/protocol/types/TypeTest.java b/clients/src/test/java/org/apache/kafka/common/protocol/types/TypeTest.java index 008324366581f..5f2a027321c33 100644 --- a/clients/src/test/java/org/apache/kafka/common/protocol/types/TypeTest.java +++ b/clients/src/test/java/org/apache/kafka/common/protocol/types/TypeTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.MemoryRecords; import org.apache.kafka.common.record.SimpleRecord; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/record/AbstractLegacyRecordBatchTest.java b/clients/src/test/java/org/apache/kafka/common/record/AbstractLegacyRecordBatchTest.java index c5b1341bfb0f7..015cebec1b095 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/AbstractLegacyRecordBatchTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/AbstractLegacyRecordBatchTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.record.AbstractLegacyRecordBatch.ByteBufferLegacyRecordBatch; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/record/BufferSupplierTest.java b/clients/src/test/java/org/apache/kafka/common/record/BufferSupplierTest.java index e580be5ad71b4..a8f86380430ab 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/BufferSupplierTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/BufferSupplierTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.common.record; import org.apache.kafka.common.utils.BufferSupplier; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/record/ByteBufferLogInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/record/ByteBufferLogInputStreamTest.java index d75f7640d09a4..f5e897cac12a2 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/ByteBufferLogInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/ByteBufferLogInputStreamTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.errors.CorruptRecordException; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/record/CompressionRatioEstimatorTest.java b/clients/src/test/java/org/apache/kafka/common/record/CompressionRatioEstimatorTest.java index 879530934fba8..ef42f243f242c 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/CompressionRatioEstimatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/CompressionRatioEstimatorTest.java @@ -17,10 +17,12 @@ package org.apache.kafka.common.record; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Arrays; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class CompressionRatioEstimatorTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/record/ControlRecordTypeTest.java b/clients/src/test/java/org/apache/kafka/common/record/ControlRecordTypeTest.java index d23fe45932f66..7d5c23d8449f1 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/ControlRecordTypeTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/ControlRecordTypeTest.java @@ -16,10 +16,12 @@ */ package org.apache.kafka.common.record; -import java.nio.ByteBuffer; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; + +import java.nio.ByteBuffer; + import static org.junit.jupiter.api.Assertions.assertEquals; public class ControlRecordTypeTest { diff --git a/clients/src/test/java/org/apache/kafka/common/record/ControlRecordUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/record/ControlRecordUtilsTest.java index 462660bdc58c5..560b63fd2c84f 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/ControlRecordUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/ControlRecordUtilsTest.java @@ -16,17 +16,20 @@ */ package org.apache.kafka.common.record; -import java.nio.ByteBuffer; -import java.util.Collections; -import org.apache.kafka.common.message.LeaderChangeMessage.Voter; import org.apache.kafka.common.message.KRaftVersionRecord; import org.apache.kafka.common.message.LeaderChangeMessage; +import org.apache.kafka.common.message.LeaderChangeMessage.Voter; import org.apache.kafka.common.message.SnapshotFooterRecord; import org.apache.kafka.common.message.SnapshotHeaderRecord; import org.apache.kafka.common.message.VotersRecord; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.ObjectSerializationCache; + import org.junit.jupiter.api.Test; + +import java.nio.ByteBuffer; +import java.util.Collections; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/record/DefaultRecordBatchTest.java b/clients/src/test/java/org/apache/kafka/common/record/DefaultRecordBatchTest.java index 0e76db18dbed5..e63dafc3a0d01 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/DefaultRecordBatchTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/DefaultRecordBatchTest.java @@ -27,6 +27,7 @@ import org.apache.kafka.common.utils.CloseableIterator; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/clients/src/test/java/org/apache/kafka/common/record/DefaultRecordTest.java b/clients/src/test/java/org/apache/kafka/common/record/DefaultRecordTest.java index f171bb9c81e09..2473cca54109b 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/DefaultRecordTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/DefaultRecordTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.common.utils.ByteBufferInputStream; import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.ByteUtils; + import org.junit.jupiter.api.Test; import java.io.DataOutputStream; diff --git a/clients/src/test/java/org/apache/kafka/common/record/EndTransactionMarkerTest.java b/clients/src/test/java/org/apache/kafka/common/record/EndTransactionMarkerTest.java index 4ac1417900310..64224e003285f 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/EndTransactionMarkerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/EndTransactionMarkerTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.record; import org.apache.kafka.common.InvalidRecordException; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/record/FileLogInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/record/FileLogInputStreamTest.java index 076bdf24e5328..e2911adbceca0 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/FileLogInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/FileLogInputStreamTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.record.FileLogInputStream.FileChannelRecordBatch; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/record/FileRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/FileRecordsTest.java index 0f3c557d5fe2b..832d276a02d01 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/FileRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/FileRecordsTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/record/LegacyRecordTest.java b/clients/src/test/java/org/apache/kafka/common/record/LegacyRecordTest.java index ffa49e64749ab..86483cd649add 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/LegacyRecordTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/LegacyRecordTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.record; import org.apache.kafka.common.errors.CorruptRecordException; + import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/clients/src/test/java/org/apache/kafka/common/record/MemoryRecordsBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/record/MemoryRecordsBuilderTest.java index 5822f89efabb5..a87aa3878fce1 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/MemoryRecordsBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/MemoryRecordsBuilderTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/record/MemoryRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/MemoryRecordsTest.java index 62e487d834e66..80a77d647b474 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/MemoryRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/MemoryRecordsTest.java @@ -28,6 +28,7 @@ import org.apache.kafka.common.utils.CloseableIterator; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/record/MultiRecordsSendTest.java b/clients/src/test/java/org/apache/kafka/common/record/MultiRecordsSendTest.java index d307ba62a1055..763d43880babb 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/MultiRecordsSendTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/MultiRecordsSendTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.network.ByteBufferSend; import org.apache.kafka.common.network.Send; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/common/record/RemoteLogInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/record/RemoteLogInputStreamTest.java index dcf7a646b31d6..f7fa40751f9c6 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/RemoteLogInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/RemoteLogInputStreamTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/clients/src/test/java/org/apache/kafka/common/record/SimpleLegacyRecordTest.java b/clients/src/test/java/org/apache/kafka/common/record/SimpleLegacyRecordTest.java index 7d288dc03ecaf..016dd00689eff 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/SimpleLegacyRecordTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/SimpleLegacyRecordTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.utils.ByteBufferOutputStream; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import java.io.DataOutputStream; diff --git a/clients/src/test/java/org/apache/kafka/common/record/UnalignedFileRecordsTest.java b/clients/src/test/java/org/apache/kafka/common/record/UnalignedFileRecordsTest.java index d3e50098cdd2f..7fe785aa3441a 100644 --- a/clients/src/test/java/org/apache/kafka/common/record/UnalignedFileRecordsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/record/UnalignedFileRecordsTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.compress.Compression; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java b/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java index 15249bd8383cc..c66b0411fc510 100644 --- a/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/replica/ReplicaSelectorTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.security.auth.KafkaPrincipal; + import org.junit.jupiter.api.Test; import java.net.InetAddress; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/AddPartitionsToTxnRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/AddPartitionsToTxnRequestTest.java index cac73f7244066..904bb0ea08482 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/AddPartitionsToTxnRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/AddPartitionsToTxnRequestTest.java @@ -18,13 +18,16 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTopic; +import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTopicCollection; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTransaction; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTransactionCollection; -import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTopicCollection; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData; -import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; import java.util.ArrayList; import java.util.Collections; @@ -32,9 +35,6 @@ import java.util.List; import java.util.Map; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; - import static org.apache.kafka.common.requests.AddPartitionsToTxnResponse.errorsForTransaction; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/AddPartitionsToTxnResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/AddPartitionsToTxnResponseTest.java index 3b2dbee332c88..490a5ba95460f 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/AddPartitionsToTxnResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/AddPartitionsToTxnResponseTest.java @@ -18,14 +18,15 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData; +import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnPartitionResult; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnResult; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnResultCollection; -import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnPartitionResult; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnTopicResult; import org.apache.kafka.common.message.AddPartitionsToTxnResponseData.AddPartitionsToTxnTopicResultCollection; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/AlterPartitionRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/AlterPartitionRequestTest.java index 8b346eea73582..d5e4e39fd9915 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/AlterPartitionRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/AlterPartitionRequestTest.java @@ -16,13 +16,14 @@ */ package org.apache.kafka.common.requests; +import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.AlterPartitionRequestData; import org.apache.kafka.common.message.AlterPartitionRequestData.BrokerState; import org.apache.kafka.common.message.AlterPartitionRequestData.PartitionData; import org.apache.kafka.common.message.AlterPartitionRequestData.TopicData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; -import org.apache.kafka.common.Uuid; + import org.junit.jupiter.params.ParameterizedTest; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/AlterReplicaLogDirsRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/AlterReplicaLogDirsRequestTest.java index 3251515492a34..6732ef9275625 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/AlterReplicaLogDirsRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/AlterReplicaLogDirsRequestTest.java @@ -16,9 +16,6 @@ */ package org.apache.kafka.common.requests; -import java.util.HashMap; -import java.util.Map; - import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.LogDirNotFoundException; import org.apache.kafka.common.message.AlterReplicaLogDirsRequestData; @@ -28,8 +25,12 @@ import org.apache.kafka.common.message.AlterReplicaLogDirsRequestData.AlterReplicaLogDirTopicCollection; import org.apache.kafka.common.message.AlterReplicaLogDirsResponseData.AlterReplicaLogDirTopicResult; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; +import java.util.HashMap; +import java.util.Map; + import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/AlterReplicaLogDirsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/AlterReplicaLogDirsResponseTest.java index 347a8c26bc067..528aac41a47dd 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/AlterReplicaLogDirsResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/AlterReplicaLogDirsResponseTest.java @@ -16,15 +16,16 @@ */ package org.apache.kafka.common.requests; -import java.util.Collections; -import java.util.Map; - import org.apache.kafka.common.message.AlterReplicaLogDirsResponseData; import org.apache.kafka.common.message.AlterReplicaLogDirsResponseData.AlterReplicaLogDirPartitionResult; import org.apache.kafka.common.message.AlterReplicaLogDirsResponseData.AlterReplicaLogDirTopicResult; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; +import java.util.Collections; +import java.util.Map; + import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ApiErrorTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ApiErrorTest.java index bf352dbb4a871..9ec1d26dd64c3 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ApiErrorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ApiErrorTest.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.errors.UnknownServerException; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java index cf832050f2a5d..65b7facd60209 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ApiVersionsResponseTest.java @@ -17,8 +17,6 @@ package org.apache.kafka.common.requests; -import java.util.Collections; -import java.util.HashSet; import org.apache.kafka.common.feature.Features; import org.apache.kafka.common.feature.SupportedVersionRange; import org.apache.kafka.common.message.ApiMessageType; @@ -32,10 +30,13 @@ import org.apache.kafka.common.record.RecordVersion; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; +import java.util.Collections; +import java.util.HashSet; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/BrokerRegistrationRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/BrokerRegistrationRequestTest.java index 51ed85cf2d1b5..5ba2856476def 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/BrokerRegistrationRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/BrokerRegistrationRequestTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.message.BrokerRegistrationRequestData; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.ObjectSerializationCache; + import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ByteBufferChannelTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ByteBufferChannelTest.java index 58c913a709b4c..d03487f84b139 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ByteBufferChannelTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ByteBufferChannelTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.requests; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ConsumerGroupDescribeRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ConsumerGroupDescribeRequestTest.java index 23ea03c173062..254341c7bd2cf 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ConsumerGroupDescribeRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ConsumerGroupDescribeRequestTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.ConsumerGroupDescribeRequestData; import org.apache.kafka.common.message.ConsumerGroupDescribeResponseData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ConsumerGroupDescribeResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ConsumerGroupDescribeResponseTest.java index ed3d87bd96308..4fb713c33d6dc 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ConsumerGroupDescribeResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ConsumerGroupDescribeResponseTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.message.ConsumerGroupDescribeResponseData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ControlledShutdownRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ControlledShutdownRequestTest.java index 867be713ba2e2..3f55aaf985ed0 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ControlledShutdownRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ControlledShutdownRequestTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.ControlledShutdownRequestData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import static org.apache.kafka.common.protocol.ApiKeys.CONTROLLED_SHUTDOWN; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/CreateAclsRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/CreateAclsRequestTest.java index 97da6d7c980eb..4334b2cba5a29 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/CreateAclsRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/CreateAclsRequestTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.resource.ResourceType; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/DeleteAclsRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/DeleteAclsRequestTest.java index b2901dabcf551..6a7d2ff94f760 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/DeleteAclsRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/DeleteAclsRequestTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourcePatternFilter; import org.apache.kafka.common.resource.ResourceType; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/DeleteAclsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/DeleteAclsResponseTest.java index ae7b603d41b16..01a81179bf090 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/DeleteAclsResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/DeleteAclsResponseTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.message.DeleteAclsResponseData.DeleteAclsMatchingAcl; import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourceType; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/DeleteGroupsRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/DeleteGroupsRequestTest.java index 9745af8d0b707..c6cd18a347722 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/DeleteGroupsRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/DeleteGroupsRequestTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.DeleteGroupsRequestData; import org.apache.kafka.common.message.DeleteGroupsResponseData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/DeleteGroupsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/DeleteGroupsResponseTest.java index 7cf7ad8b3371c..5d4a684919079 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/DeleteGroupsResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/DeleteGroupsResponseTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.message.DeleteGroupsResponseData.DeletableGroupResult; import org.apache.kafka.common.message.DeleteGroupsResponseData.DeletableGroupResultCollection; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/DeleteTopicsRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/DeleteTopicsRequestTest.java index d7d7eb985cd8a..a3cee975e6a8d 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/DeleteTopicsRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/DeleteTopicsRequestTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.DeleteTopicsRequestData; import org.apache.kafka.common.message.DeleteTopicsRequestData.DeleteTopicState; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsRequestTest.java index 9ca0e74d08405..922cbd8bbf251 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsRequestTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourcePatternFilter; import org.apache.kafka.common.resource.ResourceType; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsResponseTest.java index d036a333117a2..25dcf2e3d1976 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/DescribeAclsResponseTest.java @@ -29,6 +29,7 @@ import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.resource.ResourceType; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/DescribeGroupsRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/DescribeGroupsRequestTest.java index afce9d99417d3..3bb16ad954307 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/DescribeGroupsRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/DescribeGroupsRequestTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.message.DescribeGroupsResponseData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/EndTxnRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/EndTxnRequestTest.java index f14bf66161980..db4895802c2c5 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/EndTxnRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/EndTxnRequestTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.EndTxnRequestData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/EndTxnResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/EndTxnResponseTest.java index 39c4bc04104ae..d212848fa5a3b 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/EndTxnResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/EndTxnResponseTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.EndTxnResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeRequestTest.java index 99389b56d461e..e3250ffa4f2bb 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeRequestTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeResponseTest.java index 6c5e57962d34c..6afe831963515 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/EnvelopeResponseTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/FetchRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/FetchRequestTest.java index 4f13c914f0f71..b05c9c941723c 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/FetchRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/FetchRequestTest.java @@ -22,16 +22,17 @@ import org.apache.kafka.common.message.FetchRequestData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import java.util.Collections; -import java.util.Map; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.stream.Stream; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/FindCoordinatorRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/FindCoordinatorRequestTest.java index 9393358074120..1ebf3ed4e6a8f 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/FindCoordinatorRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/FindCoordinatorRequestTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.requests; import org.apache.kafka.common.errors.InvalidRequestException; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsRequestTest.java index 9e2c376391d0a..d19c6d851e012 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsRequestTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.GetTelemetrySubscriptionsRequestData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsResponseTest.java index 2e972b42ff697..f9a629c5e170f 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/GetTelemetrySubscriptionsResponseTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.GetTelemetrySubscriptionsResponseData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/HeartbeatRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/HeartbeatRequestTest.java index 4478c4ecac086..6369aba63a4b1 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/HeartbeatRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/HeartbeatRequestTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.HeartbeatRequestData; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java index ebf6ef25ebe63..a330190895790 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupRequestTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.message.JoinGroupRequestData; import org.apache.kafka.common.protocol.MessageUtil; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupResponseTest.java index 1b7e5d2a19281..14dcdf2909f10 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/JoinGroupResponseTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.JoinGroupResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; + import org.junit.jupiter.params.ParameterizedTest; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/LeaderAndIsrRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/LeaderAndIsrRequestTest.java index cea12640269f7..792db70b9b331 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/LeaderAndIsrRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/LeaderAndIsrRequestTest.java @@ -29,6 +29,7 @@ import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/LeaderAndIsrResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/LeaderAndIsrResponseTest.java index 6b611bb6df1a5..d675bebcdd953 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/LeaderAndIsrResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/LeaderAndIsrResponseTest.java @@ -19,11 +19,12 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.LeaderAndIsrRequestData.LeaderAndIsrPartitionState; import org.apache.kafka.common.message.LeaderAndIsrResponseData; -import org.apache.kafka.common.message.LeaderAndIsrResponseData.LeaderAndIsrTopicError; import org.apache.kafka.common.message.LeaderAndIsrResponseData.LeaderAndIsrPartitionError; +import org.apache.kafka.common.message.LeaderAndIsrResponseData.LeaderAndIsrTopicError; import org.apache.kafka.common.message.LeaderAndIsrResponseData.LeaderAndIsrTopicErrorCollection; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/LeaveGroupRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/LeaveGroupRequestTest.java index e9aa88e9ec521..82e647128f968 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/LeaveGroupRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/LeaveGroupRequestTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.common.message.LeaveGroupResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/LeaveGroupResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/LeaveGroupResponseTest.java index 0f6a2dec820d8..194d485b4d06e 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/LeaveGroupResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/LeaveGroupResponseTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.protocol.MessageUtil; import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ListOffsetsRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ListOffsetsRequestTest.java index a18619d1712a1..d748203cce0b4 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ListOffsetsRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ListOffsetsRequestTest.java @@ -16,15 +16,6 @@ */ package org.apache.kafka.common.requests; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.kafka.common.IsolationLevel; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.message.ListOffsetsRequestData; @@ -36,8 +27,18 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.protocol.MessageUtil; + import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ListOffsetsRequestTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/requests/MetadataRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/MetadataRequestTest.java index 84764c29da6e8..117d0ced9bae7 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/MetadataRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/MetadataRequestTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.MetadataRequestData; import org.apache.kafka.common.protocol.ApiKeys; + import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -30,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MetadataRequestTest { diff --git a/clients/src/test/java/org/apache/kafka/common/requests/MetadataResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/MetadataResponseTest.java index 37f7356c6969d..3f1206ff45237 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/MetadataResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/MetadataResponseTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.message.MetadataResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import static java.util.Collections.emptyList; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/OffsetCommitRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/OffsetCommitRequestTest.java index 4ce705766f8b1..d4247aca7fda7 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/OffsetCommitRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/OffsetCommitRequestTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.message.OffsetCommitResponseData.OffsetCommitResponseTopic; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/OffsetCommitResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/OffsetCommitResponseTest.java index b9ce03f1e3ad4..cd73df6e33e05 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/OffsetCommitResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/OffsetCommitResponseTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.protocol.MessageUtil; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/OffsetFetchRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/OffsetFetchRequestTest.java index 5077b08836df3..1098925e42a0c 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/OffsetFetchRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/OffsetFetchRequestTest.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.requests.OffsetFetchRequest.Builder; import org.apache.kafka.common.requests.OffsetFetchRequest.NoBatchedOffsetFetchRequestException; import org.apache.kafka.common.requests.OffsetFetchResponse.PartitionData; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/OffsetFetchResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/OffsetFetchResponseTest.java index c73ea2afebb50..c85d26dac5756 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/OffsetFetchResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/OffsetFetchResponseTest.java @@ -29,6 +29,7 @@ import org.apache.kafka.common.record.RecordBatch; import org.apache.kafka.common.requests.OffsetFetchResponse.PartitionData; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequestTest.java index e5dacd5b3d799..6a239e162abd7 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequestTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.OffsetForLeaderEpochRequestData.OffsetForLeaderTopicCollection; import org.apache.kafka.common.protocol.ApiKeys; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ProduceRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ProduceRequestTest.java index eebaed0979597..f171eececc426 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ProduceRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ProduceRequestTest.java @@ -28,6 +28,7 @@ import org.apache.kafka.common.record.RecordVersion; import org.apache.kafka.common.record.SimpleRecord; import org.apache.kafka.common.record.TimestampType; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/ProduceResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/ProduceResponseTest.java index d854eb023012b..42e1d03f03469 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/ProduceResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/ProduceResponseTest.java @@ -17,8 +17,8 @@ package org.apache.kafka.common.requests; -import org.apache.kafka.common.message.ProduceResponseData; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.message.ProduceResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.record.RecordBatch; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/PushTelemetryRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/PushTelemetryRequestTest.java index 7b5ffd1aa329b..0727af355e8af 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/PushTelemetryRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/PushTelemetryRequestTest.java @@ -17,18 +17,13 @@ package org.apache.kafka.common.requests; -import io.opentelemetry.proto.metrics.v1.Metric; -import io.opentelemetry.proto.metrics.v1.MetricsData; -import io.opentelemetry.proto.metrics.v1.ResourceMetrics; -import io.opentelemetry.proto.metrics.v1.ScopeMetrics; -import io.opentelemetry.proto.resource.v1.Resource; - import org.apache.kafka.common.message.PushTelemetryRequestData; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.record.CompressionType; import org.apache.kafka.common.telemetry.internals.ClientTelemetryUtils; import org.apache.kafka.common.telemetry.internals.MetricKey; import org.apache.kafka.common.telemetry.internals.SinglePointMetric; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; @@ -40,6 +35,12 @@ import java.util.Collections; import java.util.List; +import io.opentelemetry.proto.metrics.v1.Metric; +import io.opentelemetry.proto.metrics.v1.MetricsData; +import io.opentelemetry.proto.metrics.v1.ResourceMetrics; +import io.opentelemetry.proto.metrics.v1.ScopeMetrics; +import io.opentelemetry.proto.resource.v1.Resource; + import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/PushTelemetryResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/PushTelemetryResponseTest.java index 4a5f085cf7dbb..ddafd48602fd7 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/PushTelemetryResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/PushTelemetryResponseTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.PushTelemetryResponseData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestContextTest.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestContextTest.java index 5caeb7730e7d2..06cab34920e1f 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/RequestContextTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestContextTest.java @@ -32,6 +32,7 @@ import org.apache.kafka.common.protocol.ObjectSerializationCache; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.auth.SecurityProtocol; + import org.junit.jupiter.api.Test; import java.net.InetAddress; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestHeaderTest.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestHeaderTest.java index e5563e8390826..c0ebdbf6d524b 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/RequestHeaderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestHeaderTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ByteBufferAccessor; import org.apache.kafka.common.protocol.ObjectSerializationCache; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java index 754d45dc02144..1141af0342f1a 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java @@ -21,8 +21,8 @@ import org.apache.kafka.common.IsolationLevel; import org.apache.kafka.common.Node; import org.apache.kafka.common.ShareGroupState; -import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicIdPartition; +import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.acl.AccessControlEntry; import org.apache.kafka.common.acl.AccessControlEntryFilter; @@ -37,23 +37,23 @@ import org.apache.kafka.common.errors.SecurityDisabledException; import org.apache.kafka.common.errors.UnknownServerException; import org.apache.kafka.common.errors.UnsupportedVersionException; -import org.apache.kafka.common.message.AddPartitionsToTxnResponseData; import org.apache.kafka.common.message.AddOffsetsToTxnRequestData; import org.apache.kafka.common.message.AddOffsetsToTxnResponseData; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTopic; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTopicCollection; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTransaction; import org.apache.kafka.common.message.AddPartitionsToTxnRequestData.AddPartitionsToTxnTransactionCollection; +import org.apache.kafka.common.message.AddPartitionsToTxnResponseData; import org.apache.kafka.common.message.AddRaftVoterRequestData; import org.apache.kafka.common.message.AddRaftVoterResponseData; import org.apache.kafka.common.message.AllocateProducerIdsRequestData; import org.apache.kafka.common.message.AllocateProducerIdsResponseData; import org.apache.kafka.common.message.AlterClientQuotasResponseData; import org.apache.kafka.common.message.AlterConfigsResponseData; -import org.apache.kafka.common.message.AlterPartitionRequestData; -import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData; +import org.apache.kafka.common.message.AlterPartitionRequestData; +import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AlterReplicaLogDirsRequestData; import org.apache.kafka.common.message.AlterReplicaLogDirsRequestData.AlterReplicaLogDirTopic; import org.apache.kafka.common.message.AlterReplicaLogDirsRequestData.AlterReplicaLogDirTopicCollection; @@ -165,10 +165,10 @@ import org.apache.kafka.common.message.IncrementalAlterConfigsRequestData.AlterableConfig; import org.apache.kafka.common.message.IncrementalAlterConfigsResponseData; import org.apache.kafka.common.message.IncrementalAlterConfigsResponseData.AlterConfigsResourceResponse; -import org.apache.kafka.common.message.InitializeShareGroupStateRequestData; -import org.apache.kafka.common.message.InitializeShareGroupStateResponseData; import org.apache.kafka.common.message.InitProducerIdRequestData; import org.apache.kafka.common.message.InitProducerIdResponseData; +import org.apache.kafka.common.message.InitializeShareGroupStateRequestData; +import org.apache.kafka.common.message.InitializeShareGroupStateResponseData; import org.apache.kafka.common.message.JoinGroupRequestData; import org.apache.kafka.common.message.JoinGroupResponseData; import org.apache.kafka.common.message.JoinGroupResponseData.JoinGroupResponseMember; @@ -280,6 +280,7 @@ import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestTestUtils.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestTestUtils.java index ebc74c807c4bf..83dbdb8a90c48 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/RequestTestUtils.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestTestUtils.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.requests; -import java.util.HashMap; -import java.util.Set; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; @@ -33,9 +31,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaRequestTest.java index 3446d498c6aac..99916b16c2c5c 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaRequestTest.java @@ -22,10 +22,11 @@ import org.apache.kafka.common.message.StopReplicaRequestData; import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaPartitionState; import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaPartitionV0; -import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaTopicV1; import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaTopicState; +import org.apache.kafka.common.message.StopReplicaRequestData.StopReplicaTopicV1; import org.apache.kafka.common.message.StopReplicaResponseData.StopReplicaPartitionError; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaResponseTest.java index a0a5eda01e822..56e75a5dc1ee3 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaResponseTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.message.StopReplicaResponseData; import org.apache.kafka.common.message.StopReplicaResponseData.StopReplicaPartitionError; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/SyncGroupRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/SyncGroupRequestTest.java index 038c989ef0750..72f30a6406cea 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/SyncGroupRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/SyncGroupRequestTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.SyncGroupRequestData; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/TxnOffsetCommitRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/TxnOffsetCommitRequestTest.java index d05f3e8781388..abb27b2a1fdf8 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/TxnOffsetCommitRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/TxnOffsetCommitRequestTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.TxnOffsetCommitRequest.CommittedOffset; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/TxnOffsetCommitResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/TxnOffsetCommitResponseTest.java index 1f19ff2c93714..954bb451014a2 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/TxnOffsetCommitResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/TxnOffsetCommitResponseTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.TxnOffsetCommitResponseData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.MessageUtil; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/UpdateFeaturesRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/UpdateFeaturesRequestTest.java index cf267da5574ce..b62b916d384a8 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/UpdateFeaturesRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/UpdateFeaturesRequestTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.message.UpdateFeaturesRequestData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/UpdateFeaturesResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/UpdateFeaturesResponseTest.java index 130fb808c5514..553fe03fec72e 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/UpdateFeaturesResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/UpdateFeaturesResponseTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.message.UpdateFeaturesResponseData; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/UpdateMetadataRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/UpdateMetadataRequestTest.java index 7be139c439964..42e9ba24d3655 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/UpdateMetadataRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/UpdateMetadataRequestTest.java @@ -29,6 +29,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/WriteTxnMarkersRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/WriteTxnMarkersRequestTest.java index 1a4890965bb8d..f4fec2ac3d64f 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/WriteTxnMarkersRequestTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/WriteTxnMarkersRequestTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/requests/WriteTxnMarkersResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/WriteTxnMarkersResponseTest.java index 9b146ef318fe7..b35a1cdce5999 100644 --- a/clients/src/test/java/org/apache/kafka/common/requests/WriteTxnMarkersResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/requests/WriteTxnMarkersResponseTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.protocol.Errors; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java b/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java index ade3aa12319c1..49989348f849f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/JaasContextTest.java @@ -16,6 +16,15 @@ */ package org.apache.kafka.common.security; +import org.apache.kafka.common.config.SaslConfigs; +import org.apache.kafka.common.config.types.Password; +import org.apache.kafka.common.network.ListenerName; +import org.apache.kafka.test.TestUtils; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -36,14 +45,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; -import org.apache.kafka.common.config.SaslConfigs; -import org.apache.kafka.common.config.types.Password; -import org.apache.kafka.common.network.ListenerName; -import org.apache.kafka.test.TestUtils; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - /** * Tests parsing of {@link SaslConfigs#SASL_JAAS_CONFIG} property and verifies that the format * and parsing are consistent with JAAS configuration files loaded by the JRE. diff --git a/clients/src/test/java/org/apache/kafka/common/security/SaslExtensionsTest.java b/clients/src/test/java/org/apache/kafka/common/security/SaslExtensionsTest.java index 085baf70d2a2a..20c7792e70c4e 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/SaslExtensionsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/SaslExtensionsTest.java @@ -16,11 +16,12 @@ */ package org.apache.kafka.common.security; -import java.util.Collections; import org.apache.kafka.common.security.auth.SaslExtensions; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/clients/src/test/java/org/apache/kafka/common/security/auth/DefaultKafkaPrincipalBuilderTest.java b/clients/src/test/java/org/apache/kafka/common/security/auth/DefaultKafkaPrincipalBuilderTest.java index 73a03ab907595..22400909fc7ff 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/auth/DefaultKafkaPrincipalBuilderTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/auth/DefaultKafkaPrincipalBuilderTest.java @@ -16,19 +16,21 @@ */ package org.apache.kafka.common.security.auth; -import javax.security.auth.x500.X500Principal; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder; import org.apache.kafka.common.security.kerberos.KerberosShortNamer; import org.apache.kafka.common.security.scram.internals.ScramMechanism; import org.apache.kafka.common.security.ssl.SslPrincipalMapper; + import org.junit.jupiter.api.Test; -import javax.net.ssl.SSLSession; -import javax.security.sasl.SaslServer; import java.net.InetAddress; import java.security.Principal; +import javax.net.ssl.SSLSession; +import javax.security.auth.x500.X500Principal; +import javax.security.sasl.SaslServer; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java index a0e22ee150552..c13a0542fca53 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/ClientAuthenticationFailureTest.java @@ -38,6 +38,7 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/LoginManagerTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/LoginManagerTest.java index 3e3300e78e436..c299874e2af3e 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/LoginManagerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/LoginManagerTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.security.JaasContext; import org.apache.kafka.common.security.plain.PlainLoginModule; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -29,9 +30,9 @@ import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertEquals; public class LoginManagerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java index 7fe4f6b5a6ade..7efe97908b82f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorFailureDelayTest.java @@ -33,6 +33,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java index 4972f3ea43037..34afd41d175b6 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java @@ -97,24 +97,12 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opentest4j.AssertionFailedError; -import javax.net.ssl.SSLPeerUnverifiedException; -import javax.security.auth.Subject; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; -import javax.security.sasl.SaslClient; -import javax.security.sasl.SaslException; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; @@ -137,6 +125,20 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import javax.net.ssl.SSLPeerUnverifiedException; +import javax.security.auth.Subject; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.auth.login.Configuration; +import javax.security.auth.login.LoginContext; +import javax.security.auth.login.LoginException; +import javax.security.sasl.SaslClient; +import javax.security.sasl.SaslException; + import static org.apache.kafka.common.protocol.ApiKeys.LIST_OFFSETS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java index 4bb2964d807aa..9d41da5cf0fec 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/SaslServerAuthenticatorTest.java @@ -50,6 +50,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.mockito.Answers; import org.mockito.ArgumentCaptor; @@ -57,10 +58,6 @@ import org.mockito.Mockito; import org.mockito.stubbing.Answer; -import javax.security.auth.Subject; -import javax.security.sasl.Sasl; -import javax.security.sasl.SaslException; -import javax.security.sasl.SaslServer; import java.io.IOException; import java.net.InetAddress; import java.nio.Buffer; @@ -72,6 +69,11 @@ import java.util.Map; import java.util.stream.Collectors; +import javax.security.auth.Subject; +import javax.security.sasl.Sasl; +import javax.security.sasl.SaslException; +import javax.security.sasl.SaslServer; + import static org.apache.kafka.common.security.scram.internals.ScramMechanism.SCRAM_SHA_256; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/TestDigestLoginModule.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/TestDigestLoginModule.java index c27e853d3915c..d6921ee9986e8 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/TestDigestLoginModule.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/TestDigestLoginModule.java @@ -16,6 +16,9 @@ */ package org.apache.kafka.common.security.authenticator; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.plain.PlainLoginModule; + import java.util.List; import java.util.Map; @@ -26,9 +29,6 @@ import javax.security.sasl.AuthorizeCallback; import javax.security.sasl.RealmCallback; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.plain.PlainLoginModule; - /** * Digest-MD5 login module for multi-mechanism tests. * This login module uses the same format as PlainLoginModule and hence simply reuses the same methods. diff --git a/clients/src/test/java/org/apache/kafka/common/security/authenticator/TestJaasConfig.java b/clients/src/test/java/org/apache/kafka/common/security/authenticator/TestJaasConfig.java index 9f119dfdaa78c..c070a94843340 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/authenticator/TestJaasConfig.java +++ b/clients/src/test/java/org/apache/kafka/common/security/authenticator/TestJaasConfig.java @@ -16,20 +16,20 @@ */ package org.apache.kafka.common.security.authenticator; +import org.apache.kafka.common.config.types.Password; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; +import org.apache.kafka.common.security.plain.PlainLoginModule; +import org.apache.kafka.common.security.scram.ScramLoginModule; +import org.apache.kafka.common.security.scram.internals.ScramMechanism; + import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; - -import org.apache.kafka.common.config.types.Password; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; -import org.apache.kafka.common.security.plain.PlainLoginModule; -import org.apache.kafka.common.security.scram.ScramLoginModule; -import org.apache.kafka.common.security.scram.internals.ScramMechanism; +import javax.security.auth.login.Configuration; public class TestJaasConfig extends Configuration { diff --git a/clients/src/test/java/org/apache/kafka/common/security/kerberos/KerberosRuleTest.java b/clients/src/test/java/org/apache/kafka/common/security/kerberos/KerberosRuleTest.java index 101530a05c5f0..5980a0d3b3c5f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/kerberos/KerberosRuleTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/kerberos/KerberosRuleTest.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.common.security.kerberos; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; - public class KerberosRuleTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerExtensionsValidatorCallbackTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerExtensionsValidatorCallbackTest.java index 82ff4fa82da1b..5a8bf8a99127f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerExtensionsValidatorCallbackTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerExtensionsValidatorCallbackTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.security.oauthbearer; import org.apache.kafka.common.security.auth.SaslExtensions; + import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java index c362c211e4bc6..70cfd41b9c17f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginCallbackHandlerTest.java @@ -17,27 +17,6 @@ package org.apache.kafka.common.security.oauthbearer; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; -import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_ID_CONFIG; -import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_SECRET_CONFIG; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.io.File; -import java.io.IOException; -import java.util.Base64; -import java.util.Calendar; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.TimeZone; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.security.auth.SaslExtensionsCallback; import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerClientInitialResponse; @@ -49,9 +28,33 @@ import org.apache.kafka.common.security.oauthbearer.internals.secured.HttpAccessTokenRetriever; import org.apache.kafka.common.security.oauthbearer.internals.secured.OAuthBearerTest; import org.apache.kafka.common.utils.Utils; + import org.jose4j.jws.AlgorithmIdentifiers; import org.junit.jupiter.api.Test; +import java.io.File; +import java.io.IOException; +import java.util.Base64; +import java.util.Calendar; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.TimeZone; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; + +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; +import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_ID_CONFIG; +import static org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler.CLIENT_SECRET_CONFIG; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class OAuthBearerLoginCallbackHandlerTest extends OAuthBearerTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginModuleTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginModuleTest.java index 0dabeab1f433f..4efbc21072280 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginModuleTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerLoginModuleTest.java @@ -16,13 +16,12 @@ */ package org.apache.kafka.common.security.oauthbearer; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verifyNoInteractions; +import org.apache.kafka.common.KafkaException; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.auth.SaslExtensions; +import org.apache.kafka.common.security.auth.SaslExtensionsCallback; + +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Collections; @@ -38,11 +37,13 @@ import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.LoginException; -import org.apache.kafka.common.KafkaException; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.auth.SaslExtensionsCallback; -import org.apache.kafka.common.security.auth.SaslExtensions; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verifyNoInteractions; public class OAuthBearerLoginModuleTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerSaslClientCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerSaslClientCallbackHandlerTest.java index ae3ef55f21a1c..98b9544a5b5f7 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerSaslClientCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerSaslClientCallbackHandlerTest.java @@ -16,8 +16,9 @@ */ package org.apache.kafka.common.security.oauthbearer; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslClientCallbackHandler; + +import org.junit.jupiter.api.Test; import java.io.IOException; import java.security.AccessController; @@ -29,8 +30,8 @@ import javax.security.auth.Subject; import javax.security.auth.callback.Callback; -import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslClientCallbackHandler; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class OAuthBearerSaslClientCallbackHandlerTest { private static OAuthBearerToken createTokenWithLifetimeMillis(final long lifetimeMillis) { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallbackTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallbackTest.java index 07ce1b2d7bcb5..fe6cc7341d993 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallbackTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallbackTest.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.security.oauthbearer; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.Set; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class OAuthBearerTokenCallbackTest { private static final OAuthBearerToken TOKEN = new OAuthBearerToken() { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackHandlerTest.java index 30b08645a9442..d682a05ec11cc 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackHandlerTest.java @@ -17,26 +17,29 @@ package org.apache.kafka.common.security.oauthbearer; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_EXPECTED_AUDIENCE; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Arrays; -import java.util.Base64; -import java.util.List; -import java.util.Map; -import javax.security.auth.callback.Callback; import org.apache.kafka.common.security.oauthbearer.internals.secured.AccessTokenBuilder; import org.apache.kafka.common.security.oauthbearer.internals.secured.AccessTokenValidator; import org.apache.kafka.common.security.oauthbearer.internals.secured.AccessTokenValidatorFactory; import org.apache.kafka.common.security.oauthbearer.internals.secured.CloseableVerificationKeyResolver; import org.apache.kafka.common.security.oauthbearer.internals.secured.OAuthBearerTest; import org.apache.kafka.common.utils.Utils; + import org.jose4j.jws.AlgorithmIdentifiers; import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Map; + +import javax.security.auth.callback.Callback; + +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_EXPECTED_AUDIENCE; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class OAuthBearerValidatorCallbackHandlerTest extends OAuthBearerTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackTest.java index b266c864afad8..3d6be5cf03627 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallbackTest.java @@ -18,13 +18,13 @@ import org.junit.jupiter.api.Test; +import java.util.Collections; +import java.util.Set; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; -import java.util.Collections; -import java.util.Set; - public class OAuthBearerValidatorCallbackTest { private static final OAuthBearerToken TOKEN = new OAuthBearerToken() { @Override diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerClientInitialResponseTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerClientInitialResponseTest.java index fc44297a2f32d..a1ac59cdc2037 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerClientInitialResponseTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerClientInitialResponseTest.java @@ -16,18 +16,20 @@ */ package org.apache.kafka.common.security.oauthbearer.internals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.apache.kafka.common.security.auth.SaslExtensions; + import org.junit.jupiter.api.Test; -import javax.security.sasl.SaslException; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; +import javax.security.sasl.SaslException; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class OAuthBearerClientInitialResponseTest { /* diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientTest.java index b1aaa0b3d44cc..3e9ea7f4db11d 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientTest.java @@ -17,17 +17,14 @@ package org.apache.kafka.common.security.oauthbearer.internals; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.security.auth.SaslExtensionsCallback; import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; import org.apache.kafka.common.security.auth.SaslExtensions; +import org.apache.kafka.common.security.auth.SaslExtensionsCallback; import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; import org.apache.kafka.common.security.oauthbearer.OAuthBearerTokenCallback; + import org.junit.jupiter.api.Test; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.sasl.SaslException; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.LinkedHashMap; @@ -35,6 +32,11 @@ import java.util.Map; import java.util.Set; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.sasl.SaslException; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServerTest.java index 7ece041e68e1f..d50fd99a10dea 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslServerTest.java @@ -16,20 +16,6 @@ */ package org.apache.kafka.common.security.oauthbearer.internals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertNull; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; - import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.errors.SaslAuthenticationException; @@ -46,9 +32,24 @@ import org.apache.kafka.common.security.oauthbearer.internals.unsecured.OAuthBearerConfigException; import org.apache.kafka.common.security.oauthbearer.internals.unsecured.OAuthBearerUnsecuredLoginCallbackHandler; import org.apache.kafka.common.security.oauthbearer.internals.unsecured.OAuthBearerUnsecuredValidatorCallbackHandler; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class OAuthBearerSaslServerTest { private static final String USER = "user"; private static final Map CONFIGS; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshConfigTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshConfigTest.java index a9b4f1338b49f..5a2388d256af9 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshConfigTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshConfigTest.java @@ -16,15 +16,16 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.expiring; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Collections; - import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.SaslConfigs; + import org.junit.jupiter.api.Test; +import java.util.Collections; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ExpiringCredentialRefreshConfigTest { @Test public void fromGoodConfig() { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLoginTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLoginTest.java index 32895e624b753..dc94181468ca2 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLoginTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLoginTest.java @@ -16,12 +16,18 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.expiring; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.apache.kafka.common.config.ConfigDef; +import org.apache.kafka.common.config.SaslConfigs; +import org.apache.kafka.common.internals.KafkaFutureImpl; +import org.apache.kafka.common.security.oauthbearer.internals.expiring.ExpiringCredentialRefreshingLogin.LoginContextFactory; +import org.apache.kafka.common.utils.MockScheduler; +import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.Time; + +import org.junit.jupiter.api.Test; +import org.mockito.InOrder; +import org.mockito.Mockito; +import org.mockito.internal.util.MockUtil; import java.util.ArrayList; import java.util.Date; @@ -38,17 +44,12 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.config.SaslConfigs; -import org.apache.kafka.common.internals.KafkaFutureImpl; -import org.apache.kafka.common.security.oauthbearer.internals.expiring.ExpiringCredentialRefreshingLogin.LoginContextFactory; -import org.apache.kafka.common.utils.MockScheduler; -import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.common.utils.Time; -import org.junit.jupiter.api.Test; -import org.mockito.InOrder; -import org.mockito.Mockito; -import org.mockito.internal.util.MockUtil; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class ExpiringCredentialRefreshingLoginTest { private static final Configuration EMPTY_WILDCARD_CONFIGURATION; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenBuilder.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenBuilder.java index 8512390926b4d..cc910e0d16c4f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenBuilder.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenBuilder.java @@ -17,21 +17,23 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; +import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.Time; + import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import java.io.IOException; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.common.utils.Time; import org.jose4j.jwk.PublicJsonWebKey; import org.jose4j.jws.JsonWebSignature; import org.jose4j.jwt.ReservedClaimNames; import org.jose4j.lang.JoseException; +import java.io.IOException; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + public class AccessTokenBuilder { private final ObjectMapper objectMapper = new ObjectMapper(); diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenRetrieverFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenRetrieverFactoryTest.java index 741b4d2566d7d..0ba706d898d79 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenRetrieverFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenRetrieverFactoryTest.java @@ -17,14 +17,16 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.apache.kafka.common.config.ConfigException; + +import org.junit.jupiter.api.Test; import java.io.File; import java.util.Collections; import java.util.Map; -import org.apache.kafka.common.config.ConfigException; -import org.junit.jupiter.api.Test; + +import static org.apache.kafka.common.config.SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; +import static org.junit.jupiter.api.Assertions.assertEquals; public class AccessTokenRetrieverFactoryTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorFactoryTest.java index 5524db165bb09..2fd02e3f9a826 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorFactoryTest.java @@ -17,12 +17,14 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import java.io.IOException; -import java.util.Map; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler; + import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.util.Map; + public class AccessTokenValidatorFactoryTest extends OAuthBearerTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorTest.java index dc1027a0c9d1c..87ec3a4bf681a 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/AccessTokenValidatorTest.java @@ -17,14 +17,14 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.jose4j.jws.AlgorithmIdentifiers; import org.jose4j.jwx.HeaderParameterNames; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import static org.junit.jupiter.api.Assertions.assertThrows; + @TestInstance(Lifecycle.PER_CLASS) public abstract class AccessTokenValidatorTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/BasicOAuthBearerTokenTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/BasicOAuthBearerTokenTest.java index e1399b75fe45b..4e4ed591c5e39 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/BasicOAuthBearerTokenTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/BasicOAuthBearerTokenTest.java @@ -17,17 +17,19 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; + +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; -import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BasicOAuthBearerTokenTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClaimValidationUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClaimValidationUtilsTest.java index d9421fb02443d..89387797cdc30 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClaimValidationUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ClaimValidationUtilsTest.java @@ -17,17 +17,17 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ClaimValidationUtilsTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java index 54aa3c6c708b7..e2a8ba135c0da 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ConfigurationUtilsTest.java @@ -17,13 +17,15 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; +import org.apache.kafka.common.config.ConfigException; +import org.apache.kafka.test.TestUtils; + +import org.junit.jupiter.api.Test; + import java.io.File; import java.io.IOException; import java.util.Collections; import java.util.Map; -import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.test.TestUtils; -import org.junit.jupiter.api.Test; public class ConfigurationUtilsTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/HttpAccessTokenRetrieverTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/HttpAccessTokenRetrieverTest.java index 59f4319e1066b..e8dd65a2aa8e6 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/HttpAccessTokenRetrieverTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/HttpAccessTokenRetrieverTest.java @@ -17,16 +17,13 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.apache.kafka.common.utils.Utils; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; + +import org.junit.jupiter.api.Test; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -37,8 +34,13 @@ import java.util.Base64; import java.util.Random; -import org.apache.kafka.common.utils.Utils; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class HttpAccessTokenRetrieverTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JaasOptionsUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JaasOptionsUtilsTest.java index 02a8938233329..722c734dcc7d6 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JaasOptionsUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/JaasOptionsUtilsTest.java @@ -17,17 +17,19 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.kafka.common.config.SslConfigs; + +import org.junit.jupiter.api.Test; import java.net.URL; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.kafka.common.config.SslConfigs; -import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JaasOptionsUtilsTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/OAuthBearerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/OAuthBearerTest.java index ba06650f8ee41..7f20b9464faea 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/OAuthBearerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/OAuthBearerTest.java @@ -17,14 +17,26 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.apache.kafka.common.config.AbstractConfig; +import org.apache.kafka.common.config.ConfigDef; +import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; +import org.apache.kafka.common.security.authenticator.TestJaasConfig; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; +import org.apache.kafka.common.utils.Utils; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; + +import org.jose4j.jwk.PublicJsonWebKey; +import org.jose4j.jwk.RsaJsonWebKey; +import org.jose4j.jwk.RsaJwkGenerator; +import org.jose4j.lang.JoseException; +import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.function.Executable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -39,23 +51,14 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.function.Consumer; + import javax.security.auth.login.AppConfigurationEntry; -import org.apache.kafka.common.config.AbstractConfig; -import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.security.auth.AuthenticateCallbackHandler; -import org.apache.kafka.common.security.authenticator.TestJaasConfig; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; -import org.apache.kafka.common.utils.Utils; -import org.jose4j.jwk.PublicJsonWebKey; -import org.jose4j.jwk.RsaJsonWebKey; -import org.jose4j.jwk.RsaJwkGenerator; -import org.jose4j.lang.JoseException; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; -import org.junit.jupiter.api.function.Executable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; @TestInstance(Lifecycle.PER_CLASS) public abstract class OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwksTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwksTest.java index 7e60313bb3043..7690bdb2d946d 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwksTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RefreshingHttpsJwksTest.java @@ -17,20 +17,21 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.apache.kafka.common.security.oauthbearer.internals.secured.RefreshingHttpsJwks.MISSING_KEY_ID_CACHE_IN_FLIGHT_MS; -import static org.apache.kafka.common.security.oauthbearer.internals.secured.RefreshingHttpsJwks.MISSING_KEY_ID_MAX_KEY_LENGTH; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; +import org.apache.kafka.common.KafkaFuture; +import org.apache.kafka.common.internals.KafkaFutureImpl; +import org.apache.kafka.common.utils.MockTime; -import java.util.Collections; -import java.util.Collection; -import java.util.List; +import org.jose4j.http.SimpleResponse; +import org.jose4j.jwk.HttpsJwks; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.AbstractMap; import java.util.ArrayList; import java.util.Arrays; -import java.util.AbstractMap; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.TreeMap; import java.util.concurrent.Callable; @@ -38,13 +39,13 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.kafka.common.KafkaFuture; -import org.apache.kafka.common.internals.KafkaFutureImpl; -import org.apache.kafka.common.utils.MockTime; -import org.jose4j.http.SimpleResponse; -import org.jose4j.jwk.HttpsJwks; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; +import static org.apache.kafka.common.security.oauthbearer.internals.secured.RefreshingHttpsJwks.MISSING_KEY_ID_CACHE_IN_FLIGHT_MS; +import static org.apache.kafka.common.security.oauthbearer.internals.secured.RefreshingHttpsJwks.MISSING_KEY_ID_MAX_KEY_LENGTH; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; public class RefreshingHttpsJwksTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RetryTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RetryTest.java index b8d2b019e1f80..b239f325cffa3 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RetryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/RetryTest.java @@ -17,15 +17,16 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.Time; + +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.concurrent.ExecutionException; -import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.common.utils.Time; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class RetryTest extends OAuthBearerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidatorAccessTokenValidatorTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidatorAccessTokenValidatorTest.java index 21d5f51c334a8..4db20e9ee10d6 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidatorAccessTokenValidatorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/secured/ValidatorAccessTokenValidatorTest.java @@ -17,13 +17,15 @@ package org.apache.kafka.common.security.oauthbearer.internals.secured; -import java.util.Collections; import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; + import org.jose4j.jwk.PublicJsonWebKey; import org.jose4j.jws.AlgorithmIdentifiers; import org.jose4j.lang.InvalidAlgorithmException; import org.junit.jupiter.api.Test; +import java.util.Collections; + import static org.junit.jupiter.api.Assertions.assertEquals; public class ValidatorAccessTokenValidatorTest extends AccessTokenValidatorTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerScopeUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerScopeUtilsTest.java index f65440e91da1d..7cf7540613475 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerScopeUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerScopeUtilsTest.java @@ -16,13 +16,14 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.unsecured; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; +import org.apache.kafka.common.utils.Utils; + +import org.junit.jupiter.api.Test; import java.util.List; -import org.apache.kafka.common.utils.Utils; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class OAuthBearerScopeUtilsTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredJwsTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredJwsTest.java index aa105685c2f9e..43a5a9a8a8dd5 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredJwsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredJwsTest.java @@ -18,10 +18,6 @@ import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Base64; @@ -29,6 +25,10 @@ import java.util.HashSet; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class OAuthBearerUnsecuredJwsTest { private static final String QUOTE = "\""; private static final String HEADER_COMPACT_SERIALIZATION = Base64.getUrlEncoder().withoutPadding() diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandlerTest.java index 4ad4e78b92c1f..097a14366d83a 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredLoginCallbackHandlerTest.java @@ -16,9 +16,13 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.unsecured; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.apache.kafka.common.security.auth.SaslExtensionsCallback; +import org.apache.kafka.common.security.authenticator.TestJaasConfig; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerTokenCallback; +import org.apache.kafka.common.utils.MockTime; + +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; @@ -31,12 +35,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.kafka.common.security.auth.SaslExtensionsCallback; -import org.apache.kafka.common.security.authenticator.TestJaasConfig; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerTokenCallback; -import org.apache.kafka.common.utils.MockTime; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public class OAuthBearerUnsecuredLoginCallbackHandlerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredValidatorCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredValidatorCallbackHandlerTest.java index 4c0d055012988..84e06f2381ddf 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredValidatorCallbackHandlerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerUnsecuredValidatorCallbackHandlerTest.java @@ -16,9 +16,13 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.unsecured; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNull; +import org.apache.kafka.common.security.authenticator.TestJaasConfig; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; +import org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallback; +import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.common.utils.Time; + +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -29,12 +33,9 @@ import javax.security.auth.callback.Callback; -import org.apache.kafka.common.security.authenticator.TestJaasConfig; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule; -import org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallback; -import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.common.utils.Time; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNull; public class OAuthBearerUnsecuredValidatorCallbackHandlerTest { private static final String UNSECURED_JWT_HEADER_JSON = "{" + claimOrHeaderText("alg", "none") + "}"; diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerValidationUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerValidationUtilsTest.java index c52ed6c4ec1cd..372c630de8614 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerValidationUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/internals/unsecured/OAuthBearerValidationUtilsTest.java @@ -16,7 +16,9 @@ */ package org.apache.kafka.common.security.oauthbearer.internals.unsecured; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.kafka.common.utils.Time; + +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -24,8 +26,7 @@ import java.util.Collections; import java.util.List; -import org.apache.kafka.common.utils.Time; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class OAuthBearerValidationUtilsTest { private static final String QUOTE = "\""; diff --git a/clients/src/test/java/org/apache/kafka/common/security/plain/internals/PlainSaslServerTest.java b/clients/src/test/java/org/apache/kafka/common/security/plain/internals/PlainSaslServerTest.java index cb56859ebcfff..9d4249ad28b8d 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/plain/internals/PlainSaslServerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/plain/internals/PlainSaslServerTest.java @@ -16,7 +16,11 @@ */ package org.apache.kafka.common.security.plain.internals; +import org.apache.kafka.common.errors.SaslAuthenticationException; +import org.apache.kafka.common.security.JaasContext; +import org.apache.kafka.common.security.authenticator.TestJaasConfig; import org.apache.kafka.common.security.plain.PlainLoginModule; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -27,10 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.apache.kafka.common.errors.SaslAuthenticationException; -import org.apache.kafka.common.security.JaasContext; -import org.apache.kafka.common.security.authenticator.TestJaasConfig; - public class PlainSaslServerTest { private static final String USER_A = "userA"; diff --git a/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramCredentialUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramCredentialUtilsTest.java index 749c4fd1fe615..071079b669cbc 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramCredentialUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramCredentialUtilsTest.java @@ -16,20 +16,20 @@ */ package org.apache.kafka.common.security.scram.internals; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; - import org.apache.kafka.common.security.authenticator.CredentialCache; import org.apache.kafka.common.security.scram.ScramCredential; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramMessagesTest.java b/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramMessagesTest.java index 066458a68910e..df84c054d4554 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramMessagesTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramMessagesTest.java @@ -16,12 +16,6 @@ */ package org.apache.kafka.common.security.scram.internals; -import java.nio.charset.StandardCharsets; -import java.util.Base64; -import java.util.Collections; - -import javax.security.sasl.SaslException; - import org.apache.kafka.common.security.scram.internals.ScramMessages.AbstractScramMessage; import org.apache.kafka.common.security.scram.internals.ScramMessages.ClientFinalMessage; import org.apache.kafka.common.security.scram.internals.ScramMessages.ClientFirstMessage; @@ -30,6 +24,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Collections; + +import javax.security.sasl.SaslException; + import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramSaslServerTest.java b/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramSaslServerTest.java index 4f1592b84fbf5..1393b26f87a97 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramSaslServerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/scram/internals/ScramSaslServerTest.java @@ -17,9 +17,6 @@ package org.apache.kafka.common.security.scram.internals; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; - import org.apache.kafka.common.errors.SaslAuthenticationException; import org.apache.kafka.common.security.authenticator.CredentialCache; import org.apache.kafka.common.security.scram.ScramCredential; @@ -28,6 +25,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; + import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java index b9aefc9a44ce4..85ddaf491768c 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java @@ -36,6 +36,7 @@ import java.security.cert.X509Certificate; import java.util.Date; import java.util.List; + import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; @@ -592,4 +593,3 @@ private X509Certificate[] generateKeyChainIncludingCA(boolean expired, boolean m return certs; } } - diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java index 589098ae10ae8..75c1d6c0e7a6f 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/DefaultSslEngineFactoryTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java index bcdb5c471ab7c..c185ba9d9fae0 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/SslFactoryTest.java @@ -16,24 +16,12 @@ */ package org.apache.kafka.common.security.ssl; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.security.GeneralSecurityException; -import java.security.KeyPair; -import java.security.KeyStore; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Map; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLEngine; - import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.config.SecurityConfig; import org.apache.kafka.common.config.SslConfigs; import org.apache.kafka.common.config.types.Password; +import org.apache.kafka.common.network.Mode; import org.apache.kafka.common.security.TestSecurityConfig; import org.apache.kafka.common.security.auth.SslEngineFactory; import org.apache.kafka.common.security.ssl.DefaultSslEngineFactory.FileBasedStore; @@ -44,10 +32,25 @@ import org.apache.kafka.common.security.ssl.mock.TestTrustManagerFactory; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.common.network.Mode; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.security.GeneralSecurityException; +import java.security.KeyPair; +import java.security.KeyStore; +import java.security.Security; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Map; +import java.util.Properties; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLEngine; + import static org.apache.kafka.common.security.ssl.SslFactory.CertificateEntries.ensureCompatible; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -59,8 +62,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import java.security.Security; -import java.util.Properties; public abstract class SslFactoryTest { private final String tlsProtocol; diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java index 596b4e9e5aca7..8a44811edb083 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestKeyManagerFactory.java @@ -16,10 +16,11 @@ */ package org.apache.kafka.common.security.ssl.mock; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactorySpi; -import javax.net.ssl.ManagerFactoryParameters; -import javax.net.ssl.X509ExtendedKeyManager; +import org.apache.kafka.common.config.types.Password; +import org.apache.kafka.test.TestSslUtils; +import org.apache.kafka.test.TestSslUtils.CertificateBuilder; +import org.apache.kafka.test.TestUtils; + import java.io.File; import java.io.IOException; import java.net.Socket; @@ -32,10 +33,10 @@ import java.util.HashMap; import java.util.Map; -import org.apache.kafka.common.config.types.Password; -import org.apache.kafka.test.TestSslUtils; -import org.apache.kafka.test.TestSslUtils.CertificateBuilder; -import org.apache.kafka.test.TestUtils; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactorySpi; +import javax.net.ssl.ManagerFactoryParameters; +import javax.net.ssl.X509ExtendedKeyManager; public class TestKeyManagerFactory extends KeyManagerFactorySpi { public static final String ALGORITHM = "TestAlgorithm"; @@ -111,4 +112,3 @@ public PrivateKey getPrivateKey(String s) { } } - diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestTrustManagerFactory.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestTrustManagerFactory.java index 82e4c4b4594b8..4af43007a62e5 100644 --- a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestTrustManagerFactory.java +++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestTrustManagerFactory.java @@ -16,14 +16,15 @@ */ package org.apache.kafka.common.security.ssl.mock; +import java.net.Socket; +import java.security.KeyStore; +import java.security.cert.X509Certificate; + import javax.net.ssl.ManagerFactoryParameters; import javax.net.ssl.SSLEngine; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactorySpi; import javax.net.ssl.X509ExtendedTrustManager; -import java.net.Socket; -import java.security.KeyStore; -import java.security.cert.X509Certificate; public class TestTrustManagerFactory extends TrustManagerFactorySpi { public static final String ALGORITHM = "TestAlgorithm"; @@ -82,4 +83,3 @@ public void checkServerTrusted(X509Certificate[] x509Certificates, String s, SSL } } - diff --git a/clients/src/test/java/org/apache/kafka/common/serialization/ListDeserializerTest.java b/clients/src/test/java/org/apache/kafka/common/serialization/ListDeserializerTest.java index fd9ee8395c532..2bfb7a863343d 100644 --- a/clients/src/test/java/org/apache/kafka/common/serialization/ListDeserializerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/serialization/ListDeserializerTest.java @@ -16,19 +16,20 @@ */ package org.apache.kafka.common.serialization; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigException; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; @SuppressWarnings("unchecked") public class ListDeserializerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/serialization/ListSerializerTest.java b/clients/src/test/java/org/apache/kafka/common/serialization/ListSerializerTest.java index 94473858fef96..4ebaafbeceaa5 100644 --- a/clients/src/test/java/org/apache/kafka/common/serialization/ListSerializerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/serialization/ListSerializerTest.java @@ -16,19 +16,20 @@ */ package org.apache.kafka.common.serialization; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.config.ConfigException; + import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class ListSerializerTest { private final ListSerializer listSerializer = new ListSerializer<>(); diff --git a/clients/src/test/java/org/apache/kafka/common/serialization/SerializationTest.java b/clients/src/test/java/org/apache/kafka/common/serialization/SerializationTest.java index d121cc8fac73e..70e5d80e35474 100644 --- a/clients/src/test/java/org/apache/kafka/common/serialization/SerializationTest.java +++ b/clients/src/test/java/org/apache/kafka/common/serialization/SerializationTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.errors.SerializationException; import org.apache.kafka.common.utils.Bytes; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporterTest.java b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporterTest.java index 0cb30c24ccb11..7dba97c238d70 100644 --- a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporterTest.java +++ b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryReporterTest.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.common.telemetry.internals; -import io.opentelemetry.proto.common.v1.KeyValue; - import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; @@ -37,6 +35,7 @@ import org.apache.kafka.common.requests.PushTelemetryResponse; import org.apache.kafka.common.telemetry.ClientTelemetryState; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -57,6 +56,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import io.opentelemetry.proto.common.v1.KeyValue; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtilsTest.java index 7f9f18be6beb2..d3816bfedaabf 100644 --- a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtilsTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.record.CompressionType; import org.apache.kafka.common.utils.Utils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; diff --git a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/KafkaMetricsCollectorTest.java b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/KafkaMetricsCollectorTest.java index cd5a184870247..bc6a9c4ca3080 100644 --- a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/KafkaMetricsCollectorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/KafkaMetricsCollectorTest.java @@ -16,11 +16,6 @@ */ package org.apache.kafka.common.telemetry.internals; -import io.opentelemetry.proto.common.v1.KeyValue; -import io.opentelemetry.proto.metrics.v1.AggregationTemporality; -import io.opentelemetry.proto.metrics.v1.Metric; -import io.opentelemetry.proto.metrics.v1.NumberDataPoint; - import org.apache.kafka.common.MetricName; import org.apache.kafka.common.metrics.Gauge; import org.apache.kafka.common.metrics.KafkaMetric; @@ -30,6 +25,7 @@ import org.apache.kafka.common.metrics.stats.CumulativeSum; import org.apache.kafka.common.metrics.stats.WindowedCount; import org.apache.kafka.common.utils.MockTime; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -42,6 +38,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.opentelemetry.proto.common.v1.KeyValue; +import io.opentelemetry.proto.metrics.v1.AggregationTemporality; +import io.opentelemetry.proto.metrics.v1.Metric; +import io.opentelemetry.proto.metrics.v1.NumberDataPoint; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/LastValueTrackerTest.java b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/LastValueTrackerTest.java index a5947ae58ad21..55c293e4f2970 100644 --- a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/LastValueTrackerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/LastValueTrackerTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.telemetry.internals; import org.apache.kafka.common.telemetry.internals.LastValueTracker.InstantAndValue; + import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/SinglePointMetricTest.java b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/SinglePointMetricTest.java index 8774383233af1..464d6c3afeba7 100644 --- a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/SinglePointMetricTest.java +++ b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/SinglePointMetricTest.java @@ -16,10 +16,6 @@ */ package org.apache.kafka.common.telemetry.internals; -import io.opentelemetry.proto.metrics.v1.AggregationTemporality; -import io.opentelemetry.proto.metrics.v1.Metric; -import io.opentelemetry.proto.metrics.v1.NumberDataPoint; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,6 +24,10 @@ import java.util.HashMap; import java.util.Map; +import io.opentelemetry.proto.metrics.v1.AggregationTemporality; +import io.opentelemetry.proto.metrics.v1.Metric; +import io.opentelemetry.proto.metrics.v1.NumberDataPoint; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/TelemetryMetricNamingConventionTest.java b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/TelemetryMetricNamingConventionTest.java index bbbc06abf308f..e3cb7def53fc3 100644 --- a/clients/src/test/java/org/apache/kafka/common/telemetry/internals/TelemetryMetricNamingConventionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/telemetry/internals/TelemetryMetricNamingConventionTest.java @@ -17,12 +17,13 @@ package org.apache.kafka.common.telemetry.internals; import org.apache.kafka.common.MetricName; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Collections; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/AbstractIteratorTest.java b/clients/src/test/java/org/apache/kafka/common/utils/AbstractIteratorTest.java index 466d2362f32e8..abc3921ccbef7 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/AbstractIteratorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/AbstractIteratorTest.java @@ -16,10 +16,7 @@ */ package org.apache.kafka.common.utils; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -27,7 +24,10 @@ import java.util.List; import java.util.NoSuchElementException; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class AbstractIteratorTest { diff --git a/clients/src/test/java/org/apache/kafka/common/utils/AppInfoParserTest.java b/clients/src/test/java/org/apache/kafka/common/utils/AppInfoParserTest.java index 0735aa1dce78b..aac13f299fe2d 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/AppInfoParserTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/AppInfoParserTest.java @@ -17,20 +17,21 @@ package org.apache.kafka.common.utils; import org.apache.kafka.common.metrics.Metrics; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.lang.management.ManagementFactory; + import javax.management.JMException; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import java.lang.management.ManagementFactory; - -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; public class AppInfoParserTest { diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java b/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java index 4c46e2ed20730..9664bc6aa849f 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java @@ -1,61 +1,61 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.kafka.common.utils; - -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.nio.ByteBuffer; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class ByteBufferInputStreamTest { - - @Test - public void testReadUnsignedIntFromInputStream() throws IOException { - ByteBuffer buffer = ByteBuffer.allocate(8); - buffer.put((byte) 10); - buffer.put((byte) 20); - buffer.put((byte) 30); - buffer.flip(); // prepare for reading - - byte[] b = new byte[6]; - - ByteBufferInputStream inputStream = new ByteBufferInputStream(buffer); - assertEquals(3, inputStream.available()); - // read two bytes - assertEquals(10, inputStream.read()); - assertEquals(20, inputStream.read()); - - // try to read 3 bytes but only able to read one - assertEquals(1, inputStream.read(b, 3, b.length - 3)); - // all bytes have been read, no more data to read, return -1 - assertEquals(-1, inputStream.read()); - - // rewind input and prepare for read again - buffer.rewind(); - - // read 3 bytes - assertEquals(3, inputStream.read(b, 0, b.length)); - // all bytes have been read, no more data to read, return -1 - assertEquals(-1, inputStream.read(b, 0, b.length)); - - // read 0 bytes - assertEquals(0, inputStream.read(b, 0, 0)); - assertEquals(-1, inputStream.read()); - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.common.utils; + +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.nio.ByteBuffer; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class ByteBufferInputStreamTest { + + @Test + public void testReadUnsignedIntFromInputStream() throws IOException { + ByteBuffer buffer = ByteBuffer.allocate(8); + buffer.put((byte) 10); + buffer.put((byte) 20); + buffer.put((byte) 30); + buffer.flip(); // prepare for reading + + byte[] b = new byte[6]; + + ByteBufferInputStream inputStream = new ByteBufferInputStream(buffer); + assertEquals(3, inputStream.available()); + // read two bytes + assertEquals(10, inputStream.read()); + assertEquals(20, inputStream.read()); + + // try to read 3 bytes but only able to read one + assertEquals(1, inputStream.read(b, 3, b.length - 3)); + // all bytes have been read, no more data to read, return -1 + assertEquals(-1, inputStream.read()); + + // rewind input and prepare for read again + buffer.rewind(); + + // read 3 bytes + assertEquals(3, inputStream.read(b, 0, b.length)); + // all bytes have been read, no more data to read, return -1 + assertEquals(-1, inputStream.read(b, 0, b.length)); + + // read 0 bytes + assertEquals(0, inputStream.read(b, 0, 0)); + assertEquals(-1, inputStream.read()); + } +} diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferUnmapperTest.java b/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferUnmapperTest.java index 795581c0dee10..6488941029e62 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferUnmapperTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferUnmapperTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.common.utils; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import java.io.File; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/BytesTest.java b/clients/src/test/java/org/apache/kafka/common/utils/BytesTest.java index 602bbf27e9e64..8bf8d87226255 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/BytesTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/BytesTest.java @@ -23,8 +23,8 @@ import java.util.TreeMap; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class BytesTest { diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ChunkedBytesStreamTest.java b/clients/src/test/java/org/apache/kafka/common/utils/ChunkedBytesStreamTest.java index 10300a2e9568f..2b230455b2290 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/ChunkedBytesStreamTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/ChunkedBytesStreamTest.java @@ -22,12 +22,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.spy; - import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; @@ -37,6 +31,12 @@ import java.util.Random; import java.util.stream.Stream; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.spy; + public class ChunkedBytesStreamTest { private static final Random RANDOM = new Random(1337); private final BufferSupplier supplier = BufferSupplier.NO_CACHING; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/CircularIteratorTest.java b/clients/src/test/java/org/apache/kafka/common/utils/CircularIteratorTest.java index 64a2ddb3bfbfd..c5551bc5189df 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/CircularIteratorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/CircularIteratorTest.java @@ -19,14 +19,14 @@ import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Collections; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.Arrays; -import java.util.Collections; - public class CircularIteratorTest { @Test diff --git a/clients/src/test/java/org/apache/kafka/common/utils/CollectionUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/CollectionUtilsTest.java index 7f8419e28a2b3..7c2a9d66e3a2d 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/CollectionUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/CollectionUtilsTest.java @@ -23,8 +23,8 @@ import static org.apache.kafka.common.utils.CollectionUtils.subtractMap; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CollectionUtilsTest { diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ConfigUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/ConfigUtilsTest.java index 7716583e1a335..bb94f2611a1be 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/ConfigUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/ConfigUtilsTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.Importance; import org.apache.kafka.common.config.ConfigDef.Type; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/FlattenedIteratorTest.java b/clients/src/test/java/org/apache/kafka/common/utils/FlattenedIteratorTest.java index 9023e00be1ea3..057b6118e07a7 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/FlattenedIteratorTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/FlattenedIteratorTest.java @@ -114,4 +114,3 @@ public void testEmptyListAtTheEnd() { } } - diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollectionTest.java b/clients/src/test/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollectionTest.java index 3706860d9747d..4491fc88fc13f 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollectionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollectionTest.java @@ -29,14 +29,14 @@ import java.util.Random; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import static org.junit.jupiter.api.Assertions.assertThrows; /** * A unit test for ImplicitLinkedHashCollection. diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollectionTest.java b/clients/src/test/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollectionTest.java index da75d40f30ca5..a04f23fa4efe8 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollectionTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollectionTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.utils; import org.apache.kafka.common.utils.ImplicitLinkedHashCollectionTest.TestElement; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/JavaTest.java b/clients/src/test/java/org/apache/kafka/common/utils/JavaTest.java index e11d06b71fc26..0b91c831fed1e 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/JavaTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/JavaTest.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.common.utils; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class JavaTest { private String javaVendor; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/MockScheduler.java b/clients/src/test/java/org/apache/kafka/common/utils/MockScheduler.java index 97560c3983d3f..47d69fb1f35c8 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/MockScheduler.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/MockScheduler.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.KafkaFuture; import org.apache.kafka.common.internals.KafkaFutureImpl; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/SanitizerTest.java b/clients/src/test/java/org/apache/kafka/common/utils/SanitizerTest.java index e78263a32e7e4..229311ec03ef7 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/SanitizerTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/SanitizerTest.java @@ -16,9 +16,7 @@ */ package org.apache.kafka.common.utils; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Test; import java.lang.management.ManagementFactory; @@ -28,7 +26,9 @@ import javax.management.ObjectName; import javax.management.OperationsException; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SanitizerTest { diff --git a/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java index a26fa4d6e8871..329b5dc8e0012 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java @@ -17,10 +17,11 @@ package org.apache.kafka.common.utils; import org.apache.kafka.common.config.SecurityConfig; -import org.apache.kafka.common.security.auth.SecurityProviderCreator; import org.apache.kafka.common.security.auth.KafkaPrincipal; +import org.apache.kafka.common.security.auth.SecurityProviderCreator; import org.apache.kafka.common.security.ssl.mock.TestPlainSaslServerProviderCreator; import org.apache.kafka.common.security.ssl.mock.TestScramSaslServerProviderCreator; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/Serializer.java b/clients/src/test/java/org/apache/kafka/common/utils/Serializer.java index a902449550a28..523da50b9ea61 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/Serializer.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/Serializer.java @@ -18,10 +18,10 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.ObjectOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; public class Serializer { diff --git a/clients/src/test/java/org/apache/kafka/common/utils/TimeTest.java b/clients/src/test/java/org/apache/kafka/common/utils/TimeTest.java index 808f63cd0f612..1ca630f81cdf5 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/TimeTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/TimeTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.common.utils; import org.apache.kafka.common.errors.TimeoutException; + import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java index 3f9979592d1de..b5520f573d81c 100755 --- a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.function.Executable; @@ -36,6 +37,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.StandardOpenOption; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.ZoneOffset; @@ -45,6 +48,7 @@ import java.time.temporal.ChronoUnit; import java.util.Arrays; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -87,9 +91,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; public class UtilsTest { diff --git a/clients/src/test/java/org/apache/kafka/common/utils/annotation/ApiKeyVersionsProvider.java b/clients/src/test/java/org/apache/kafka/common/utils/annotation/ApiKeyVersionsProvider.java index 2a1f6e471b074..ac424cd288e0c 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/annotation/ApiKeyVersionsProvider.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/annotation/ApiKeyVersionsProvider.java @@ -16,13 +16,15 @@ */ package org.apache.kafka.common.utils.annotation; -import java.util.stream.Stream; import org.apache.kafka.common.protocol.ApiKeys; + import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.support.AnnotationConsumer; +import java.util.stream.Stream; + public class ApiKeyVersionsProvider implements ArgumentsProvider, AnnotationConsumer { private ApiKeys apiKey; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/annotation/ApiKeyVersionsSource.java b/clients/src/test/java/org/apache/kafka/common/utils/annotation/ApiKeyVersionsSource.java index 9f169b3d4fa50..c89cdb70b0f3a 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/annotation/ApiKeyVersionsSource.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/annotation/ApiKeyVersionsSource.java @@ -16,12 +16,14 @@ */ package org.apache.kafka.common.utils.annotation; +import org.apache.kafka.common.protocol.ApiKeys; + +import org.junit.jupiter.params.provider.ArgumentsSource; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.kafka.common.protocol.ApiKeys; -import org.junit.jupiter.params.provider.ArgumentsSource; @Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/clients/src/test/java/org/apache/kafka/server/policy/AlterConfigPolicyTest.java b/clients/src/test/java/org/apache/kafka/server/policy/AlterConfigPolicyTest.java index 13971effe9ec1..06d5a4e93eb53 100644 --- a/clients/src/test/java/org/apache/kafka/server/policy/AlterConfigPolicyTest.java +++ b/clients/src/test/java/org/apache/kafka/server/policy/AlterConfigPolicyTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.server.policy.AlterConfigPolicy.RequestMetadata; import org.junit.jupiter.api.Test; + import java.util.Collections; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/clients/src/test/java/org/apache/kafka/test/MetricsBench.java b/clients/src/test/java/org/apache/kafka/test/MetricsBench.java index befd478da2466..b4388a505504c 100644 --- a/clients/src/test/java/org/apache/kafka/test/MetricsBench.java +++ b/clients/src/test/java/org/apache/kafka/test/MetricsBench.java @@ -16,8 +16,6 @@ */ package org.apache.kafka.test; -import java.util.Arrays; - import org.apache.kafka.common.metrics.Metrics; import org.apache.kafka.common.metrics.Sensor; import org.apache.kafka.common.metrics.stats.Avg; @@ -27,6 +25,8 @@ import org.apache.kafka.common.metrics.stats.Percentiles.BucketSizing; import org.apache.kafka.common.metrics.stats.WindowedCount; +import java.util.Arrays; + public class MetricsBench { public static void main(String[] args) { diff --git a/clients/src/test/java/org/apache/kafka/test/MockClusterResourceListener.java b/clients/src/test/java/org/apache/kafka/test/MockClusterResourceListener.java index c8185a81f089a..2933cabddf3bc 100644 --- a/clients/src/test/java/org/apache/kafka/test/MockClusterResourceListener.java +++ b/clients/src/test/java/org/apache/kafka/test/MockClusterResourceListener.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.test; -import org.apache.kafka.common.ClusterResourceListener; import org.apache.kafka.common.ClusterResource; +import org.apache.kafka.common.ClusterResourceListener; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/clients/src/test/java/org/apache/kafka/test/MockConsumerInterceptor.java b/clients/src/test/java/org/apache/kafka/test/MockConsumerInterceptor.java index ccc93c9accba3..20c133f3b93d9 100644 --- a/clients/src/test/java/org/apache/kafka/test/MockConsumerInterceptor.java +++ b/clients/src/test/java/org/apache/kafka/test/MockConsumerInterceptor.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.test; +import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerInterceptor; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.OffsetAndMetadata; -import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.common.ClusterResourceListener; import org.apache.kafka.common.ClusterResource; +import org.apache.kafka.common.ClusterResourceListener; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.ConfigException; import org.apache.kafka.common.header.internals.RecordHeaders; diff --git a/clients/src/test/java/org/apache/kafka/test/MockPartitioner.java b/clients/src/test/java/org/apache/kafka/test/MockPartitioner.java index af6d6fdd01677..31c1e630057a0 100644 --- a/clients/src/test/java/org/apache/kafka/test/MockPartitioner.java +++ b/clients/src/test/java/org/apache/kafka/test/MockPartitioner.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.test; -import org.apache.kafka.common.Cluster; import org.apache.kafka.clients.producer.Partitioner; +import org.apache.kafka.common.Cluster; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; diff --git a/clients/src/test/java/org/apache/kafka/test/MockProducerInterceptor.java b/clients/src/test/java/org/apache/kafka/test/MockProducerInterceptor.java index 6ef4f50893e7b..acc69ab44e31a 100644 --- a/clients/src/test/java/org/apache/kafka/test/MockProducerInterceptor.java +++ b/clients/src/test/java/org/apache/kafka/test/MockProducerInterceptor.java @@ -20,8 +20,8 @@ import org.apache.kafka.clients.producer.ProducerInterceptor; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.RecordMetadata; -import org.apache.kafka.common.ClusterResourceListener; import org.apache.kafka.common.ClusterResource; +import org.apache.kafka.common.ClusterResourceListener; import org.apache.kafka.common.config.ConfigException; import java.util.Map; diff --git a/clients/src/test/java/org/apache/kafka/test/MockSerializer.java b/clients/src/test/java/org/apache/kafka/test/MockSerializer.java index 1c1444550801a..bfab4b592b88e 100644 --- a/clients/src/test/java/org/apache/kafka/test/MockSerializer.java +++ b/clients/src/test/java/org/apache/kafka/test/MockSerializer.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.test; -import org.apache.kafka.common.ClusterResourceListener; import org.apache.kafka.common.ClusterResource; +import org.apache.kafka.common.ClusterResourceListener; import org.apache.kafka.common.serialization.Serializer; import java.util.concurrent.atomic.AtomicInteger; diff --git a/clients/src/test/java/org/apache/kafka/test/TestSslUtils.java b/clients/src/test/java/org/apache/kafka/test/TestSslUtils.java index 58a701ff807f7..d76a409575d8c 100644 --- a/clients/src/test/java/org/apache/kafka/test/TestSslUtils.java +++ b/clients/src/test/java/org/apache/kafka/test/TestSslUtils.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.network.Mode; import org.apache.kafka.common.security.auth.SslEngineFactory; import org.apache.kafka.common.security.ssl.DefaultSslEngineFactory; + import org.bouncycastle.asn1.ASN1EncodableVector; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.DERSequence; diff --git a/clients/src/test/java/org/apache/kafka/test/TestUtils.java b/clients/src/test/java/org/apache/kafka/test/TestUtils.java index ec4cc412d8621..44a571353222a 100644 --- a/clients/src/test/java/org/apache/kafka/test/TestUtils.java +++ b/clients/src/test/java/org/apache/kafka/test/TestUtils.java @@ -40,6 +40,7 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.utils.Exit; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 6d810499da305af291f7cbf9ceb97e0b184a59db Mon Sep 17 00:00:00 2001 From: gongxuanzhang Date: Thu, 20 Jun 2024 10:46:41 +0800 Subject: [PATCH 2/3] update build --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4a0e3589818f9..82e91c63021ba 100644 --- a/build.gradle +++ b/build.gradle @@ -783,7 +783,7 @@ subprojects { apply plugin: 'com.diffplug.spotless' spotless { java { - targetExclude 'src/generated/**/*.java' + targetExclude 'src/generated/**/*.java' 'src/generated-test/**/*.java' importOrder('kafka', 'org.apache.kafka', 'com', 'net', 'org', 'java', 'javax', '', '\\#') removeUnusedImports() } From bb4a6278079c964724952d4a569ad8de8eb07523 Mon Sep 17 00:00:00 2001 From: gongxuanzhang Date: Thu, 20 Jun 2024 10:48:23 +0800 Subject: [PATCH 3/3] update build --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 008d8819b7c51..e6b52748ed727 100644 --- a/build.gradle +++ b/build.gradle @@ -781,7 +781,7 @@ subprojects { apply plugin: 'com.diffplug.spotless' spotless { java { - targetExclude 'src/generated/**/*.java' 'src/generated-test/**/*.java' + targetExclude('src/generated/**/*.java','src/generated-test/**/*.java') importOrder('kafka', 'org.apache.kafka', 'com', 'net', 'org', 'java', 'javax', '', '\\#') removeUnusedImports() }