From f4e346109845187a598c04edca7da84f84a016f4 Mon Sep 17 00:00:00 2001 From: gongxuanzhang Date: Fri, 26 Apr 2024 11:36:30 +0800 Subject: [PATCH 1/4] a slight change. The modifiers should be in uniform order --- .../main/java/org/apache/kafka/timeline/BaseHashTable.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server-common/src/main/java/org/apache/kafka/timeline/BaseHashTable.java b/server-common/src/main/java/org/apache/kafka/timeline/BaseHashTable.java index 783d7e1064336..9d41aa65a520c 100644 --- a/server-common/src/main/java/org/apache/kafka/timeline/BaseHashTable.java +++ b/server-common/src/main/java/org/apache/kafka/timeline/BaseHashTable.java @@ -37,17 +37,17 @@ class BaseHashTable { /** * The maximum load factor we will allow the hash table to climb to before expanding. */ - private final static double MAX_LOAD_FACTOR = 0.75f; + private static final double MAX_LOAD_FACTOR = 0.75f; /** * The minimum number of slots we can have in the hash table. */ - final static int MIN_CAPACITY = 2; + static final int MIN_CAPACITY = 2; /** * The maximum number of slots we can have in the hash table. */ - final static int MAX_CAPACITY = 1 << 30; + static final int MAX_CAPACITY = 1 << 30; private Object[] elements; private int size = 0; From 9df42fa42073d261f81ff42a41ccd4819a055781 Mon Sep 17 00:00:00 2001 From: gongxuanzhang Date: Wed, 12 Jun 2024 22:44:28 +0800 Subject: [PATCH 2/4] update modifier order and add checkstyle rule --- checkstyle/checkstyle.xml | 3 + .../clients/ClusterConnectionStates.java | 8 +- .../clients/admin/CreateTopicsResult.java | 2 +- .../admin/DescribeReplicaLogDirsResult.java | 2 +- .../clients/admin/ElectLeadersOptions.java | 2 +- .../clients/admin/ElectLeadersResult.java | 2 +- .../kafka/clients/admin/KafkaAdminClient.java | 2 +- .../kafka/clients/admin/TransactionState.java | 2 +- .../internals/AdminBootstrapAddresses.java | 2 +- .../consumer/ConsumerGroupMetadata.java | 8 +- .../kafka/clients/consumer/KafkaConsumer.java | 4 +- .../internals/AbstractStickyAssignor.java | 2 +- .../internals/ConsumerCoordinator.java | 2 +- .../internals/MembershipManagerImpl.java | 4 +- .../consumer/internals/RequestState.java | 6 +- .../clients/consumer/internals/Utils.java | 6 +- .../internals/BuiltInPartitioner.java | 4 +- .../producer/internals/ProducerBatch.java | 2 +- .../producer/internals/RecordAccumulator.java | 10 +- .../internals/SenderMetricsRegistry.java | 2 +- .../internals/TransactionManager.java | 2 +- .../kafka/common/ConsumerGroupState.java | 2 +- .../org/apache/kafka/common/GroupType.java | 2 +- .../apache/kafka/common/KafkaException.java | 2 +- .../org/apache/kafka/common/KafkaFuture.java | 2 +- .../apache/kafka/common/acl/AclOperation.java | 2 +- .../kafka/common/acl/AclPermissionType.java | 2 +- .../internals/BrokerSecurityConfigs.java | 4 +- .../errors/TransactionAbortedException.java | 2 +- .../common/internals/FatalExitError.java | 2 +- .../kafka/common/protocol/types/Schema.java | 4 +- .../kafka/common/protocol/types/Type.java | 2 +- .../kafka/common/record/MemoryRecords.java | 2 +- .../requests/AbstractControlRequest.java | 2 +- .../common/requests/AbstractRequest.java | 2 +- .../requests/DescribeLogDirsResponse.java | 4 +- .../common/requests/FetchSnapshotRequest.java | 2 +- .../requests/FetchSnapshotResponse.java | 2 +- .../kafka/common/requests/RequestHeader.java | 2 +- .../kafka/common/requests/ResponseHeader.java | 2 +- .../kafka/common/resource/PatternType.java | 4 +- .../kafka/common/resource/Resource.java | 4 +- .../kafka/common/resource/ResourceType.java | 2 +- .../common/security/auth/KafkaPrincipal.java | 2 +- .../scram/internals/ScramMessages.java | 2 +- ...NameLoggingTrustManagerFactoryWrapper.java | 4 +- .../kafka/common/serialization/Serdes.java | 64 ++--- .../telemetry/ClientTelemetryState.java | 2 +- .../internals/ClientTelemetryUtils.java | 6 +- .../TelemetryMetricNamingConvention.java | 2 +- .../org/apache/kafka/common/utils/Bytes.java | 2 +- .../common/utils/ChildFirstClassLoader.java | 2 +- .../org/apache/kafka/common/utils/Exit.java | 6 +- .../utils/ImplicitLinkedHashCollection.java | 20 +- .../ImplicitLinkedHashMultiCollection.java | 2 +- .../apache/kafka/common/utils/LogContext.java | 2 +- .../kafka/common/utils/PureJavaCrc32C.java | 2 +- .../org/apache/kafka/common/utils/Shell.java | 2 +- .../kafka/clients/admin/MockAdminClient.java | 90 +++---- .../internals/CompletedFetchTest.java | 8 +- .../internals/FetchCollectorTest.java | 6 +- .../internals/FetchMetricsManagerTest.java | 4 +- .../TopicPartitionComparatorTest.java | 8 +- .../consumer/internals/WakeupTriggerTest.java | 2 +- .../producer/RoundRobinPartitionerTest.java | 2 +- .../UniformStickyPartitionerTest.java | 6 +- .../internals/BuiltInPartitionerTest.java | 8 +- .../internals/DefaultPartitionerTest.java | 8 +- .../internals/StickyPartitionCacheTest.java | 8 +- .../org/apache/kafka/common/ClusterTest.java | 12 +- .../kafka/common/compress/KafkaLZ4Test.java | 2 +- .../kafka/common/network/NioEchoServer.java | 2 +- .../secured/ConfigurationUtilsTest.java | 2 +- .../serialization/SerializationTest.java | 4 +- .../ImplicitLinkedHashCollectionTest.java | 2 +- .../apache/kafka/common/utils/ShellTest.java | 2 +- .../storage/StringConverterConfig.java | 2 +- .../connect/json/JsonConverterConfig.java | 2 +- .../kafka/connect/mirror/MirrorClient.java | 2 +- .../mirror/MirrorCheckpointConfig.java | 2 +- .../connect/mirror/MirrorHeartbeatConfig.java | 2 +- .../connect/mirror/MirrorSourceConfig.java | 2 +- .../mirror/MirrorSourceMetricsTest.java | 8 +- .../converters/NumberConverterConfig.java | 2 +- .../connect/runtime/ConnectorConfig.java | 2 +- .../ConnectorValidationIntegrationTest.java | 4 +- .../connect/runtime/ConnectorConfigTest.java | 8 +- .../connect/runtime/WorkerConnectorTest.java | 2 +- .../runtime/WorkerSinkTaskThreadedTest.java | 2 +- .../kafka/connect/runtime/WorkerTaskTest.java | 2 +- .../distributed/DistributedHerderTest.java | 4 +- .../standalone/StandaloneHerderTest.java | 8 +- .../kafka/connect/tools/SchemaSourceTask.java | 4 +- .../kafka/log/remote/RemoteLogManager.java | 2 +- .../logger/RuntimeLoggerManagerTest.java | 4 +- .../test/java/kafka/test/MockController.java | 14 +- .../test/junit/ClusterTestExtensions.java | 2 +- .../kafka/testkit/KafkaClusterTestKit.java | 4 +- .../kafka/message/IsNullConditional.java | 2 +- .../kafka/message/JsonConverterGenerator.java | 2 +- .../group/ConsumerGroupMigrationPolicy.java | 2 +- .../apache/kafka/coordinator/group/Group.java | 2 +- .../group/GroupCoordinatorConfig.java | 64 ++--- .../group/consumer/MemberState.java | 2 +- .../metrics/GroupCoordinatorMetrics.java | 22 +- .../GroupMetadataManagerTestContext.java | 14 +- .../group/OffsetMetadataManagerTest.java | 6 +- .../timeline/TimelineHashMapBenchmark.java | 2 +- .../kafka/controller/BrokersToIsrs.java | 4 +- .../controller/ClusterControlManager.java | 2 +- .../kafka/controller/QuorumController.java | 6 +- .../kafka/controller/QuorumFeatures.java | 2 +- .../metrics/ControllerMetadataMetrics.java | 18 +- .../metrics/QuorumControllerMetrics.java | 28 +-- .../apache/kafka/image/ClientQuotaImage.java | 2 +- .../apache/kafka/image/ClientQuotasImage.java | 2 +- .../org/apache/kafka/image/MetadataImage.java | 2 +- .../apache/kafka/image/ProducerIdsImage.java | 2 +- .../loader/metrics/MetadataLoaderMetrics.java | 6 +- .../kafka/image/node/AclsImageByIdNode.java | 2 +- .../image/node/ClusterImageBrokersNode.java | 2 +- .../node/ClusterImageControllersNode.java | 2 +- .../kafka/image/node/ClusterImageNode.java | 2 +- .../image/node/ConfigurationsImageNode.java | 2 +- .../image/node/DelegationTokenImageNode.java | 2 +- .../kafka/image/node/FeaturesImageNode.java | 8 +- .../kafka/image/node/MetadataImageNode.java | 4 +- .../kafka/image/node/ProvenanceNode.java | 2 +- .../kafka/image/node/ScramImageNode.java | 2 +- .../kafka/image/node/TopicsImageByIdNode.java | 2 +- .../image/node/TopicsImageByNameNode.java | 2 +- .../kafka/image/node/TopicsImageNode.java | 2 +- .../image/publisher/SnapshotEmitter.java | 2 +- .../metrics/SnapshotEmitterMetrics.java | 4 +- .../BrokerRegistrationFencingChange.java | 2 +- ...egistrationInControlledShutdownChange.java | 2 +- .../apache/kafka/metadata/BrokerState.java | 2 +- .../apache/kafka/metadata/ListenerInfo.java | 4 +- .../kafka/metadata/PartitionRegistration.java | 2 +- .../org/apache/kafka/metadata/Replicas.java | 2 +- .../apache/kafka/metadata/VersionRange.java | 2 +- .../metadata/authorizer/StandardAcl.java | 2 +- .../authorizer/StandardAclWithId.java | 2 +- .../authorizer/StandardAuthorizer.java | 4 +- .../migration/KRaftMigrationDriver.java | 4 +- .../placement/StripedReplicaPlacer.java | 2 +- .../ClientQuotaControlManagerTest.java | 2 +- .../PartitionChangeBuilderTest.java | 8 +- .../QuorumControllerIntegrationTestUtils.java | 2 +- .../controller/QuorumControllerTest.java | 8 +- .../kafka/controller/QuorumFeaturesTest.java | 4 +- .../ReplicationControlManagerTest.java | 6 +- .../org/apache/kafka/image/AclsImageTest.java | 8 +- .../kafka/image/ClientQuotasImageTest.java | 8 +- .../kafka/image/ConfigurationsImageTest.java | 8 +- .../kafka/image/DelegationTokenImageTest.java | 8 +- .../apache/kafka/image/FeaturesImageTest.java | 14 +- .../apache/kafka/image/MetadataImageTest.java | 6 +- .../image/MetadataVersionChangeTest.java | 4 +- .../kafka/image/ProducerIdsImageTest.java | 8 +- .../apache/kafka/image/ScramImageTest.java | 8 +- .../node/ClusterImageBrokersNodeTest.java | 2 +- .../node/ClusterImageControllersNodeTest.java | 2 +- .../image/node/ClusterImageNodeTest.java | 2 +- .../kafka/image/node/TopicImageNodeTest.java | 2 +- .../publisher/SnapshotGeneratorTest.java | 4 +- .../metadata/LeaderRecoveryStateTest.java | 2 +- .../metadata/authorizer/StandardAclTest.java | 2 +- .../authorizer/StandardAclWithIdTest.java | 2 +- .../authorizer/StandardAuthorizerTest.java | 2 +- .../bootstrap/BootstrapDirectoryTest.java | 2 +- .../bootstrap/BootstrapMetadataTest.java | 4 +- .../migration/KRaftMigrationDriverTest.java | 2 +- .../MetaPropertiesEnsembleTest.java | 6 +- .../properties/MetaPropertiesTest.java | 2 +- .../properties/MetaPropertiesVersionTest.java | 2 +- .../properties/PropertiesUtilsTest.java | 2 +- .../util/BatchFileWriterReaderTest.java | 2 +- .../metadata/util/RecordRedactorTest.java | 2 +- .../kafka/raft/ValidOffsetAndEpoch.java | 4 +- .../errors/BufferAllocationException.java | 2 +- .../kafka/raft/errors/NotLeaderException.java | 2 +- .../kafka/raft/errors/RaftException.java | 2 +- .../errors/UnexpectedBaseOffsetException.java | 2 +- .../kafka/snapshot/RecordsSnapshotWriter.java | 10 +- .../raft/KafkaRaftClientSnapshotTest.java | 4 +- .../kafka/raft/RaftEventSimulationTest.java | 2 +- .../snapshot/SnapshotWriterReaderTest.java | 2 +- .../apache/kafka/snapshot/SnapshotsTest.java | 2 +- .../org/apache/kafka/queue/EventQueue.java | 2 +- .../kafka/server/config/QuotaConfigs.java | 2 +- .../fault/ProcessTerminatingFaultHandler.java | 2 +- .../mutable/BoundedListTooLongException.java | 2 +- .../kafka/server/util/CommandLineUtils.java | 2 +- .../kafka/timeline/SnapshotRegistry.java | 2 +- .../timeline/SnapshottableHashTable.java | 2 +- .../kafka/queue/KafkaEventQueueTest.java | 2 +- .../ProcessTerminatingFaultHandlerTest.java | 2 +- .../network/EndpointReadyFuturesTest.java | 2 +- .../server/util/CommandLineUtilsTest.java | 2 +- .../server/config/KafkaSecurityConfigs.java | 236 +++++++++--------- .../DefaultClientTelemetryPayload.java | 8 +- .../shell/command/CatCommandHandler.java | 2 +- .../kafka/shell/command/CdCommandHandler.java | 2 +- .../shell/command/ExitCommandHandler.java | 2 +- .../shell/command/FindCommandHandler.java | 2 +- .../shell/command/HelpCommandHandler.java | 2 +- .../shell/command/HistoryCommandHandler.java | 2 +- .../kafka/shell/command/LsCommandHandler.java | 2 +- .../shell/command/ManCommandHandler.java | 2 +- .../shell/command/PwdCommandHandler.java | 2 +- .../shell/command/TreeCommandHandler.java | 2 +- .../shell/MetadataShellIntegrationTest.java | 2 +- .../kafka/shell/glob/GlobVisitorTest.java | 2 +- .../remote/storage/RemoteStorageMetrics.java | 40 +-- .../internals/log/VerificationStateEntry.java | 4 +- .../examples/pageview/PageViewTypedDemo.java | 10 +- .../apache/kafka/streams/KafkaStreams.java | 2 +- .../apache/kafka/streams/TopologyConfig.java | 2 +- .../errors/BrokerNotFoundException.java | 2 +- .../errors/InvalidStateStoreException.java | 2 +- .../kafka/streams/errors/LockException.java | 2 +- .../errors/MissingSourceTopicException.java | 2 +- .../errors/ProcessorStateException.java | 2 +- .../streams/errors/StreamsException.java | 2 +- .../errors/TaskAssignmentException.java | 2 +- .../streams/errors/TaskMigratedException.java | 2 +- .../kafka/streams/kstream/EmitStrategy.java | 4 +- .../kafka/streams/kstream/WindowedSerdes.java | 10 +- ...ctKStreamTimeWindowAggregateProcessor.java | 6 +- .../internals/CogroupedKStreamImpl.java | 6 +- .../SubscriptionResponseWrapper.java | 2 +- .../internals/graph/SourceGraphNode.java | 4 +- .../processor/internals/AbstractTask.java | 2 +- .../internals/DefaultStateUpdater.java | 2 +- .../internals/GlobalStateManagerImpl.java | 2 +- .../internals/InternalTopicManager.java | 4 +- .../internals/InternalTopologyBuilder.java | 26 +- .../internals/PunctuationSchedule.java | 2 +- .../internals/RecordCollectorImpl.java | 2 +- .../internals/StoreChangelogReader.java | 2 +- .../streams/state/QueryableStoreTypes.java | 4 +- .../kafka/streams/state/StreamsMetadata.java | 2 +- ...tDualSchemaRocksDBSegmentedBytesStore.java | 4 +- ...RocksDBTimeOrderedSegmentedBytesStore.java | 6 +- .../state/internals/AbstractStoreBuilder.java | 2 +- .../state/internals/InMemorySessionStore.java | 2 +- .../state/internals/InMemoryWindowStore.java | 2 +- .../state/internals/ListValueStore.java | 4 +- .../streams/state/internals/NamedCache.java | 2 +- .../TimestampedKeyValueStoreBuilder.java | 4 +- .../TimestampedWindowStoreBuilder.java | 2 +- .../ValueAndTimestampDeserializer.java | 4 +- .../kafka/streams/KafkaStreamsTest.java | 6 +- .../apache/kafka/streams/TopologyTest.java | 2 +- .../apache/kafka/streams/TopologyWrapper.java | 2 +- .../integration/EosIntegrationTest.java | 16 +- .../EosV2UpgradeIntegrationTest.java | 16 +- .../KStreamKStreamIntegrationTest.java | 18 +- ...rJoinCustomPartitionerIntegrationTest.java | 20 +- ...reignKeyInnerJoinMultiIntegrationTest.java | 24 +- .../MetricsReporterIntegrationTest.java | 4 +- .../PurgeRepartitionTopicIntegrationTest.java | 2 +- .../StandbyTaskEOSIntegrationTest.java | 6 +- ...yTaskEOSMultiRebalanceIntegrationTest.java | 2 +- .../StoreQueryIntegrationTest.java | 2 +- .../KStreamGlobalKTableJoinTest.java | 2 +- .../KStreamGlobalKTableLeftJoinTest.java | 2 +- .../internals/KStreamKStreamLeftJoinTest.java | 4 +- .../KStreamKStreamOuterJoinTest.java | 2 +- .../internals/KStreamKTableJoinTest.java | 2 +- .../internals/KStreamKTableLeftJoinTest.java | 2 +- .../internals/KTableAggregateTest.java | 2 +- .../internals/KTableKTableInnerJoinTest.java | 2 +- .../internals/DefaultStateUpdaterTest.java | 38 +-- .../internals/GlobalStreamThreadTest.java | 4 +- .../internals/ProcessorRecordContextTest.java | 2 +- ...AwarenessStreamsPartitionAssignorTest.java | 2 +- .../processor/internals/StreamThreadTest.java | 8 +- .../internals/StreamsAssignmentScaleTest.java | 4 +- .../internals/TaskExecutionMetadataTest.java | 12 +- .../processor/internals/TasksTest.java | 22 +- .../internals/TopologyMetadataTest.java | 4 +- .../assignment/SubscriptionInfoTest.java | 2 +- .../metrics/StreamsMetricsImplTest.java | 70 +++--- .../internals/metrics/TaskMetricsTest.java | 4 +- .../tasks/DefaultTaskExecutorTest.java | 2 +- .../tasks/DefaultTaskManagerTest.java | 2 +- .../CachingInMemoryKeyValueStoreTest.java | 2 +- .../CachingPersistentWindowStoreTest.java | 2 +- .../ChangeLoggingSessionBytesStoreTest.java | 4 +- ...oggingTimestampedWindowBytesStoreTest.java | 2 +- .../ChangeLoggingWindowBytesStoreTest.java | 2 +- .../GlobalStateStoreProviderTest.java | 4 +- .../internals/InMemoryWindowStoreTest.java | 2 +- ...rappedWindowStoreKeyValueIteratorTest.java | 2 +- .../MeteredTimestampedKeyValueStoreTest.java | 2 +- .../RocksDBSegmentedBytesStoreTest.java | 2 +- .../state/internals/RocksDBStoreTest.java | 4 +- ...ksDBTimeOrderedKeyValueBytesStoreTest.java | 4 +- ...eOrderedWindowSegmentedBytesStoreTest.java | 2 +- ...sDBTimestampedSegmentedBytesStoreTest.java | 2 +- ...rsionedKeyValueBytesStoreSupplierTest.java | 4 +- .../internals/SegmentedCacheFunctionTest.java | 2 +- ...deredCachingPersistentWindowStoreTest.java | 2 +- .../internals/TimeOrderedWindowStoreTest.java | 2 +- .../state/internals/WindowKeySchemaTest.java | 24 +- .../metrics/RocksDBMetricsRecorderTest.java | 16 +- .../RocksDBMetricsRecordingTriggerTest.java | 10 +- .../kafka/streams/tests/EosTestDriver.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../org/apache/kafka/test/MockAggregator.java | 4 +- .../apache/kafka/test/MockInitializer.java | 2 +- .../org/apache/kafka/test/MockReducer.java | 10 +- .../apache/kafka/test/MockValueJoiner.java | 2 +- .../kafka/streams/TopologyTestDriver.java | 4 +- .../apache/kafka/streams/TestTopicsTest.java | 8 +- .../kafka/streams/TopologyTestDriverTest.java | 16 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../kafka/streams/tests/SmokeTestUtil.java | 2 +- .../apache/kafka/tools/EndToEndLatency.java | 6 +- .../apache/kafka/tools/ManifestWorkspace.java | 2 +- .../apache/kafka/tools/StreamsResetter.java | 2 +- .../org/apache/kafka/tools/TopicCommand.java | 2 +- .../kafka/tools/VerifiableConsumer.java | 2 +- .../kafka/tools/VerifiableProducer.java | 2 +- .../kafka/tools/consumer/group/CsvUtils.java | 2 +- .../kafka/trogdor/common/StringExpander.java | 2 +- .../trogdor/coordinator/TaskManager.java | 8 +- .../apache/kafka/trogdor/fault/Kibosh.java | 6 +- .../apache/kafka/trogdor/task/TaskSpec.java | 2 +- .../workload/ConfigurableProducerWorker.java | 2 +- .../trogdor/workload/ConsumeBenchWorker.java | 2 +- .../trogdor/workload/PartitionsSpec.java | 4 +- .../trogdor/workload/ProduceBenchWorker.java | 2 +- .../kafka/trogdor/workload/Throttle.java | 2 +- .../workload/TimestampRecordProcessor.java | 4 +- .../trogdor/workload/TopicsSpecTest.java | 6 +- 351 files changed, 989 insertions(+), 986 deletions(-) diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index aff659638928b..8e9639c79128a 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -148,6 +148,9 @@ + + + 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 41450a5b5c886..c4e24a48bec42 100644 --- a/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java +++ b/clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java @@ -37,10 +37,10 @@ * */ final class ClusterConnectionStates { - final static int RECONNECT_BACKOFF_EXP_BASE = 2; - final static double RECONNECT_BACKOFF_JITTER = 0.2; - final static int CONNECTION_SETUP_TIMEOUT_EXP_BASE = 2; - final static double CONNECTION_SETUP_TIMEOUT_JITTER = 0.2; + static final int RECONNECT_BACKOFF_EXP_BASE = 2; + static final double RECONNECT_BACKOFF_JITTER = 0.2; + static final int CONNECTION_SETUP_TIMEOUT_EXP_BASE = 2; + static final double CONNECTION_SETUP_TIMEOUT_JITTER = 0.2; private final Map nodeState; private final Logger log; private final HostResolver hostResolver; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsResult.java b/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsResult.java index 0d065d7bd50c5..b4f81e1c3ef2f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsResult.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsResult.java @@ -32,7 +32,7 @@ */ @InterfaceStability.Evolving public class CreateTopicsResult { - final static int UNKNOWN = -1; + static final int UNKNOWN = -1; private final Map> futures; 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 54bd9c142b0b0..e43155365bd04 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 @@ -69,7 +69,7 @@ public Map apply(Void v) { }); } - static public class ReplicaLogDirInfo { + public static class ReplicaLogDirInfo { // The current log directory of the replica of this partition on the given broker. // Null if no replica is not found for this partition on the given broker. private final String currentReplicaLogDir; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersOptions.java b/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersOptions.java index ae03ebe2b8453..afb41bbbf94b6 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersOptions.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersOptions.java @@ -28,5 +28,5 @@ * The API of this class is evolving, see {@link Admin} for details. */ @InterfaceStability.Evolving -final public class ElectLeadersOptions extends AbstractOptions { +public final class ElectLeadersOptions extends AbstractOptions { } 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 567e984a45a73..acc79b3227d0e 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 @@ -34,7 +34,7 @@ * The API of this class is evolving, see {@link Admin} for details. */ @InterfaceStability.Evolving -final public class ElectLeadersResult { +public final class ElectLeadersResult { private final KafkaFuture>> electionFuture; ElectLeadersResult(KafkaFuture>> electionFuture) { 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 71d39900cd5a8..eccf777bd7d76 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 @@ -3467,7 +3467,7 @@ private Set validAclOperations(final int authorizedOperations) { .collect(Collectors.toSet()); } - private final static class ListConsumerGroupsResults { + private static final class ListConsumerGroupsResults { private final List errors; private final HashMap listings; private final HashSet remaining; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/TransactionState.java b/clients/src/main/java/org/apache/kafka/clients/admin/TransactionState.java index bc994e450c2d2..17ec5a260566f 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/TransactionState.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/TransactionState.java @@ -34,7 +34,7 @@ public enum TransactionState { PREPARE_EPOCH_FENCE("PrepareEpochFence"), UNKNOWN("Unknown"); - private final static Map NAME_TO_ENUM = Arrays.stream(values()) + private static final Map NAME_TO_ENUM = Arrays.stream(values()) .collect(Collectors.toMap(state -> state.name, Function.identity())); private final String name; diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminBootstrapAddresses.java b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminBootstrapAddresses.java index ee39f4ab809c1..8e115c2944ded 100644 --- a/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminBootstrapAddresses.java +++ b/clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminBootstrapAddresses.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Objects; -final public class AdminBootstrapAddresses { +public final class AdminBootstrapAddresses { private final boolean usingBootstrapControllers; private final List addresses; diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerGroupMetadata.java b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerGroupMetadata.java index f9b7b284e1fae..4ba53ae38226a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerGroupMetadata.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerGroupMetadata.java @@ -26,10 +26,10 @@ * Note: Any change to this class is considered public and requires a KIP. */ public class ConsumerGroupMetadata { - final private String groupId; - final private int generationId; - final private String memberId; - final private Optional groupInstanceId; + private final String groupId; + private final int generationId; + private final String memberId; + private final Optional groupInstanceId; public ConsumerGroupMetadata(String groupId, int generationId, 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 bb75a40657311..40870146435f3 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 @@ -523,7 +523,7 @@ */ public class KafkaConsumer implements Consumer { - private final static ConsumerDelegateCreator CREATOR = new ConsumerDelegateCreator(); + private static final ConsumerDelegateCreator CREATOR = new ConsumerDelegateCreator(); private final ConsumerDelegate delegate; @@ -1803,4 +1803,4 @@ KafkaConsumerMetrics kafkaConsumerMetrics() { boolean updateAssignmentMetadataIfNeeded(final Timer timer) { return delegate.updateAssignmentMetadataIfNeeded(timer); } -} \ No newline at end of file +} 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 727dac231acf9..c7e9e1d332baf 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 @@ -85,7 +85,7 @@ public MemberData(List partitions, Optional generation) } } - abstract protected MemberData memberData(Subscription subscription); + protected abstract MemberData memberData(Subscription subscription); @Override public Map> assignPartitions(Map> partitionsPerTopic, 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 13e4a194eaa54..bb4591d8192c8 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 @@ -96,7 +96,7 @@ * This class manages the coordination process with the consumer coordinator. */ public final class ConsumerCoordinator extends AbstractCoordinator { - private final static TopicPartitionComparator COMPARATOR = new TopicPartitionComparator(); + private static final TopicPartitionComparator COMPARATOR = new TopicPartitionComparator(); private final GroupRebalanceConfig rebalanceConfig; private final Logger log; 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 4710746995935..364703285f498 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 @@ -119,13 +119,13 @@ public class MembershipManagerImpl implements MembershipManager { /** * TopicPartition comparator based on topic name and partition id. */ - final static TopicPartitionComparator TOPIC_PARTITION_COMPARATOR = new TopicPartitionComparator(); + static final TopicPartitionComparator TOPIC_PARTITION_COMPARATOR = new TopicPartitionComparator(); /** * TopicIdPartition comparator based on topic name and partition id (ignoring ID while sorting, * as this is sorted mainly for logging purposes). */ - final static TopicIdPartitionComparator TOPIC_ID_PARTITION_COMPARATOR = new TopicIdPartitionComparator(); + static final TopicIdPartitionComparator TOPIC_ID_PARTITION_COMPARATOR = new TopicIdPartitionComparator(); /** * Group ID of the consumer group the member will be part of, provided when creating the current 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 a888e7831abeb..09a78a7df070a 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 @@ -24,8 +24,8 @@ class RequestState { private final Logger log; protected final String owner; - final static int RETRY_BACKOFF_EXP_BASE = 2; - final static double RETRY_BACKOFF_JITTER = 0.2; + static final int RETRY_BACKOFF_EXP_BASE = 2; + static final double RETRY_BACKOFF_JITTER = 0.2; protected final ExponentialBackoff exponentialBackoff; protected long lastSentMs = -1; protected long lastReceivedMs = -1; @@ -157,4 +157,4 @@ protected String toStringBase() { public String toString() { return "RequestState{" + toStringBase() + '}'; } -} \ No newline at end of file +} diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Utils.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Utils.java index 7d7d788a8dd4b..c9fd21f579ff6 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Utils.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Utils.java @@ -26,7 +26,7 @@ public final class Utils { - final static class PartitionComparator implements Comparator, Serializable { + static final class PartitionComparator implements Comparator, Serializable { private static final long serialVersionUID = 1L; private final Map> map; @@ -46,7 +46,7 @@ public int compare(TopicPartition o1, TopicPartition o2) { } } - public final static class TopicPartitionComparator implements Comparator, Serializable { + public static final class TopicPartitionComparator implements Comparator, Serializable { private static final long serialVersionUID = 1L; @Override @@ -62,7 +62,7 @@ public int compare(TopicPartition topicPartition1, TopicPartition topicPartition } } - public final static class TopicIdPartitionComparator implements Comparator, Serializable { + public static final class TopicIdPartitionComparator implements Comparator, Serializable { private static final long serialVersionUID = 1L; /** 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 31129b435d1b6..8c5282045da8b 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 @@ -45,7 +45,7 @@ public class BuiltInPartitioner { private final AtomicReference stickyPartitionInfo = new AtomicReference<>(); // Visible and used for testing only. - static volatile public Supplier mockRandom = null; + public static volatile Supplier mockRandom = null; /** * BuiltInPartitioner constructor. @@ -331,7 +331,7 @@ public static int partitionForKey(final byte[] serializedKey, final int numParti /** * The partition load stats for each topic that are used for adaptive partition distribution. */ - private final static class PartitionLoadStats { + private static final class PartitionLoadStats { public final int[] cumulativeFrequencyTable; public final int[] partitionIds; public final int length; 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 4225b42809367..99c3a0b465621 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 @@ -395,7 +395,7 @@ public boolean isCompressed() { /** * A callback and the associated FutureRecordMetadata argument to pass to it. */ - final private static class Thunk { + private static final class Thunk { final Callback callback; final FutureRecordMetadata future; 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 013ad32dc7df3..8674bc0568209 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 @@ -1209,7 +1209,7 @@ public PartitionerConfig() { /* * Metadata about a record just appended to the record accumulator */ - public final static class RecordAppendResult { + public static final class RecordAppendResult { public final FutureRecordMetadata future; public final boolean batchIsFull; public final boolean newBatchCreated; @@ -1243,7 +1243,7 @@ public interface AppendCallbacks extends Callback { /* * The set of nodes that have at least one complete record batch in the accumulator */ - public final static class ReadyCheckResult { + public static final class ReadyCheckResult { public final Set readyNodes; public final long nextReadyCheckDelayMs; public final Set unknownLeaderTopics; @@ -1271,9 +1271,9 @@ public TopicInfo(LogContext logContext, String topic, int stickyBatchSize) { * Node latency stats for each node that are used for adaptive partition distribution * Visible for testing */ - public final static class NodeLatencyStats { - volatile public long readyTimeMs; // last time the node had batches ready to send - volatile public long drainTimeMs; // last time the node was able to drain batches + public static final class NodeLatencyStats { + public volatile long readyTimeMs; // last time the node had batches ready to send + public volatile long drainTimeMs; // last time the node was able to drain batches NodeLatencyStats(long nowMs) { readyTimeMs = nowMs; 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 f13d13c5d81b9..4880f1b05e814 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 @@ -30,7 +30,7 @@ public class SenderMetricsRegistry { - final static String TOPIC_METRIC_GROUP_NAME = "producer-topic-metrics"; + static final String TOPIC_METRIC_GROUP_NAME = "producer-topic-metrics"; private final List allTemplates; 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 fab24c5e5e270..6d3eb48a833b2 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 @@ -480,7 +480,7 @@ ProducerIdAndEpoch producerIdAndEpoch() { return producerIdAndEpoch; } - synchronized public void maybeUpdateProducerIdAndEpoch(TopicPartition topicPartition) { + public synchronized void maybeUpdateProducerIdAndEpoch(TopicPartition topicPartition) { if (hasFatalError()) { log.debug("Ignoring producer ID and epoch update request since the producer is in fatal error state"); return; diff --git a/clients/src/main/java/org/apache/kafka/common/ConsumerGroupState.java b/clients/src/main/java/org/apache/kafka/common/ConsumerGroupState.java index e44e7c64017f8..28dea471599b6 100644 --- a/clients/src/main/java/org/apache/kafka/common/ConsumerGroupState.java +++ b/clients/src/main/java/org/apache/kafka/common/ConsumerGroupState.java @@ -36,7 +36,7 @@ public enum ConsumerGroupState { ASSIGNING("Assigning"), RECONCILING("Reconciling"); - private final static Map NAME_TO_ENUM = Arrays.stream(values()) + private static final Map NAME_TO_ENUM = Arrays.stream(values()) .collect(Collectors.toMap(state -> state.name.toUpperCase(Locale.ROOT), Function.identity())); private final String name; diff --git a/clients/src/main/java/org/apache/kafka/common/GroupType.java b/clients/src/main/java/org/apache/kafka/common/GroupType.java index c23f845037ff9..10bb1fc348bb9 100644 --- a/clients/src/main/java/org/apache/kafka/common/GroupType.java +++ b/clients/src/main/java/org/apache/kafka/common/GroupType.java @@ -27,7 +27,7 @@ public enum GroupType { CONSUMER("Consumer"), CLASSIC("Classic"); - private final static Map NAME_TO_ENUM = Arrays.stream(values()) + private static final Map NAME_TO_ENUM = Arrays.stream(values()) .collect(Collectors.toMap(type -> type.name.toLowerCase(Locale.ROOT), Function.identity())); private final String name; diff --git a/clients/src/main/java/org/apache/kafka/common/KafkaException.java b/clients/src/main/java/org/apache/kafka/common/KafkaException.java index 7a20691210b5e..b77c96e4826ad 100644 --- a/clients/src/main/java/org/apache/kafka/common/KafkaException.java +++ b/clients/src/main/java/org/apache/kafka/common/KafkaException.java @@ -21,7 +21,7 @@ */ public class KafkaException extends RuntimeException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public KafkaException(String message, Throwable cause) { super(message, cause); diff --git a/clients/src/main/java/org/apache/kafka/common/KafkaFuture.java b/clients/src/main/java/org/apache/kafka/common/KafkaFuture.java index 74448a939789f..a70afa8a3d78a 100644 --- a/clients/src/main/java/org/apache/kafka/common/KafkaFuture.java +++ b/clients/src/main/java/org/apache/kafka/common/KafkaFuture.java @@ -53,7 +53,7 @@ public interface BaseFunction { * @deprecated Since Kafka 3.0. Use the {@link BaseFunction} functional interface. */ @Deprecated - public static abstract class Function implements BaseFunction { } + public abstract static class Function implements BaseFunction { } /** * A consumer of two different types of object. diff --git a/clients/src/main/java/org/apache/kafka/common/acl/AclOperation.java b/clients/src/main/java/org/apache/kafka/common/acl/AclOperation.java index 19f4edaaa7187..875d7a8f7f83f 100644 --- a/clients/src/main/java/org/apache/kafka/common/acl/AclOperation.java +++ b/clients/src/main/java/org/apache/kafka/common/acl/AclOperation.java @@ -121,7 +121,7 @@ public enum AclOperation { // Note: we cannot have more than 30 ACL operations without modifying the format used // to describe ACL operations in MetadataResponse. - private final static HashMap CODE_TO_VALUE = new HashMap<>(); + private static final HashMap CODE_TO_VALUE = new HashMap<>(); static { for (AclOperation operation : AclOperation.values()) { diff --git a/clients/src/main/java/org/apache/kafka/common/acl/AclPermissionType.java b/clients/src/main/java/org/apache/kafka/common/acl/AclPermissionType.java index c5b077c286d67..a0beab9f2d0b3 100644 --- a/clients/src/main/java/org/apache/kafka/common/acl/AclPermissionType.java +++ b/clients/src/main/java/org/apache/kafka/common/acl/AclPermissionType.java @@ -50,7 +50,7 @@ public enum AclPermissionType { */ ALLOW((byte) 3); - private final static HashMap CODE_TO_VALUE = new HashMap<>(); + private static final HashMap CODE_TO_VALUE = new HashMap<>(); static { for (AclPermissionType permissionType : AclPermissionType.values()) { diff --git a/clients/src/main/java/org/apache/kafka/common/config/internals/BrokerSecurityConfigs.java b/clients/src/main/java/org/apache/kafka/common/config/internals/BrokerSecurityConfigs.java index 791a4602cf0f1..3f7b1ca985823 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/internals/BrokerSecurityConfigs.java +++ b/clients/src/main/java/org/apache/kafka/common/config/internals/BrokerSecurityConfigs.java @@ -107,7 +107,7 @@ public class BrokerSecurityConfigs { public static final String SSL_ALLOW_SAN_CHANGES_DOC = "Indicates whether changes to the certificate subject alternative names should be allowed during " + "a dynamic reconfiguration of certificates or not."; - public final static String SASL_MECHANISM_INTER_BROKER_PROTOCOL_CONFIG = "sasl.mechanism.inter.broker.protocol"; - public final static String SASL_MECHANISM_INTER_BROKER_PROTOCOL_DOC = "SASL mechanism used for inter-broker communication. Default is GSSAPI."; + public static final String SASL_MECHANISM_INTER_BROKER_PROTOCOL_CONFIG = "sasl.mechanism.inter.broker.protocol"; + public static final String SASL_MECHANISM_INTER_BROKER_PROTOCOL_DOC = "SASL mechanism used for inter-broker communication. Default is GSSAPI."; } diff --git a/clients/src/main/java/org/apache/kafka/common/errors/TransactionAbortedException.java b/clients/src/main/java/org/apache/kafka/common/errors/TransactionAbortedException.java index c394ac5e6a76a..f61b69559c8b5 100644 --- a/clients/src/main/java/org/apache/kafka/common/errors/TransactionAbortedException.java +++ b/clients/src/main/java/org/apache/kafka/common/errors/TransactionAbortedException.java @@ -22,7 +22,7 @@ */ public class TransactionAbortedException extends ApiException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public TransactionAbortedException(String message, Throwable cause) { super(message, cause); diff --git a/clients/src/main/java/org/apache/kafka/common/internals/FatalExitError.java b/clients/src/main/java/org/apache/kafka/common/internals/FatalExitError.java index 901af45a54dd0..3227eb0262c65 100644 --- a/clients/src/main/java/org/apache/kafka/common/internals/FatalExitError.java +++ b/clients/src/main/java/org/apache/kafka/common/internals/FatalExitError.java @@ -27,7 +27,7 @@ */ public class FatalExitError extends Error { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; private final int statusCode; diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/types/Schema.java b/clients/src/main/java/org/apache/kafka/common/protocol/types/Schema.java index 7e82e10f2da24..9c3dd945bcfc5 100644 --- a/clients/src/main/java/org/apache/kafka/common/protocol/types/Schema.java +++ b/clients/src/main/java/org/apache/kafka/common/protocol/types/Schema.java @@ -25,7 +25,7 @@ * The schema for a compound record definition */ public class Schema extends Type { - private final static Object[] NO_VALUES = new Object[0]; + private static final Object[] NO_VALUES = new Object[0]; private final BoundField[] fields; private final Map fieldsByName; @@ -229,7 +229,7 @@ private static void handleNode(Type node, Visitor visitor) { /** * Override one or more of the visit methods with the desired logic. */ - public static abstract class Visitor { + public abstract static class Visitor { public void visit(Schema schema) {} public void visit(Type field) {} } diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java b/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java index c5dd2e2c10ec5..b17db545fe620 100644 --- a/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java +++ b/clients/src/main/java/org/apache/kafka/common/protocol/types/Type.java @@ -82,7 +82,7 @@ public final boolean isArray() { /** * A Type that can return its description for documentation purposes. */ - public static abstract class DocumentedType extends Type { + public abstract static class DocumentedType extends Type { /** * Short name of the type to identify it in documentation; 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 c5b43d4f88565..c26f2f01fc723 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 @@ -350,7 +350,7 @@ public int hashCode() { return buffer.hashCode(); } - public static abstract class RecordFilter { + public abstract static class RecordFilter { public final long currentTime; public final long deleteRetentionMs; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java index f4c7f5dbcf6e3..e2fc69e3bffdd 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java @@ -51,7 +51,7 @@ public static Type fromByte(byte type) { public static final long UNKNOWN_BROKER_EPOCH = -1L; - public static abstract class Builder extends AbstractRequest.Builder { + public abstract static class Builder extends AbstractRequest.Builder { protected final int controllerId; protected final int controllerEpoch; protected final long brokerEpoch; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/AbstractRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/AbstractRequest.java index b51221f5af642..2d47e0188a9a0 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/AbstractRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/AbstractRequest.java @@ -29,7 +29,7 @@ public abstract class AbstractRequest implements AbstractRequestResponse { - public static abstract class Builder { + public abstract static class Builder { private final ApiKeys apiKey; private final short oldestAllowedVersion; private final short latestAllowedVersion; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/DescribeLogDirsResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/DescribeLogDirsResponse.java index cbf3054217363..d5ec47383a59d 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/DescribeLogDirsResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/DescribeLogDirsResponse.java @@ -82,7 +82,7 @@ public static DescribeLogDirsResponse parse(ByteBuffer buffer, short version) { * class {@link org.apache.kafka.clients.admin.LogDirDescription}. */ @Deprecated - static public class LogDirInfo { + public static class LogDirInfo { public final Errors error; public final Map replicaInfos; @@ -112,7 +112,7 @@ public String toString() { * class {@link org.apache.kafka.clients.admin.ReplicaInfo}. */ @Deprecated - static public class ReplicaInfo { + public static class ReplicaInfo { public final long size; public final long offsetLag; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/FetchSnapshotRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/FetchSnapshotRequest.java index 34db2d1c12419..0b9291e401c8e 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/FetchSnapshotRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/FetchSnapshotRequest.java @@ -28,7 +28,7 @@ import java.util.Optional; import java.util.function.UnaryOperator; -final public class FetchSnapshotRequest extends AbstractRequest { +public final class FetchSnapshotRequest extends AbstractRequest { private final FetchSnapshotRequestData data; public FetchSnapshotRequest(FetchSnapshotRequestData data, short version) { diff --git a/clients/src/main/java/org/apache/kafka/common/requests/FetchSnapshotResponse.java b/clients/src/main/java/org/apache/kafka/common/requests/FetchSnapshotResponse.java index c86ba9cfc6616..3edd7c0a8cd46 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/FetchSnapshotResponse.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/FetchSnapshotResponse.java @@ -29,7 +29,7 @@ import java.util.Optional; import java.util.function.UnaryOperator; -final public class FetchSnapshotResponse extends AbstractResponse { +public final class FetchSnapshotResponse extends AbstractResponse { private final FetchSnapshotResponseData data; public FetchSnapshotResponse(FetchSnapshotResponseData data) { diff --git a/clients/src/main/java/org/apache/kafka/common/requests/RequestHeader.java b/clients/src/main/java/org/apache/kafka/common/requests/RequestHeader.java index 291e4d28dd539..5bcce29a888ae 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/RequestHeader.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/RequestHeader.java @@ -30,7 +30,7 @@ * The header for a request in the Kafka protocol */ public class RequestHeader implements AbstractRequestResponse { - private final static int SIZE_NOT_INITIALIZED = -1; + private static final int SIZE_NOT_INITIALIZED = -1; private final RequestHeaderData data; private final short headerVersion; private int size = SIZE_NOT_INITIALIZED; diff --git a/clients/src/main/java/org/apache/kafka/common/requests/ResponseHeader.java b/clients/src/main/java/org/apache/kafka/common/requests/ResponseHeader.java index f1abdc0f5e986..fe11c8cbdee01 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/ResponseHeader.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/ResponseHeader.java @@ -27,7 +27,7 @@ * A response header in the kafka protocol. */ public class ResponseHeader implements AbstractRequestResponse { - private final static int SIZE_NOT_INITIALIZED = -1; + private static final int SIZE_NOT_INITIALIZED = -1; private final ResponseHeaderData data; private final short headerVersion; private int size = SIZE_NOT_INITIALIZED; diff --git a/clients/src/main/java/org/apache/kafka/common/resource/PatternType.java b/clients/src/main/java/org/apache/kafka/common/resource/PatternType.java index 0c05a0b0466b4..e9c7da65c5782 100644 --- a/clients/src/main/java/org/apache/kafka/common/resource/PatternType.java +++ b/clients/src/main/java/org/apache/kafka/common/resource/PatternType.java @@ -69,13 +69,13 @@ public enum PatternType { */ PREFIXED((byte) 4); - private final static Map CODE_TO_VALUE = + private static final Map CODE_TO_VALUE = Collections.unmodifiableMap( Arrays.stream(PatternType.values()) .collect(Collectors.toMap(PatternType::code, Function.identity())) ); - private final static Map NAME_TO_VALUE = + private static final Map NAME_TO_VALUE = Collections.unmodifiableMap( Arrays.stream(PatternType.values()) .collect(Collectors.toMap(PatternType::name, Function.identity())) diff --git a/clients/src/main/java/org/apache/kafka/common/resource/Resource.java b/clients/src/main/java/org/apache/kafka/common/resource/Resource.java index 3c1cb83fbad8a..571ec6481e8fc 100644 --- a/clients/src/main/java/org/apache/kafka/common/resource/Resource.java +++ b/clients/src/main/java/org/apache/kafka/common/resource/Resource.java @@ -34,12 +34,12 @@ public class Resource { /** * The name of the CLUSTER resource. */ - public final static String CLUSTER_NAME = "kafka-cluster"; + public static final String CLUSTER_NAME = "kafka-cluster"; /** * A resource representing the whole cluster. */ - public final static Resource CLUSTER = new Resource(ResourceType.CLUSTER, CLUSTER_NAME); + public static final Resource CLUSTER = new Resource(ResourceType.CLUSTER, CLUSTER_NAME); /** * Create an instance of this class with the provided parameters. diff --git a/clients/src/main/java/org/apache/kafka/common/resource/ResourceType.java b/clients/src/main/java/org/apache/kafka/common/resource/ResourceType.java index 225859812d449..b31ca852427ec 100644 --- a/clients/src/main/java/org/apache/kafka/common/resource/ResourceType.java +++ b/clients/src/main/java/org/apache/kafka/common/resource/ResourceType.java @@ -70,7 +70,7 @@ public enum ResourceType { */ USER((byte) 7); - private final static HashMap CODE_TO_VALUE = new HashMap<>(); + private static final HashMap CODE_TO_VALUE = new HashMap<>(); static { for (ResourceType resourceType : ResourceType.values()) { 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 8b83e323588c1..279bc091192d8 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 @@ -42,7 +42,7 @@ */ public class KafkaPrincipal implements Principal { public static final String USER_TYPE = "User"; - public final static KafkaPrincipal ANONYMOUS = new KafkaPrincipal(KafkaPrincipal.USER_TYPE, "ANONYMOUS"); + public static final KafkaPrincipal ANONYMOUS = new KafkaPrincipal(KafkaPrincipal.USER_TYPE, "ANONYMOUS"); private final String principalType; private final String name; diff --git a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramMessages.java b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramMessages.java index 8532d73fca4ee..7b366157a0cb7 100644 --- a/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramMessages.java +++ b/clients/src/main/java/org/apache/kafka/common/security/scram/internals/ScramMessages.java @@ -33,7 +33,7 @@ */ public class ScramMessages { - static abstract class AbstractScramMessage { + abstract static class AbstractScramMessage { static final String ALPHA = "[A-Za-z]+"; static final String VALUE_SAFE = "[\\x01-\\x7F&&[^=,]]+"; 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 16f94b757061a..3b82813f2c16f 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 @@ -112,9 +112,9 @@ public TrustManager[] getTrustManagers() { */ static class CommonNameLoggingTrustManager implements X509TrustManager { - final private X509TrustManager origTm; + private final X509TrustManager origTm; final int nrOfRememberedBadCerts; - final private LinkedHashMap previouslyRejectedClientCertChains; + private final LinkedHashMap previouslyRejectedClientCertChains; public CommonNameLoggingTrustManager(X509TrustManager originalTrustManager, int nrOfRememberedBadCerts) { this.origTm = originalTrustManager; diff --git a/clients/src/main/java/org/apache/kafka/common/serialization/Serdes.java b/clients/src/main/java/org/apache/kafka/common/serialization/Serdes.java index cae8bd1187a07..600d046a61c3b 100644 --- a/clients/src/main/java/org/apache/kafka/common/serialization/Serdes.java +++ b/clients/src/main/java/org/apache/kafka/common/serialization/Serdes.java @@ -28,9 +28,9 @@ */ public class Serdes { - static public class WrapperSerde implements Serde { - final private Serializer serializer; - final private Deserializer deserializer; + public static class WrapperSerde implements Serde { + private final Serializer serializer; + private final Deserializer deserializer; public WrapperSerde(Serializer serializer, Deserializer deserializer) { this.serializer = serializer; @@ -60,81 +60,81 @@ public Deserializer deserializer() { } } - static public final class VoidSerde extends WrapperSerde { + public static final class VoidSerde extends WrapperSerde { public VoidSerde() { super(new VoidSerializer(), new VoidDeserializer()); } } - static public final class LongSerde extends WrapperSerde { + public static final class LongSerde extends WrapperSerde { public LongSerde() { super(new LongSerializer(), new LongDeserializer()); } } - static public final class IntegerSerde extends WrapperSerde { + public static final class IntegerSerde extends WrapperSerde { public IntegerSerde() { super(new IntegerSerializer(), new IntegerDeserializer()); } } - static public final class ShortSerde extends WrapperSerde { + public static final class ShortSerde extends WrapperSerde { public ShortSerde() { super(new ShortSerializer(), new ShortDeserializer()); } } - static public final class FloatSerde extends WrapperSerde { + public static final class FloatSerde extends WrapperSerde { public FloatSerde() { super(new FloatSerializer(), new FloatDeserializer()); } } - static public final class DoubleSerde extends WrapperSerde { + public static final class DoubleSerde extends WrapperSerde { public DoubleSerde() { super(new DoubleSerializer(), new DoubleDeserializer()); } } - static public final class StringSerde extends WrapperSerde { + public static final class StringSerde extends WrapperSerde { public StringSerde() { super(new StringSerializer(), new StringDeserializer()); } } - static public final class ByteBufferSerde extends WrapperSerde { + public static final class ByteBufferSerde extends WrapperSerde { public ByteBufferSerde() { super(new ByteBufferSerializer(), new ByteBufferDeserializer()); } } - static public final class BytesSerde extends WrapperSerde { + public static final class BytesSerde extends WrapperSerde { public BytesSerde() { super(new BytesSerializer(), new BytesDeserializer()); } } - static public final class ByteArraySerde extends WrapperSerde { + public static final class ByteArraySerde extends WrapperSerde { public ByteArraySerde() { super(new ByteArraySerializer(), new ByteArrayDeserializer()); } } - static public final class UUIDSerde extends WrapperSerde { + public static final class UUIDSerde extends WrapperSerde { public UUIDSerde() { super(new UUIDSerializer(), new UUIDDeserializer()); } } - static public final class BooleanSerde extends WrapperSerde { + public static final class BooleanSerde extends WrapperSerde { public BooleanSerde() { super(new BooleanSerializer(), new BooleanDeserializer()); } } - static public final class ListSerde extends WrapperSerde> { + public static final class ListSerde extends WrapperSerde> { - final static int NULL_ENTRY_VALUE = -1; + static final int NULL_ENTRY_VALUE = -1; enum SerializationStrategy { CONSTANT_SIZE, @@ -154,7 +154,7 @@ public > ListSerde(Class listClass, Serde serde) } @SuppressWarnings("unchecked") - static public Serde serdeFrom(Class type) { + public static Serde serdeFrom(Class type) { if (String.class.isAssignableFrom(type)) { return (Serde) String(); } @@ -210,7 +210,7 @@ static public Serde serdeFrom(Class type) { * @param serializer must not be null. * @param deserializer must not be null. */ - static public Serde serdeFrom(final Serializer serializer, final Deserializer deserializer) { + public static Serde serdeFrom(final Serializer serializer, final Deserializer deserializer) { if (serializer == null) { throw new IllegalArgumentException("serializer must not be null"); } @@ -224,91 +224,91 @@ static public Serde serdeFrom(final Serializer serializer, final Deser /** * A serde for nullable {@code Long} type. */ - static public Serde Long() { + public static Serde Long() { return new LongSerde(); } /** * A serde for nullable {@code Integer} type. */ - static public Serde Integer() { + public static Serde Integer() { return new IntegerSerde(); } /** * A serde for nullable {@code Short} type. */ - static public Serde Short() { + public static Serde Short() { return new ShortSerde(); } /** * A serde for nullable {@code Float} type. */ - static public Serde Float() { + public static Serde Float() { return new FloatSerde(); } /** * A serde for nullable {@code Double} type. */ - static public Serde Double() { + public static Serde Double() { return new DoubleSerde(); } /** * A serde for nullable {@code String} type. */ - static public Serde String() { + public static Serde String() { return new StringSerde(); } /** * A serde for nullable {@code ByteBuffer} type. */ - static public Serde ByteBuffer() { + public static Serde ByteBuffer() { return new ByteBufferSerde(); } /** * A serde for nullable {@code Bytes} type. */ - static public Serde Bytes() { + public static Serde Bytes() { return new BytesSerde(); } /** * A serde for nullable {@code UUID} type */ - static public Serde UUID() { + public static Serde UUID() { return new UUIDSerde(); } /** * A serde for nullable {@code Boolean} type. */ - static public Serde Boolean() { + public static Serde Boolean() { return new BooleanSerde(); } /** * A serde for nullable {@code byte[]} type. */ - static public Serde ByteArray() { + public static Serde ByteArray() { return new ByteArraySerde(); } /** * A serde for {@code Void} type. */ - static public Serde Void() { + public static Serde Void() { return new VoidSerde(); } /* * A serde for {@code List} type */ - static public , Inner> Serde> ListSerde(Class listClass, Serde innerSerde) { + public static , Inner> Serde> ListSerde(Class listClass, Serde innerSerde) { return new ListSerde<>(listClass, innerSerde); } diff --git a/clients/src/main/java/org/apache/kafka/common/telemetry/ClientTelemetryState.java b/clients/src/main/java/org/apache/kafka/common/telemetry/ClientTelemetryState.java index 7dbb270394725..2989cafe93452 100644 --- a/clients/src/main/java/org/apache/kafka/common/telemetry/ClientTelemetryState.java +++ b/clients/src/main/java/org/apache/kafka/common/telemetry/ClientTelemetryState.java @@ -65,7 +65,7 @@ public enum ClientTelemetryState { */ TERMINATED; - private final static Map> VALID_NEXT_STATES = new EnumMap<>(ClientTelemetryState.class); + private static final Map> VALID_NEXT_STATES = new EnumMap<>(ClientTelemetryState.class); static { /* 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 9911a00a2f9f9..d2a7bc8960c4f 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 @@ -43,11 +43,11 @@ public class ClientTelemetryUtils { - private final static Logger log = LoggerFactory.getLogger(ClientTelemetryUtils.class); + private static final Logger log = LoggerFactory.getLogger(ClientTelemetryUtils.class); - public final static Predicate SELECTOR_NO_METRICS = k -> false; + public static final Predicate SELECTOR_NO_METRICS = k -> false; - public final static Predicate SELECTOR_ALL_METRICS = k -> true; + public static final Predicate SELECTOR_ALL_METRICS = k -> true; /** * Examine the response data and handle different error code accordingly: diff --git a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/TelemetryMetricNamingConvention.java b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/TelemetryMetricNamingConvention.java index 89028508b5793..9e6dbc0c559ab 100644 --- a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/TelemetryMetricNamingConvention.java +++ b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/TelemetryMetricNamingConvention.java @@ -36,7 +36,7 @@ public class TelemetryMetricNamingConvention { private static final String TAG_JOINER = "_"; // remove metrics as it is redundant for telemetry metrics naming convention - private final static Pattern GROUP_PATTERN = Pattern.compile("\\.(metrics)"); + private static final Pattern GROUP_PATTERN = Pattern.compile("\\.(metrics)"); public static MetricNamingStrategy getClientTelemetryMetricNamingStrategy(String prefix) { Objects.requireNonNull(prefix, "prefix cannot be null"); diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Bytes.java b/clients/src/main/java/org/apache/kafka/common/utils/Bytes.java index df754596a1940..5955312dbb086 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/Bytes.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/Bytes.java @@ -169,7 +169,7 @@ public static Bytes increment(Bytes input) throws IndexOutOfBoundsException { /** * A byte array comparator based on lexicograpic ordering. */ - public final static ByteArrayComparator BYTES_LEXICO_COMPARATOR = new LexicographicByteArrayComparator(); + public static final ByteArrayComparator BYTES_LEXICO_COMPARATOR = new LexicographicByteArrayComparator(); public interface ByteArrayComparator extends Comparator, Serializable { diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ChildFirstClassLoader.java b/clients/src/main/java/org/apache/kafka/common/utils/ChildFirstClassLoader.java index 85e865e098307..ce1680b62a7fe 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/ChildFirstClassLoader.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/ChildFirstClassLoader.java @@ -45,7 +45,7 @@ public ChildFirstClassLoader(String classPath, ClassLoader parent) { super(classpathToURLs(classPath), parent); } - static private URL[] classpathToURLs(String classPath) { + private static URL[] classpathToURLs(String classPath) { ArrayList urls = new ArrayList<>(); for (String path : classPath.split(File.pathSeparator)) { if (path == null || path.trim().isEmpty()) diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Exit.java b/clients/src/main/java/org/apache/kafka/common/utils/Exit.java index 1ef1ee15b5bf9..8af759f9b08f1 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/Exit.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/Exit.java @@ -51,9 +51,9 @@ public interface ShutdownHookAdder { throw new IllegalStateException("Exit called after resetting procedures; possible race condition present in test"); }; - private volatile static Procedure exitProcedure = DEFAULT_EXIT_PROCEDURE; - private volatile static Procedure haltProcedure = DEFAULT_HALT_PROCEDURE; - private volatile static ShutdownHookAdder shutdownHookAdder = DEFAULT_SHUTDOWN_HOOK_ADDER; + private static volatile Procedure exitProcedure = DEFAULT_EXIT_PROCEDURE; + private static volatile Procedure haltProcedure = DEFAULT_HALT_PROCEDURE; + private static volatile ShutdownHookAdder shutdownHookAdder = DEFAULT_SHUTDOWN_HOOK_ADDER; public static void exit(int statusCode) { exit(statusCode, null); diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java index 100d524d34afd..524b20b71887d 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java @@ -297,7 +297,7 @@ public void clear() { * remove on the iterator itself, of course.) */ @Override - final public Iterator iterator() { + public final Iterator iterator() { return listIterator(0); } @@ -345,7 +345,7 @@ private int findIndexOfEqualElement(Object key) { * @param key The element to match. * @return The matching element, or null if there were none. */ - final public E find(E key) { + public final E find(E key) { int index = findIndexOfEqualElement(key); if (index == INVALID_INDEX) { return null; @@ -359,7 +359,7 @@ final public E find(E key) { * Returns the number of elements in the set. */ @Override - final public int size() { + public final int size() { return size; } @@ -370,7 +370,7 @@ final public int size() { * @param key The object to try to match. */ @Override - final public boolean contains(Object key) { + public final boolean contains(Object key) { return findIndexOfEqualElement(key) != INVALID_INDEX; } @@ -390,7 +390,7 @@ private static int calculateCapacity(int expectedNumElements) { * false if it was not, because there was an existing equal element. */ @Override - final public boolean add(E newElement) { + public final boolean add(E newElement) { if (newElement == null) { return false; } @@ -409,7 +409,7 @@ final public boolean add(E newElement) { return false; } - final public void mustAdd(E newElement) { + public final void mustAdd(E newElement) { if (!add(newElement)) { throw new RuntimeException("Unable to add " + newElement); } @@ -462,7 +462,7 @@ private void changeCapacity(int newCapacity) { * @return True if an element was removed; false otherwise. */ @Override - final public boolean remove(Object key) { + public final boolean remove(Object key) { int slot = findElementToRemove(key); if (slot == INVALID_INDEX) { return false; @@ -565,7 +565,7 @@ public ImplicitLinkedHashCollection(Iterator iter) { * Removes all of the elements from this set. */ @Override - final public void clear() { + public final void clear() { clear(elements.length); } @@ -573,7 +573,7 @@ final public void clear() { * Moves an element which is already in the collection so that it comes last * in iteration order. */ - final public void moveToEnd(E element) { + public final void moveToEnd(E element) { if (element.prev() == INVALID_INDEX || element.next() == INVALID_INDEX) { throw new RuntimeException("Element " + element + " is not in the collection."); } @@ -589,7 +589,7 @@ final public void moveToEnd(E element) { * Removes all of the elements from this set, and resets the set capacity * based on the provided expected number of elements. */ - final public void clear(int expectedNumElements) { + public final void clear(int expectedNumElements) { if (expectedNumElements == 0) { // Optimize away object allocations for empty sets. this.head = HeadElement.EMPTY; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollection.java b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollection.java index 534bb588c1ff7..6e0d28adb4ca9 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollection.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollection.java @@ -119,7 +119,7 @@ int findElementToRemove(Object key) { * * @return All of the matching elements. */ - final public List findAll(E key) { + public final List findAll(E key) { if (key == null || size() == 0) { return Collections.emptyList(); } diff --git a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java b/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java index 774961fa418f3..10acf32ccd47f 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/LogContext.java @@ -55,7 +55,7 @@ public String logPrefix() { return logPrefix; } - private static abstract class AbstractKafkaLogger implements Logger { + private abstract static class AbstractKafkaLogger implements Logger { private final String prefix; protected AbstractKafkaLogger(final String prefix) { diff --git a/clients/src/main/java/org/apache/kafka/common/utils/PureJavaCrc32C.java b/clients/src/main/java/org/apache/kafka/common/utils/PureJavaCrc32C.java index e78b83ee91c83..fb96901b309de 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/PureJavaCrc32C.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/PureJavaCrc32C.java @@ -103,7 +103,7 @@ public void update(byte[] b, int off, int len) { } @Override - final public void update(int b) { + public final void update(int b) { crc = (crc >>> 8) ^ T[T8_0_START + ((crc ^ b) & 0xff)]; } 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 72079f5a6201d..8cf8e2f188f39 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 @@ -32,7 +32,7 @@ * Shell can be used to run unix commands like du or * df. */ -abstract public class Shell { +public abstract class Shell { private static final Logger LOG = LoggerFactory.getLogger(Shell.class); 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 6cbc86cb0dd96..fc53304afde19 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 @@ -273,7 +273,7 @@ public void addTopic(boolean internal, addTopic(internal, name, partitions, configs, true); } - synchronized public void addTopic(boolean internal, + public synchronized void addTopic(boolean internal, String name, List partitions, Map configs, @@ -309,7 +309,7 @@ synchronized public void addTopic(boolean internal, allTopics.put(name, new TopicMetadata(topicId, internal, partitions, logDirs, configs)); } - synchronized public void markTopicForDeletion(final String name) { + public synchronized void markTopicForDeletion(final String name) { if (!allTopics.containsKey(name)) { throw new IllegalArgumentException(String.format("Topic %s did not exist.", name)); } @@ -317,12 +317,12 @@ synchronized public void markTopicForDeletion(final String name) { allTopics.get(name).markedForDeletion = true; } - synchronized public void timeoutNextRequest(int numberOfRequest) { + public synchronized void timeoutNextRequest(int numberOfRequest) { timeoutNextRequests = numberOfRequest; } @Override - synchronized public DescribeClusterResult describeCluster(DescribeClusterOptions options) { + public synchronized DescribeClusterResult describeCluster(DescribeClusterOptions options) { KafkaFutureImpl> nodesFuture = new KafkaFutureImpl<>(); KafkaFutureImpl controllerFuture = new KafkaFutureImpl<>(); KafkaFutureImpl brokerIdFuture = new KafkaFutureImpl<>(); @@ -345,7 +345,7 @@ synchronized public DescribeClusterResult describeCluster(DescribeClusterOptions } @Override - synchronized public CreateTopicsResult createTopics(Collection newTopics, CreateTopicsOptions options) { + public synchronized CreateTopicsResult createTopics(Collection newTopics, CreateTopicsOptions options) { Map> createTopicResult = new HashMap<>(); if (timeoutNextRequests > 0) { @@ -419,7 +419,7 @@ private static Config config(NewTopic newTopic) { } @Override - synchronized public ListTopicsResult listTopics(ListTopicsOptions options) { + public synchronized ListTopicsResult listTopics(ListTopicsOptions options) { Map topicListings = new HashMap<>(); if (timeoutNextRequests > 0) { @@ -445,7 +445,7 @@ synchronized public ListTopicsResult listTopics(ListTopicsOptions options) { } @Override - synchronized public DescribeTopicsResult describeTopics(TopicCollection topics, DescribeTopicsOptions options) { + public synchronized DescribeTopicsResult describeTopics(TopicCollection topics, DescribeTopicsOptions options) { if (topics instanceof TopicIdCollection) return DescribeTopicsResult.ofTopicIds(new HashMap<>(handleDescribeTopicsUsingIds(((TopicIdCollection) topics).topicIds(), options))); else if (topics instanceof TopicNameCollection) @@ -494,7 +494,7 @@ private Map> handleDescribeTopicsByNames(C return topicDescriptions; } - synchronized public Map> handleDescribeTopicsUsingIds(Collection topicIds, DescribeTopicsOptions options) { + public synchronized Map> handleDescribeTopicsUsingIds(Collection topicIds, DescribeTopicsOptions options) { Map> topicDescriptions = new HashMap<>(); @@ -537,7 +537,7 @@ synchronized public Map> handleDescribeTopi } @Override - synchronized public DeleteTopicsResult deleteTopics(TopicCollection topics, DeleteTopicsOptions options) { + public synchronized DeleteTopicsResult deleteTopics(TopicCollection topics, DeleteTopicsOptions options) { DeleteTopicsResult result; if (topics instanceof TopicIdCollection) result = DeleteTopicsResult.ofTopicIds(new HashMap<>(handleDeleteTopicsUsingIds(((TopicIdCollection) topics).topicIds(), options))); @@ -608,12 +608,12 @@ private Map> handleDeleteTopicsUsingIds(Collection } @Override - synchronized public CreatePartitionsResult createPartitions(Map newPartitions, CreatePartitionsOptions options) { + public synchronized CreatePartitionsResult createPartitions(Map newPartitions, CreatePartitionsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DeleteRecordsResult deleteRecords(Map recordsToDelete, DeleteRecordsOptions options) { + public synchronized DeleteRecordsResult deleteRecords(Map recordsToDelete, DeleteRecordsOptions options) { Map> deletedRecordsResult = new HashMap<>(); if (recordsToDelete.isEmpty()) { return new DeleteRecordsResult(deletedRecordsResult); @@ -623,7 +623,7 @@ synchronized public DeleteRecordsResult deleteRecords(Map future = new KafkaFutureImpl<>(); for (KafkaPrincipal renewer : options.renewers()) { @@ -643,7 +643,7 @@ synchronized public CreateDelegationTokenResult createDelegationToken(CreateDele } @Override - synchronized public RenewDelegationTokenResult renewDelegationToken(byte[] hmac, RenewDelegationTokenOptions options) { + public synchronized RenewDelegationTokenResult renewDelegationToken(byte[] hmac, RenewDelegationTokenOptions options) { KafkaFutureImpl future = new KafkaFutureImpl<>(); Boolean tokenFound = false; @@ -665,7 +665,7 @@ synchronized public RenewDelegationTokenResult renewDelegationToken(byte[] hmac, } @Override - synchronized public ExpireDelegationTokenResult expireDelegationToken(byte[] hmac, ExpireDelegationTokenOptions options) { + public synchronized ExpireDelegationTokenResult expireDelegationToken(byte[] hmac, ExpireDelegationTokenOptions options) { KafkaFutureImpl future = new KafkaFutureImpl<>(); Long expiryTimestamp = options.expiryTimePeriodMs(); @@ -691,7 +691,7 @@ synchronized public ExpireDelegationTokenResult expireDelegationToken(byte[] hma } @Override - synchronized public DescribeDelegationTokenResult describeDelegationToken(DescribeDelegationTokenOptions options) { + public synchronized DescribeDelegationTokenResult describeDelegationToken(DescribeDelegationTokenOptions options) { KafkaFutureImpl> future = new KafkaFutureImpl<>(); if (options.owners().isEmpty()) { @@ -710,17 +710,17 @@ synchronized public DescribeDelegationTokenResult describeDelegationToken(Descri } @Override - synchronized public DescribeConsumerGroupsResult describeConsumerGroups(Collection groupIds, DescribeConsumerGroupsOptions options) { + public synchronized DescribeConsumerGroupsResult describeConsumerGroups(Collection groupIds, DescribeConsumerGroupsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public ListConsumerGroupsResult listConsumerGroups(ListConsumerGroupsOptions options) { + public synchronized ListConsumerGroupsResult listConsumerGroups(ListConsumerGroupsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public ListConsumerGroupOffsetsResult listConsumerGroupOffsets(Map groupSpecs, ListConsumerGroupOffsetsOptions options) { + public synchronized ListConsumerGroupOffsetsResult listConsumerGroupOffsets(Map groupSpecs, ListConsumerGroupOffsetsOptions options) { // ignoring the groups and assume one test would only work on one group only if (groupSpecs.size() != 1) throw new UnsupportedOperationException("Not implemented yet"); @@ -746,17 +746,17 @@ synchronized public ListConsumerGroupOffsetsResult listConsumerGroupOffsets(Map< } @Override - synchronized public DeleteConsumerGroupsResult deleteConsumerGroups(Collection groupIds, DeleteConsumerGroupsOptions options) { + public synchronized DeleteConsumerGroupsResult deleteConsumerGroups(Collection groupIds, DeleteConsumerGroupsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DeleteConsumerGroupOffsetsResult deleteConsumerGroupOffsets(String groupId, Set partitions, DeleteConsumerGroupOffsetsOptions options) { + public synchronized DeleteConsumerGroupOffsetsResult deleteConsumerGroupOffsets(String groupId, Set partitions, DeleteConsumerGroupOffsetsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public ElectLeadersResult electLeaders( + public synchronized ElectLeadersResult electLeaders( ElectionType electionType, Set partitions, ElectLeadersOptions options) { @@ -764,27 +764,27 @@ synchronized public ElectLeadersResult electLeaders( } @Override - synchronized public RemoveMembersFromConsumerGroupResult removeMembersFromConsumerGroup(String groupId, RemoveMembersFromConsumerGroupOptions options) { + public synchronized RemoveMembersFromConsumerGroupResult removeMembersFromConsumerGroup(String groupId, RemoveMembersFromConsumerGroupOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public CreateAclsResult createAcls(Collection acls, CreateAclsOptions options) { + public synchronized CreateAclsResult createAcls(Collection acls, CreateAclsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DescribeAclsResult describeAcls(AclBindingFilter filter, DescribeAclsOptions options) { + public synchronized DescribeAclsResult describeAcls(AclBindingFilter filter, DescribeAclsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DeleteAclsResult deleteAcls(Collection filters, DeleteAclsOptions options) { + public synchronized DeleteAclsResult deleteAcls(Collection filters, DeleteAclsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DescribeConfigsResult describeConfigs(Collection resources, DescribeConfigsOptions options) { + public synchronized DescribeConfigsResult describeConfigs(Collection resources, DescribeConfigsOptions options) { if (timeoutNextRequests > 0) { Map> configs = new HashMap<>(); @@ -811,7 +811,7 @@ synchronized public DescribeConfigsResult describeConfigs(Collection map) { @Override @Deprecated - synchronized public AlterConfigsResult alterConfigs(Map configs, AlterConfigsOptions options) { + public synchronized AlterConfigsResult alterConfigs(Map configs, AlterConfigsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public AlterConfigsResult incrementalAlterConfigs( + public synchronized AlterConfigsResult incrementalAlterConfigs( Map> configs, AlterConfigsOptions options) { Map> futures = new HashMap<>(); @@ -878,7 +878,7 @@ synchronized public AlterConfigsResult incrementalAlterConfigs( return new AlterConfigsResult(futures); } - synchronized private Throwable handleIncrementalResourceAlteration( + private synchronized Throwable handleIncrementalResourceAlteration( ConfigResource resource, Collection ops) { switch (resource.type()) { case BROKER: { @@ -965,7 +965,7 @@ synchronized private Throwable handleIncrementalResourceAlteration( } @Override - synchronized public AlterReplicaLogDirsResult alterReplicaLogDirs( + public synchronized AlterReplicaLogDirsResult alterReplicaLogDirs( Map replicaAssignment, AlterReplicaLogDirsOptions options) { Map> results = new HashMap<>(); @@ -998,7 +998,7 @@ synchronized public AlterReplicaLogDirsResult alterReplicaLogDirs( } @Override - synchronized public DescribeLogDirsResult describeLogDirs(Collection brokers, + public synchronized DescribeLogDirsResult describeLogDirs(Collection brokers, DescribeLogDirsOptions options) { Map> unwrappedResults = new HashMap<>(); @@ -1040,7 +1040,7 @@ synchronized public DescribeLogDirsResult describeLogDirs(Collection br } @Override - synchronized public DescribeReplicaLogDirsResult describeReplicaLogDirs( + public synchronized DescribeReplicaLogDirsResult describeReplicaLogDirs( Collection replicas, DescribeReplicaLogDirsOptions options) { Map> results = new HashMap<>(); for (TopicPartitionReplica replica : replicas) { @@ -1079,7 +1079,7 @@ private synchronized String currentLogDir(TopicPartitionReplica replica) { } @Override - synchronized public AlterPartitionReassignmentsResult alterPartitionReassignments( + public synchronized AlterPartitionReassignmentsResult alterPartitionReassignments( Map> newReassignments, AlterPartitionReassignmentsOptions options) { Map> futures = new HashMap<>(); @@ -1106,7 +1106,7 @@ synchronized public AlterPartitionReassignmentsResult alterPartitionReassignment } @Override - synchronized public ListPartitionReassignmentsResult listPartitionReassignments( + public synchronized ListPartitionReassignmentsResult listPartitionReassignments( Optional> partitions, ListPartitionReassignmentsOptions options) { Map map = new HashMap<>(); @@ -1120,7 +1120,7 @@ synchronized public ListPartitionReassignmentsResult listPartitionReassignments( return new ListPartitionReassignmentsResult(KafkaFutureImpl.completedFuture(map)); } - synchronized private PartitionReassignment findPartitionReassignment(TopicPartition partition) { + private synchronized PartitionReassignment findPartitionReassignment(TopicPartition partition) { NewPartitionReassignment reassignment = reassignments.get(partition); if (reassignment == null) { return null; @@ -1149,12 +1149,12 @@ synchronized private PartitionReassignment findPartitionReassignment(TopicPartit } @Override - synchronized public AlterConsumerGroupOffsetsResult alterConsumerGroupOffsets(String groupId, Map offsets, AlterConsumerGroupOffsetsOptions options) { + public synchronized AlterConsumerGroupOffsetsResult alterConsumerGroupOffsets(String groupId, Map offsets, AlterConsumerGroupOffsetsOptions options) { throw new UnsupportedOperationException("Not implement yet"); } @Override - synchronized public ListOffsetsResult listOffsets(Map topicPartitionOffsets, ListOffsetsOptions options) { + public synchronized ListOffsetsResult listOffsets(Map topicPartitionOffsets, ListOffsetsOptions options) { Map> futures = new HashMap<>(); for (Map.Entry entry : topicPartitionOffsets.entrySet()) { @@ -1321,7 +1321,7 @@ public ListClientMetricsResourcesResult listClientMetricsResources(ListClientMet } @Override - synchronized public void close(Duration timeout) {} + public synchronized void close(Duration timeout) {} public synchronized void updateBeginningOffsets(Map newOffsets) { beginningOffsets.putAll(newOffsets); @@ -1339,7 +1339,7 @@ public synchronized void throwOnListConsumerGroupOffsets(final KafkaException ex listConsumerGroupOffsetsException = exception; } - private final static class TopicMetadata { + private static final class TopicMetadata { final Uuid topicId; final boolean isInternalTopic; final List partitions; @@ -1364,7 +1364,7 @@ private final static class TopicMetadata { } } - synchronized public void setMockMetrics(MetricName name, Metric metric) { + public synchronized void setMockMetrics(MetricName name, Metric metric) { mockMetrics.put(name, metric); } @@ -1412,11 +1412,11 @@ public Uuid clientInstanceId(Duration timeout) { } @Override - synchronized public Map metrics() { + public synchronized Map metrics() { return mockMetrics; } - synchronized public void setFetchesRemainingUntilVisible(String topicName, int fetchesRemainingUntilVisible) { + public synchronized void setFetchesRemainingUntilVisible(String topicName, int fetchesRemainingUntilVisible) { TopicMetadata metadata = allTopics.get(topicName); if (metadata == null) { throw new RuntimeException("No such topic as " + topicName); @@ -1424,11 +1424,11 @@ synchronized public void setFetchesRemainingUntilVisible(String topicName, int f metadata.fetchesRemainingUntilVisible = fetchesRemainingUntilVisible; } - synchronized public List brokers() { + public synchronized List brokers() { return new ArrayList<>(brokers); } - synchronized public Node broker(int index) { + public synchronized Node broker(int index) { return brokers.get(index); } } 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 2c39f4411febe..6b237f9a0b25a 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 @@ -53,10 +53,10 @@ public class CompletedFetchTest { - private final static String TOPIC_NAME = "test"; - private final static TopicPartition TP = new TopicPartition(TOPIC_NAME, 0); - private final static long PRODUCER_ID = 1000L; - private final static short PRODUCER_EPOCH = 0; + private static final String TOPIC_NAME = "test"; + private static final TopicPartition TP = new TopicPartition(TOPIC_NAME, 0); + private static final long PRODUCER_ID = 1000L; + private static final short PRODUCER_EPOCH = 0; @Test public void testSimple() { 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 094e346e02bdf..c7dfdffabf40c 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 @@ -76,8 +76,8 @@ @MockitoSettings(strictness = Strictness.STRICT_STUBS) public class FetchCollectorTest { - private final static int DEFAULT_RECORD_COUNT = 10; - private final static int DEFAULT_MAX_POLL_RECORDS = ConsumerConfig.DEFAULT_MAX_POLL_RECORDS; + private static final int DEFAULT_RECORD_COUNT = 10; + private static final int DEFAULT_MAX_POLL_RECORDS = ConsumerConfig.DEFAULT_MAX_POLL_RECORDS; private final Time time = new MockTime(0, 0, 0); private final TopicPartition topicAPartition0 = new TopicPartition("topic-a", 0); private final TopicPartition topicAPartition1 = new TopicPartition("topic-a", 1); @@ -842,4 +842,4 @@ private Records createRecords(final int recordCount) { return builder.build(); } } -} \ No newline at end of file +} 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 dc00ce3336691..a86255cb47799 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 @@ -38,8 +38,8 @@ public class FetchMetricsManagerTest { private static final double EPSILON = 0.0001; private final Time time = new MockTime(1, 0, 0); - private final static String TOPIC_NAME = "test"; - private final static TopicPartition TP = new TopicPartition(TOPIC_NAME, 0); + private static final String TOPIC_NAME = "test"; + private static final TopicPartition TP = new TopicPartition(TOPIC_NAME, 0); private Metrics metrics; private FetchMetricsRegistry metricsRegistry; 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 1b295ac52df91..5877304dbfe2e 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 @@ -24,10 +24,10 @@ import org.junit.jupiter.api.Test; public class TopicPartitionComparatorTest { - private final static TopicPartition TP1 = new TopicPartition("t1", 0); - private final static TopicPartition TP1_COPY = new TopicPartition("t1", 0); - private final static TopicPartition TP2 = new TopicPartition("t1", 1); - private final static TopicPartition TP3 = new TopicPartition("t11", 1); + private static final TopicPartition TP1 = new TopicPartition("t1", 0); + private static final TopicPartition TP1_COPY = new TopicPartition("t1", 0); + private static final TopicPartition TP2 = new TopicPartition("t1", 1); + private static final TopicPartition TP3 = new TopicPartition("t11", 1); private final TopicPartitionComparator comparator = new TopicPartitionComparator(); 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 a1f15d3d73e5c..7220305a7a935 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 @@ -39,7 +39,7 @@ @MockitoSettings(strictness = Strictness.STRICT_STUBS) public class WakeupTriggerTest { - private final static long DEFAULT_TIMEOUT_MS = 1000; + private static final long DEFAULT_TIMEOUT_MS = 1000; private WakeupTrigger wakeupTrigger; @BeforeEach 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 f65e17661163f..b77b453f716d1 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 @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class RoundRobinPartitionerTest { - private final static Node[] NODES = new Node[] { + private static final Node[] NODES = new Node[] { new Node(0, "localhost", 99), new Node(1, "localhost", 100), new Node(2, "localhost", 101) 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 0880dccebb27d..74a23d5820f7a 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 @@ -30,14 +30,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class UniformStickyPartitionerTest { - private final static Node[] NODES = new Node[] { + private static final Node[] NODES = new Node[] { new Node(0, "localhost", 99), new Node(1, "localhost", 100), new Node(2, "localhost", 101) }; - private final static String TOPIC_A = "TOPIC_A"; - private final static String TOPIC_B = "TOPIC_B"; + private static final String TOPIC_A = "TOPIC_A"; + private static final String TOPIC_B = "TOPIC_B"; @SuppressWarnings("deprecation") @Test 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 69546aaa6ed71..985d47bcab21b 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 @@ -36,15 +36,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class BuiltInPartitionerTest { - private final static Node[] NODES = new Node[] { + private static final Node[] NODES = new Node[] { new Node(0, "localhost", 99), new Node(1, "localhost", 100), new Node(2, "localhost", 101), new Node(11, "localhost", 102) }; - final static String TOPIC_A = "topicA"; - final static String TOPIC_B = "topicB"; - final static String TOPIC_C = "topicC"; + static final String TOPIC_A = "topicA"; + static final String TOPIC_B = "topicB"; + static final String TOPIC_C = "topicC"; final LogContext logContext = new LogContext(); @AfterEach 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 2af61806a34e7..8c95c6a1f07dc 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 @@ -28,15 +28,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultPartitionerTest { - private final static byte[] KEY_BYTES = "key".getBytes(); - private final static Node[] NODES = new Node[] { + private static final byte[] KEY_BYTES = "key".getBytes(); + private static final Node[] NODES = new Node[] { new Node(0, "localhost", 99), new Node(1, "localhost", 100), new Node(12, "localhost", 101) }; - private final static String TOPIC = "test"; + private static final String TOPIC = "test"; // Intentionally make the partition list not in partition order to test the edge cases. - private final static List PARTITIONS = asList(new PartitionInfo(TOPIC, 1, null, NODES, NODES), + private static final List PARTITIONS = asList(new PartitionInfo(TOPIC, 1, null, NODES, NODES), new PartitionInfo(TOPIC, 2, NODES[1], NODES, NODES), new PartitionInfo(TOPIC, 0, NODES[0], NODES, NODES)); 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 3371223afe6b8..8d319be276137 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 @@ -29,15 +29,15 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; public class StickyPartitionCacheTest { - private final static Node[] NODES = new Node[] { + private static final Node[] NODES = new Node[] { new Node(0, "localhost", 99), new Node(1, "localhost", 100), new Node(2, "localhost", 101), new Node(11, "localhost", 102) }; - final static String TOPIC_A = "topicA"; - final static String TOPIC_B = "topicB"; - final static String TOPIC_C = "topicC"; + static final String TOPIC_A = "topicA"; + static final String TOPIC_B = "topicB"; + static final String TOPIC_C = "topicC"; @Test public void testStickyPartitionCache() { 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 4c6db86d6a722..5a0f1b6f9f1ac 100644 --- a/clients/src/test/java/org/apache/kafka/common/ClusterTest.java +++ b/clients/src/test/java/org/apache/kafka/common/ClusterTest.java @@ -31,18 +31,18 @@ public class ClusterTest { - private final static Node[] NODES = new Node[] { + private static final Node[] NODES = new Node[] { new Node(0, "localhost", 99), new Node(1, "localhost", 100), new Node(2, "localhost", 101), new Node(11, "localhost", 102) }; - private final static String TOPIC_A = "topicA"; - private final static String TOPIC_B = "topicB"; - private final static String TOPIC_C = "topicC"; - private final static String TOPIC_D = "topicD"; - private final static String TOPIC_E = "topicE"; + private static final String TOPIC_A = "topicA"; + private static final String TOPIC_B = "topicB"; + private static final String TOPIC_C = "topicC"; + private static final String TOPIC_D = "topicD"; + private static final String TOPIC_E = "topicE"; @Test public void testBootstrap() { diff --git a/clients/src/test/java/org/apache/kafka/common/compress/KafkaLZ4Test.java b/clients/src/test/java/org/apache/kafka/common/compress/KafkaLZ4Test.java index 7c83ec79ce0d5..bbe97fb64b994 100644 --- a/clients/src/test/java/org/apache/kafka/common/compress/KafkaLZ4Test.java +++ b/clients/src/test/java/org/apache/kafka/common/compress/KafkaLZ4Test.java @@ -44,7 +44,7 @@ public class KafkaLZ4Test { - private final static Random RANDOM = new Random(0); + private static final Random RANDOM = new Random(0); private static class Payload { String name; 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 366681126099c..9a994c991fa17 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 @@ -61,7 +61,7 @@ * */ public class NioEchoServer extends Thread { - private final static Logger LOG = LoggerFactory.getLogger(NioEchoServer.class); + private static final Logger LOG = LoggerFactory.getLogger(NioEchoServer.class); public enum MetricType { TOTAL, RATE, AVG, MAX; 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 b1ed7c1652942..54aa3c6c708b7 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 @@ -27,7 +27,7 @@ public class ConfigurationUtilsTest extends OAuthBearerTest { - private final static String URL_CONFIG_NAME = "url"; + private static final String URL_CONFIG_NAME = "url"; @Test public void testUrl() { 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 15c95a126c349..fd3c2679c3c93 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 @@ -42,8 +42,8 @@ public class SerializationTest { - final private String topic = "testTopic"; - final private Map, List> testData = new HashMap, List>() { + private final String topic = "testTopic"; + private final Map, List> testData = new HashMap, List>() { { put(String.class, Arrays.asList(null, "my string")); put(Short.class, Arrays.asList(null, (short) 32767, (short) -32768)); 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 0c5828f565a0b..b93d5cb63f3b9 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 @@ -44,7 +44,7 @@ @Timeout(120) public class ImplicitLinkedHashCollectionTest { - final static class TestElement implements ImplicitLinkedHashCollection.Element { + static final class TestElement implements ImplicitLinkedHashCollection.Element { private int prev = ImplicitLinkedHashCollection.INVALID_INDEX; private int next = ImplicitLinkedHashCollection.INVALID_INDEX; private final int key; diff --git a/clients/src/test/java/org/apache/kafka/common/utils/ShellTest.java b/clients/src/test/java/org/apache/kafka/common/utils/ShellTest.java index 75020d59e9af9..124dfb69d88fa 100644 --- a/clients/src/test/java/org/apache/kafka/common/utils/ShellTest.java +++ b/clients/src/test/java/org/apache/kafka/common/utils/ShellTest.java @@ -44,7 +44,7 @@ public void testHeadDevZero() throws Exception { assertEquals(length, output.length()); } - private final static String NONEXISTENT_PATH = "/dev/a/path/that/does/not/exist/in/the/filesystem"; + private static final String NONEXISTENT_PATH = "/dev/a/path/that/does/not/exist/in/the/filesystem"; @Test public void testAttemptToRunNonExistentProgram() { diff --git a/connect/api/src/main/java/org/apache/kafka/connect/storage/StringConverterConfig.java b/connect/api/src/main/java/org/apache/kafka/connect/storage/StringConverterConfig.java index 96d0b5bc98147..a98b3bf233403 100644 --- a/connect/api/src/main/java/org/apache/kafka/connect/storage/StringConverterConfig.java +++ b/connect/api/src/main/java/org/apache/kafka/connect/storage/StringConverterConfig.java @@ -34,7 +34,7 @@ public class StringConverterConfig extends ConverterConfig { private static final String ENCODING_DOC = "The name of the Java character set to use for encoding strings as byte arrays."; private static final String ENCODING_DISPLAY = "Encoding"; - private final static ConfigDef CONFIG; + private static final ConfigDef CONFIG; static { CONFIG = ConverterConfig.newConfigDef(); diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverterConfig.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverterConfig.java index add8bec5b33c0..636ad13341bc2 100644 --- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverterConfig.java +++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverterConfig.java @@ -51,7 +51,7 @@ public class JsonConverterConfig extends ConverterConfig { private static final String REPLACE_NULL_WITH_DEFAULT_DOC = "Whether to replace fields that have a default value and that are null to the default value. When set to true, the default value is used, otherwise null is used."; private static final String REPLACE_NULL_WITH_DEFAULT_DISPLAY = "Replace null with default"; - private final static ConfigDef CONFIG; + private static final ConfigDef CONFIG; static { String group = "Schemas"; diff --git a/connect/mirror-client/src/main/java/org/apache/kafka/connect/mirror/MirrorClient.java b/connect/mirror-client/src/main/java/org/apache/kafka/connect/mirror/MirrorClient.java index b40b6ba552f32..a73cb67f59b49 100644 --- a/connect/mirror-client/src/main/java/org/apache/kafka/connect/mirror/MirrorClient.java +++ b/connect/mirror-client/src/main/java/org/apache/kafka/connect/mirror/MirrorClient.java @@ -233,7 +233,7 @@ Set allSources(String topic) { return sources; } - static private boolean endOfStream(Consumer consumer, Collection assignments) { + private static boolean endOfStream(Consumer consumer, Collection assignments) { Map endOffsets = consumer.endOffsets(assignments); for (TopicPartition topicPartition : assignments) { if (consumer.position(topicPartition) < endOffsets.get(topicPartition)) { diff --git a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointConfig.java b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointConfig.java index e37cee4a79b8b..dcb1c2c262e51 100644 --- a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointConfig.java +++ b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointConfig.java @@ -254,7 +254,7 @@ private static ConfigDef defineCheckpointConfig(ConfigDef baseConfig) { TOPIC_FILTER_CLASS_DOC); } - protected final static ConfigDef CONNECTOR_CONFIG_DEF = defineCheckpointConfig(new ConfigDef(BASE_CONNECTOR_CONFIG_DEF)); + protected static final ConfigDef CONNECTOR_CONFIG_DEF = defineCheckpointConfig(new ConfigDef(BASE_CONNECTOR_CONFIG_DEF)); public static void main(String[] args) { System.out.println(defineCheckpointConfig(new ConfigDef()).toHtml(4, config -> "mirror_checkpoint_" + config)); diff --git a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorHeartbeatConfig.java b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorHeartbeatConfig.java index 4cdc37ea1219d..15558567ef2eb 100644 --- a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorHeartbeatConfig.java +++ b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorHeartbeatConfig.java @@ -79,7 +79,7 @@ private static ConfigDef defineHeartbeatConfig(ConfigDef baseConfig) { HEARTBEATS_TOPIC_REPLICATION_FACTOR_DOC); } - protected final static ConfigDef CONNECTOR_CONFIG_DEF = defineHeartbeatConfig(new ConfigDef(BASE_CONNECTOR_CONFIG_DEF)); + protected static final ConfigDef CONNECTOR_CONFIG_DEF = defineHeartbeatConfig(new ConfigDef(BASE_CONNECTOR_CONFIG_DEF)); public static void main(String[] args) { System.out.println(defineHeartbeatConfig(new ConfigDef()).toHtml(4, config -> "mirror_heartbeat_" + config)); diff --git a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceConfig.java b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceConfig.java index f9368cb7e19c5..ff829cd34eb27 100644 --- a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceConfig.java +++ b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceConfig.java @@ -346,7 +346,7 @@ private static ConfigDef defineSourceConfig(ConfigDef baseConfig) { ADD_SOURCE_ALIAS_TO_METRICS_DOC); } - protected final static ConfigDef CONNECTOR_CONFIG_DEF = defineSourceConfig(new ConfigDef(BASE_CONNECTOR_CONFIG_DEF)); + protected static final ConfigDef CONNECTOR_CONFIG_DEF = defineSourceConfig(new ConfigDef(BASE_CONNECTOR_CONFIG_DEF)); public static void main(String[] args) { System.out.println(defineSourceConfig(new ConfigDef()).toHtml(4, config -> "mirror_source_" + config)); diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/MirrorSourceMetricsTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/MirrorSourceMetricsTest.java index ae43c72dcb066..8e59b95487c7a 100644 --- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/MirrorSourceMetricsTest.java +++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/MirrorSourceMetricsTest.java @@ -33,10 +33,10 @@ public class MirrorSourceMetricsTest { - private final static String SOURCE = "source"; - private final static String TARGET = "target"; - private final static TopicPartition TP = new TopicPartition("topic", 0); - private final static TopicPartition SOURCE_TP = new TopicPartition(SOURCE + "." + TP.topic(), TP.partition()); + private static final String SOURCE = "source"; + private static final String TARGET = "target"; + private static final TopicPartition TP = new TopicPartition("topic", 0); + private static final TopicPartition SOURCE_TP = new TopicPartition(SOURCE + "." + TP.topic(), TP.partition()); private final Map configs = new HashMap<>(); private TestReporter reporter; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/converters/NumberConverterConfig.java b/connect/runtime/src/main/java/org/apache/kafka/connect/converters/NumberConverterConfig.java index 49ad98673621d..508ba15f77504 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/converters/NumberConverterConfig.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/converters/NumberConverterConfig.java @@ -27,7 +27,7 @@ */ public class NumberConverterConfig extends ConverterConfig { - private final static ConfigDef CONFIG = ConverterConfig.newConfigDef(); + private static final ConfigDef CONFIG = ConverterConfig.newConfigDef(); public static ConfigDef configDef() { return CONFIG; diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/ConnectorConfig.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/ConnectorConfig.java index a1c2a36905492..20e0378ed9cdf 100644 --- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/ConnectorConfig.java +++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/ConnectorConfig.java @@ -419,7 +419,7 @@ protected ConfigDef config(Predicate predicate) { * The abstract method pattern is used to cope with this. * @param The type of plugin (either {@code Transformation} or {@code Predicate}). */ - static abstract class EnrichablePlugin { + abstract static class EnrichablePlugin { private final String aliasKind; private final String aliasConfig; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectorValidationIntegrationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectorValidationIntegrationTest.java index b3e37c9eeeb80..a65a02b7ec390 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectorValidationIntegrationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/integration/ConnectorValidationIntegrationTest.java @@ -413,7 +413,7 @@ public void testConnectorHasHeaderConverterThatThrowsExceptionOnInstantiation() ); } - public static abstract class TestConverter implements Converter, HeaderConverter { + public abstract static class TestConverter implements Converter, HeaderConverter { // Defined by both Converter and HeaderConverter interfaces @Override @@ -456,7 +456,7 @@ public byte[] fromConnectHeader(String topic, String headerKey, Schema schema, O } } - public static abstract class AbstractTestConverter extends TestConverter { + public abstract static class AbstractTestConverter extends TestConverter { } public static class TestConverterWithPrivateConstructor extends TestConverter { diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/ConnectorConfigTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/ConnectorConfigTest.java index f4e890fcaf362..6fa2808c19ea3 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/ConnectorConfigTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/ConnectorConfigTest.java @@ -52,7 +52,7 @@ public Set>> transformations() { private static final SinkRecord DUMMY_RECORD = new SinkRecord(null, 0, null, null, null, null, 0L); - public static abstract class TestConnector extends Connector { + public abstract static class TestConnector extends Connector { } public static class SimpleTransformation> implements Transformation, Versioned { @@ -393,7 +393,7 @@ public void configure(Map configs) { } } - public static abstract class AbstractTestPredicate> implements Predicate, Versioned { + public abstract static class AbstractTestPredicate> implements Predicate, Versioned { @Override public String version() { @@ -404,7 +404,7 @@ public AbstractTestPredicate() { } } - public static abstract class AbstractTransformation> implements Transformation, Versioned { + public abstract static class AbstractTransformation> implements Transformation, Versioned { @Override public String version() { @@ -413,7 +413,7 @@ public String version() { } - public static abstract class AbstractKeyValueTransformation> implements Transformation, Versioned { + public abstract static class AbstractKeyValueTransformation> implements Transformation, Versioned { @Override public R apply(R record) { return null; diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConnectorTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConnectorTest.java index f91e37ef9f9f9..ab8cdb65a0cb8 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConnectorTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConnectorTest.java @@ -642,6 +642,6 @@ private void verifyShutdown(int connectorStops, boolean clean, boolean started) } } - private static abstract class TestConnector extends Connector { + private abstract static class TestConnector extends Connector { } } diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerSinkTaskThreadedTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerSinkTaskThreadedTest.java index c9191c2962f78..facdf9da72a1c 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerSinkTaskThreadedTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerSinkTaskThreadedTest.java @@ -697,7 +697,7 @@ private RecordHeaders emptyHeaders() { return new RecordHeaders(); } - private static abstract class TestSinkTask extends SinkTask { + private abstract static class TestSinkTask extends SinkTask { } @SuppressWarnings("NewClassNamingConvention") diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerTaskTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerTaskTest.java index 0ef78661d514a..859ec64f656a7 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerTaskTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerTaskTest.java @@ -283,7 +283,7 @@ public void updateMetricsOnListenerEventsForStartupPauseResumeAndFailure() { assertEquals(runningTimeRatio, metrics.currentMetricValueAsDouble(group.metricGroup(), "running-ratio"), 0.000001d); } - private static abstract class TestSinkTask extends SinkTask { + private abstract static class TestSinkTask extends SinkTask { } private static class TestWorkerTask extends WorkerTask { diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/DistributedHerderTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/DistributedHerderTest.java index fa05e55015efd..4d8f5a4693f70 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/DistributedHerderTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/DistributedHerderTest.java @@ -4122,10 +4122,10 @@ private static List expectRecordStages(Callback callback) { } // We need to use a real class here due to some issue with mocking java.lang.Class - private static abstract class BogusSourceConnector extends SourceConnector { + private abstract static class BogusSourceConnector extends SourceConnector { } - private static abstract class BogusSourceTask extends SourceTask { + private abstract static class BogusSourceTask extends SourceTask { } /** diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/standalone/StandaloneHerderTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/standalone/StandaloneHerderTest.java index bed08ffa2ebf7..6e935ba059f92 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/standalone/StandaloneHerderTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/standalone/StandaloneHerderTest.java @@ -1112,16 +1112,16 @@ private void expectConfigValidation( } // We need to use a real class here due to some issue with mocking java.lang.Class - private static abstract class BogusSourceConnector extends SourceConnector { + private abstract static class BogusSourceConnector extends SourceConnector { } - private static abstract class BogusSourceTask extends SourceTask { + private abstract static class BogusSourceTask extends SourceTask { } - private static abstract class BogusSinkConnector extends SinkConnector { + private abstract static class BogusSinkConnector extends SinkConnector { } - private static abstract class BogusSinkTask extends SourceTask { + private abstract static class BogusSinkTask extends SourceTask { } private void verifyConnectorStatusRestart() { diff --git a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/SchemaSourceTask.java b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/SchemaSourceTask.java index b73d93ea6ee44..5c7e8835658e8 100644 --- a/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/SchemaSourceTask.java +++ b/connect/test-plugins/src/main/java/org/apache/kafka/connect/tools/SchemaSourceTask.java @@ -56,7 +56,7 @@ public class SchemaSourceTask extends SourceTask { private boolean multipleSchema; private int partitionCount; - private final static Schema VALUE_SCHEMA = SchemaBuilder.struct().version(1).name("record") + private static final Schema VALUE_SCHEMA = SchemaBuilder.struct().version(1).name("record") .field("boolean", Schema.BOOLEAN_SCHEMA) .field("int", Schema.INT32_SCHEMA) .field("long", Schema.INT64_SCHEMA) @@ -67,7 +67,7 @@ public class SchemaSourceTask extends SourceTask { .field("seqno", Schema.INT64_SCHEMA) .build(); - private final static Schema VALUE_SCHEMA_2 = SchemaBuilder.struct().version(2).name("record") + private static final Schema VALUE_SCHEMA_2 = SchemaBuilder.struct().version(2).name("record") .field("boolean", Schema.BOOLEAN_SCHEMA) .field("int", Schema.INT32_SCHEMA) .field("long", Schema.INT64_SCHEMA) diff --git a/core/src/main/java/kafka/log/remote/RemoteLogManager.java b/core/src/main/java/kafka/log/remote/RemoteLogManager.java index 262702a75b6be..fb919dc8a5311 100644 --- a/core/src/main/java/kafka/log/remote/RemoteLogManager.java +++ b/core/src/main/java/kafka/log/remote/RemoteLogManager.java @@ -548,7 +548,7 @@ && isRemoteSegmentWithinLeaderEpochs(rlsMetadata, unifiedLog.logEndOffset(), epo return Optional.empty(); } - private static abstract class CancellableRunnable implements Runnable { + private abstract static class CancellableRunnable implements Runnable { private volatile boolean cancelled = false; public void cancel() { diff --git a/core/src/test/java/kafka/server/logger/RuntimeLoggerManagerTest.java b/core/src/test/java/kafka/server/logger/RuntimeLoggerManagerTest.java index 8f170950365cc..66bd8afc75edf 100644 --- a/core/src/test/java/kafka/server/logger/RuntimeLoggerManagerTest.java +++ b/core/src/test/java/kafka/server/logger/RuntimeLoggerManagerTest.java @@ -34,9 +34,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class RuntimeLoggerManagerTest { - private final static Logger LOG = LoggerFactory.getLogger(RuntimeLoggerManagerTest.class); + private static final Logger LOG = LoggerFactory.getLogger(RuntimeLoggerManagerTest.class); - private final static RuntimeLoggerManager MANAGER = new RuntimeLoggerManager(5, LOG); + private static final RuntimeLoggerManager MANAGER = new RuntimeLoggerManager(5, LOG); @Test public void testValidateSetLogLevelConfig() { diff --git a/core/src/test/java/kafka/test/MockController.java b/core/src/test/java/kafka/test/MockController.java index 393e6f784a74f..d531e9c62ae20 100644 --- a/core/src/test/java/kafka/test/MockController.java +++ b/core/src/test/java/kafka/test/MockController.java @@ -85,7 +85,7 @@ public class MockController implements Controller { - private final static NotControllerException NOT_CONTROLLER_EXCEPTION = + private static final NotControllerException NOT_CONTROLLER_EXCEPTION = new NotControllerException("This is not the correct controller for this cluster."); private final AtomicLong nextTopicId = new AtomicLong(1); @@ -174,7 +174,7 @@ public CompletableFuture expireDelegationToke } @Override - synchronized public CompletableFuture createTopics( + public synchronized CompletableFuture createTopics( ControllerRequestContext context, CreateTopicsRequestData request, Set describable @@ -257,7 +257,7 @@ static class MockTopic { private final Map> configs = new HashMap<>(); @Override - synchronized public CompletableFuture>> findTopicIds( + public synchronized CompletableFuture>> findTopicIds( ControllerRequestContext context, Collection topicNames ) { @@ -273,7 +273,7 @@ synchronized public CompletableFuture>> findTopi } @Override - synchronized public CompletableFuture> findAllTopicIds( + public synchronized CompletableFuture> findAllTopicIds( ControllerRequestContext context ) { Map results = new HashMap<>(); @@ -284,7 +284,7 @@ synchronized public CompletableFuture> findAllTopicIds( } @Override - synchronized public CompletableFuture>> findTopicNames( + public synchronized CompletableFuture>> findTopicNames( ControllerRequestContext context, Collection topicIds ) { @@ -301,7 +301,7 @@ synchronized public CompletableFuture>> findTopi } @Override - synchronized public CompletableFuture> deleteTopics( + public synchronized CompletableFuture> deleteTopics( ControllerRequestContext context, Collection topicIds ) { @@ -479,7 +479,7 @@ public CompletableFuture updateFeatures( } @Override - synchronized public CompletableFuture> createPartitions( + public synchronized CompletableFuture> createPartitions( ControllerRequestContext context, List topicList, boolean validateOnly diff --git a/core/src/test/java/kafka/test/junit/ClusterTestExtensions.java b/core/src/test/java/kafka/test/junit/ClusterTestExtensions.java index c54f3faf4a467..a3b00c4d7ae75 100644 --- a/core/src/test/java/kafka/test/junit/ClusterTestExtensions.java +++ b/core/src/test/java/kafka/test/junit/ClusterTestExtensions.java @@ -204,7 +204,7 @@ private ClusterTestDefaults getClusterTestDefaults(Class testClass) { } @ClusterTestDefaults - private final static class EmptyClass { + private static final class EmptyClass { // Just used as a convenience to get default values from the annotation } } diff --git a/core/src/test/java/kafka/testkit/KafkaClusterTestKit.java b/core/src/test/java/kafka/testkit/KafkaClusterTestKit.java index 0f29805f5f39f..2250e9652640e 100644 --- a/core/src/test/java/kafka/testkit/KafkaClusterTestKit.java +++ b/core/src/test/java/kafka/testkit/KafkaClusterTestKit.java @@ -80,7 +80,7 @@ @SuppressWarnings("deprecation") // Needed for Scala 2.12 compatibility public class KafkaClusterTestKit implements AutoCloseable { - private final static Logger log = LoggerFactory.getLogger(KafkaClusterTestKit.class); + private static final Logger log = LoggerFactory.getLogger(KafkaClusterTestKit.class); /** * This class manages a future which is completed with the proper value for @@ -321,7 +321,7 @@ private String roles(int node) { return "broker"; } - static private void setupNodeDirectories(File baseDirectory, + private static void setupNodeDirectories(File baseDirectory, String metadataDirectory, Collection logDataDirectories) throws Exception { Files.createDirectories(new File(baseDirectory, "local").toPath()); diff --git a/generator/src/main/java/org/apache/kafka/message/IsNullConditional.java b/generator/src/main/java/org/apache/kafka/message/IsNullConditional.java index 88a3598fbe140..61b3826813bd4 100644 --- a/generator/src/main/java/org/apache/kafka/message/IsNullConditional.java +++ b/generator/src/main/java/org/apache/kafka/message/IsNullConditional.java @@ -26,7 +26,7 @@ interface ConditionalGenerator { } private static class PrimitiveConditionalGenerator implements ConditionalGenerator { - final static PrimitiveConditionalGenerator INSTANCE = new PrimitiveConditionalGenerator(); + static final PrimitiveConditionalGenerator INSTANCE = new PrimitiveConditionalGenerator(); @Override public String generate(String name, boolean negated) { diff --git a/generator/src/main/java/org/apache/kafka/message/JsonConverterGenerator.java b/generator/src/main/java/org/apache/kafka/message/JsonConverterGenerator.java index 8ce07b9275d26..ab17b8fde0073 100644 --- a/generator/src/main/java/org/apache/kafka/message/JsonConverterGenerator.java +++ b/generator/src/main/java/org/apache/kafka/message/JsonConverterGenerator.java @@ -24,7 +24,7 @@ * Generates Kafka MessageData classes. */ public final class JsonConverterGenerator implements MessageClassGenerator { - private final static String SUFFIX = "JsonConverter"; + private static final String SUFFIX = "JsonConverter"; private final String packageName; private final StructRegistry structRegistry; private final HeaderGenerator headerGenerator; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/ConsumerGroupMigrationPolicy.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/ConsumerGroupMigrationPolicy.java index 759e862c0b156..7f86c8019e178 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/ConsumerGroupMigrationPolicy.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/ConsumerGroupMigrationPolicy.java @@ -59,7 +59,7 @@ public String toString() { return name; } - private final static Map NAME_TO_ENUM = Arrays.stream(values()) + private static final Map NAME_TO_ENUM = Arrays.stream(values()) .collect(Collectors.toMap(policy -> policy.name.toLowerCase(Locale.ROOT), Function.identity())); /** diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/Group.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/Group.java index a0a933bd926c8..0e4b2850ab6cf 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/Group.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/Group.java @@ -48,7 +48,7 @@ public String toString() { return name; } - private final static Map NAME_TO_ENUM = Arrays.stream(values()) + private static final Map NAME_TO_ENUM = Arrays.stream(values()) .collect(Collectors.toMap(type -> type.name.toLowerCase(Locale.ROOT), Function.identity())); /** diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java index ed1ba70bb6e7f..5274a4ab43201 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java @@ -31,75 +31,75 @@ */ public class GroupCoordinatorConfig { /** ********* Group coordinator configuration ***********/ - public final static String GROUP_MIN_SESSION_TIMEOUT_MS_CONFIG = "group.min.session.timeout.ms"; - public final static String GROUP_MIN_SESSION_TIMEOUT_MS_DOC = "The minimum allowed session timeout for registered consumers. Shorter timeouts result in quicker failure detection at the cost of more frequent consumer heartbeating, which can overwhelm broker resources."; + public static final String GROUP_MIN_SESSION_TIMEOUT_MS_CONFIG = "group.min.session.timeout.ms"; + public static final String GROUP_MIN_SESSION_TIMEOUT_MS_DOC = "The minimum allowed session timeout for registered consumers. Shorter timeouts result in quicker failure detection at the cost of more frequent consumer heartbeating, which can overwhelm broker resources."; public static final int GROUP_MIN_SESSION_TIMEOUT_MS_DEFAULT = 6000; - public final static String GROUP_MAX_SESSION_TIMEOUT_MS_CONFIG = "group.max.session.timeout.ms"; - public final static String GROUP_MAX_SESSION_TIMEOUT_MS_DOC = "The maximum allowed session timeout for registered consumers. Longer timeouts give consumers more time to process messages in between heartbeats at the cost of a longer time to detect failures."; + public static final String GROUP_MAX_SESSION_TIMEOUT_MS_CONFIG = "group.max.session.timeout.ms"; + public static final String GROUP_MAX_SESSION_TIMEOUT_MS_DOC = "The maximum allowed session timeout for registered consumers. Longer timeouts give consumers more time to process messages in between heartbeats at the cost of a longer time to detect failures."; public static final int GROUP_MAX_SESSION_TIMEOUT_MS_DEFAULT = 1800000; - public final static String GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG = "group.initial.rebalance.delay.ms"; - public final static String GROUP_INITIAL_REBALANCE_DELAY_MS_DOC = "The amount of time the group coordinator will wait for more consumers to join a new group before performing the first rebalance. A longer delay means potentially fewer rebalances, but increases the time until processing begins."; + public static final String GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG = "group.initial.rebalance.delay.ms"; + public static final String GROUP_INITIAL_REBALANCE_DELAY_MS_DOC = "The amount of time the group coordinator will wait for more consumers to join a new group before performing the first rebalance. A longer delay means potentially fewer rebalances, but increases the time until processing begins."; public static final int GROUP_INITIAL_REBALANCE_DELAY_MS_DEFAULT = 3000; - public final static String GROUP_MAX_SIZE_CONFIG = "group.max.size"; - public final static String GROUP_MAX_SIZE_DOC = "The maximum number of consumers that a single consumer group can accommodate."; + public static final String GROUP_MAX_SIZE_CONFIG = "group.max.size"; + public static final String GROUP_MAX_SIZE_DOC = "The maximum number of consumers that a single consumer group can accommodate."; public static final int GROUP_MAX_SIZE_DEFAULT = Integer.MAX_VALUE; /** New group coordinator configs */ - public final static String NEW_GROUP_COORDINATOR_ENABLE_CONFIG = "group.coordinator.new.enable"; - public final static String NEW_GROUP_COORDINATOR_ENABLE_DOC = "Enable the new group coordinator."; + public static final String NEW_GROUP_COORDINATOR_ENABLE_CONFIG = "group.coordinator.new.enable"; + public static final String NEW_GROUP_COORDINATOR_ENABLE_DOC = "Enable the new group coordinator."; public static final boolean NEW_GROUP_COORDINATOR_ENABLE_DEFAULT = false; - public final static String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG = "group.coordinator.rebalance.protocols"; - public final static String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC = "The list of enabled rebalance protocols. Supported protocols: " + Utils.join(Group.GroupType.values(), ",") + ". " + + public static final String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG = "group.coordinator.rebalance.protocols"; + public static final String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC = "The list of enabled rebalance protocols. Supported protocols: " + Utils.join(Group.GroupType.values(), ",") + ". " + "The " + Group.GroupType.CONSUMER + " rebalance protocol is in early access and therefore must not be used in production."; public static final List GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DEFAULT = Collections.singletonList(Group.GroupType.CLASSIC.toString()); - public final static String GROUP_COORDINATOR_NUM_THREADS_CONFIG = "group.coordinator.threads"; - public final static String GROUP_COORDINATOR_NUM_THREADS_DOC = "The number of threads used by the group coordinator."; + public static final String GROUP_COORDINATOR_NUM_THREADS_CONFIG = "group.coordinator.threads"; + public static final String GROUP_COORDINATOR_NUM_THREADS_DOC = "The number of threads used by the group coordinator."; public static final int GROUP_COORDINATOR_NUM_THREADS_DEFAULT = 1; /** Consumer group configs */ - public final static String CONSUMER_GROUP_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.session.timeout.ms"; - public final static String CONSUMER_GROUP_SESSION_TIMEOUT_MS_DOC = "The timeout to detect client failures when using the consumer group protocol."; + public static final String CONSUMER_GROUP_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.session.timeout.ms"; + public static final String CONSUMER_GROUP_SESSION_TIMEOUT_MS_DOC = "The timeout to detect client failures when using the consumer group protocol."; public static final int CONSUMER_GROUP_SESSION_TIMEOUT_MS_DEFAULT = 45000; - public final static String CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.min.session.timeout.ms"; - public final static String CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_DOC = "The minimum allowed session timeout for registered consumers."; + public static final String CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.min.session.timeout.ms"; + public static final String CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_DOC = "The minimum allowed session timeout for registered consumers."; public static final int CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_DEFAULT = 45000; - public final static String CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.max.session.timeout.ms"; - public final static String CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_DOC = "The maximum allowed session timeout for registered consumers."; + public static final String CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.max.session.timeout.ms"; + public static final String CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_DOC = "The maximum allowed session timeout for registered consumers."; public static final int CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_DEFAULT = 60000; - public final static String CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.heartbeat.interval.ms"; - public final static String CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_DOC = "The heartbeat interval given to the members of a consumer group."; + public static final String CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.heartbeat.interval.ms"; + public static final String CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_DOC = "The heartbeat interval given to the members of a consumer group."; public static final int CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_DEFAULT = 5000; - public final static String CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.min.heartbeat.interval.ms"; - public final static String CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DOC = "The minimum heartbeat interval for registered consumers."; + public static final String CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.min.heartbeat.interval.ms"; + public static final String CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DOC = "The minimum heartbeat interval for registered consumers."; public static final int CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DEFAULT = 5000; - public final static String CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.max.heartbeat.interval.ms"; - public final static String CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DOC = "The maximum heartbeat interval for registered consumers."; + public static final String CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.max.heartbeat.interval.ms"; + public static final String CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DOC = "The maximum heartbeat interval for registered consumers."; public static final int CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DEFAULT = 15000; - public final static String CONSUMER_GROUP_MAX_SIZE_CONFIG = "group.consumer.max.size"; - public final static String CONSUMER_GROUP_MAX_SIZE_DOC = "The maximum number of consumers that a single consumer group can accommodate. This value will only impact the new consumer coordinator. To configure the classic consumer coordinator check " + GROUP_MAX_SIZE_CONFIG + " instead."; + public static final String CONSUMER_GROUP_MAX_SIZE_CONFIG = "group.consumer.max.size"; + public static final String CONSUMER_GROUP_MAX_SIZE_DOC = "The maximum number of consumers that a single consumer group can accommodate. This value will only impact the new consumer coordinator. To configure the classic consumer coordinator check " + GROUP_MAX_SIZE_CONFIG + " instead."; public static final int CONSUMER_GROUP_MAX_SIZE_DEFAULT = Integer.MAX_VALUE; - public final static String CONSUMER_GROUP_ASSIGNORS_CONFIG = "group.consumer.assignors"; - public final static String CONSUMER_GROUP_ASSIGNORS_DOC = "The server side assignors as a list of full class names. The first one in the list is considered as the default assignor to be used in the case where the consumer does not specify an assignor."; + public static final String CONSUMER_GROUP_ASSIGNORS_CONFIG = "group.consumer.assignors"; + public static final String CONSUMER_GROUP_ASSIGNORS_DOC = "The server side assignors as a list of full class names. The first one in the list is considered as the default assignor to be used in the case where the consumer does not specify an assignor."; public static final List CONSUMER_GROUP_ASSIGNORS_DEFAULT = Collections.unmodifiableList(Arrays.asList( UniformAssignor.class.getName(), RangeAssignor.class.getName() )); - public final static String CONSUMER_GROUP_MIGRATION_POLICY_CONFIG = "group.consumer.migration.policy"; + public static final String CONSUMER_GROUP_MIGRATION_POLICY_CONFIG = "group.consumer.migration.policy"; public static final String CONSUMER_GROUP_MIGRATION_POLICY_DEFAULT = ConsumerGroupMigrationPolicy.DISABLED.toString(); - public final static String CONSUMER_GROUP_MIGRATION_POLICY_DOC = "The config that enables converting the non-empty classic group using the consumer embedded protocol to the non-empty consumer group using the consumer group protocol and vice versa; " + + public static final String CONSUMER_GROUP_MIGRATION_POLICY_DOC = "The config that enables converting the non-empty classic group using the consumer embedded protocol to the non-empty consumer group using the consumer group protocol and vice versa; " + "conversions of empty groups in both directions are always enabled regardless of this policy. " + ConsumerGroupMigrationPolicy.BIDIRECTIONAL + ": both upgrade from classic group to consumer group and downgrade from consumer group to classic group are enabled, " + ConsumerGroupMigrationPolicy.UPGRADE + ": only upgrade from classic group to consumer group is enabled, " + diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/consumer/MemberState.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/consumer/MemberState.java index 3f3237bfe0b12..190bd67ad0a50 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/consumer/MemberState.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/consumer/MemberState.java @@ -48,7 +48,7 @@ public enum MemberState { */ UNKNOWN((byte) 127); - private final static Map VALUES_TO_ENUMS = new HashMap<>(); + private static final Map VALUES_TO_ENUMS = new HashMap<>(); static { for (MemberState state: MemberState.values()) { diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetrics.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetrics.java index c9ae39fdc7942..f5268dea805ed 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetrics.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/metrics/GroupCoordinatorMetrics.java @@ -47,25 +47,25 @@ public class GroupCoordinatorMetrics extends CoordinatorMetrics implements AutoC /** * Old classic group count metric. To be deprecated. */ - public final static com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS = getMetricName( + public static final com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS = getMetricName( "GroupMetadataManager", "NumGroups"); - public final static com.yammer.metrics.core.MetricName NUM_OFFSETS = getMetricName( + public static final com.yammer.metrics.core.MetricName NUM_OFFSETS = getMetricName( "GroupMetadataManager", "NumOffsets"); - public final static com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_PREPARING_REBALANCE = getMetricName( + public static final com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_PREPARING_REBALANCE = getMetricName( "GroupMetadataManager", "NumGroupsPreparingRebalance"); - public final static com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_COMPLETING_REBALANCE = getMetricName( + public static final com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_COMPLETING_REBALANCE = getMetricName( "GroupMetadataManager", "NumGroupsCompletingRebalance"); - public final static com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_STABLE = getMetricName( + public static final com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_STABLE = getMetricName( "GroupMetadataManager", "NumGroupsStable"); - public final static com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_DEAD = getMetricName( + public static final com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_DEAD = getMetricName( "GroupMetadataManager", "NumGroupsDead"); - public final static com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_EMPTY = getMetricName( + public static final com.yammer.metrics.core.MetricName NUM_CLASSIC_GROUPS_EMPTY = getMetricName( "GroupMetadataManager", "NumGroupsEmpty"); - public final static String GROUP_COUNT_METRIC_NAME = "group-count"; - public final static String GROUP_COUNT_PROTOCOL_TAG = "protocol"; - public final static String CONSUMER_GROUP_COUNT_METRIC_NAME = "consumer-group-count"; - public final static String CONSUMER_GROUP_COUNT_STATE_TAG = "state"; + public static final String GROUP_COUNT_METRIC_NAME = "group-count"; + public static final String GROUP_COUNT_PROTOCOL_TAG = "protocol"; + public static final String CONSUMER_GROUP_COUNT_METRIC_NAME = "consumer-group-count"; + public static final String CONSUMER_GROUP_COUNT_STATE_TAG = "state"; public static final String OFFSET_COMMITS_SENSOR_NAME = "OffsetCommits"; public static final String OFFSET_EXPIRED_SENSOR_NAME = "OffsetExpired"; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java index 55596fa46b117..b2b1ba8005801 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java @@ -338,21 +338,21 @@ SyncGroupRequestData build() { } public static class Builder { - final private MockTime time = new MockTime(); - final private MockCoordinatorTimer timer = new MockCoordinatorTimer<>(time); - final private LogContext logContext = new LogContext(); - final private SnapshotRegistry snapshotRegistry = new SnapshotRegistry(logContext); + private final MockTime time = new MockTime(); + private final MockCoordinatorTimer timer = new MockCoordinatorTimer<>(time); + private final LogContext logContext = new LogContext(); + private final SnapshotRegistry snapshotRegistry = new SnapshotRegistry(logContext); private MetadataImage metadataImage; private List consumerGroupAssignors = Collections.singletonList(new MockPartitionAssignor("range")); - final private List consumerGroupBuilders = new ArrayList<>(); + private final List consumerGroupBuilders = new ArrayList<>(); private int consumerGroupMaxSize = Integer.MAX_VALUE; private int consumerGroupMetadataRefreshIntervalMs = Integer.MAX_VALUE; private int classicGroupMaxSize = Integer.MAX_VALUE; private int classicGroupInitialRebalanceDelayMs = 3000; - final private int classicGroupNewMemberJoinTimeoutMs = 5 * 60 * 1000; + private final int classicGroupNewMemberJoinTimeoutMs = 5 * 60 * 1000; private int classicGroupMinSessionTimeoutMs = 10; private int classicGroupMaxSessionTimeoutMs = 10 * 60 * 1000; - final private GroupCoordinatorMetricsShard metrics = mock(GroupCoordinatorMetricsShard.class); + private final GroupCoordinatorMetricsShard metrics = mock(GroupCoordinatorMetricsShard.class); private ConsumerGroupMigrationPolicy consumerGroupMigrationPolicy = ConsumerGroupMigrationPolicy.DISABLED; public Builder withMetadataImage(MetadataImage metadataImage) { diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetMetadataManagerTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetMetadataManagerTest.java index 4b3d76bbd1c11..3ddd0f929acf7 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetMetadataManagerTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetMetadataManagerTest.java @@ -2577,7 +2577,7 @@ public void testCleanupExpiredOffsetsWithPendingTransactionalOffsets() { assertEquals(Collections.emptyList(), records); } - static private OffsetFetchResponseData.OffsetFetchResponsePartitions mkOffsetPartitionResponse( + private static OffsetFetchResponseData.OffsetFetchResponsePartitions mkOffsetPartitionResponse( int partition, long offset, int leaderEpoch, @@ -2590,7 +2590,7 @@ static private OffsetFetchResponseData.OffsetFetchResponsePartitions mkOffsetPar .setMetadata(metadata); } - static private OffsetFetchResponseData.OffsetFetchResponsePartitions mkInvalidOffsetPartitionResponse(int partition) { + private static OffsetFetchResponseData.OffsetFetchResponsePartitions mkInvalidOffsetPartitionResponse(int partition) { return new OffsetFetchResponseData.OffsetFetchResponsePartitions() .setPartitionIndex(partition) .setCommittedOffset(INVALID_OFFSET) @@ -2598,7 +2598,7 @@ static private OffsetFetchResponseData.OffsetFetchResponsePartitions mkInvalidOf .setMetadata(""); } - static private OffsetFetchResponseData.OffsetFetchResponsePartitions mkOffsetPartitionResponse(int partition, Errors error) { + private static OffsetFetchResponseData.OffsetFetchResponsePartitions mkOffsetPartitionResponse(int partition, Errors error) { return new OffsetFetchResponseData.OffsetFetchResponsePartitions() .setPartitionIndex(partition) .setErrorCode(error.code()) diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/timeline/TimelineHashMapBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/timeline/TimelineHashMapBenchmark.java index ae6c56ee2e8dd..96d57a669e05c 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/timeline/TimelineHashMapBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/timeline/TimelineHashMapBenchmark.java @@ -42,7 +42,7 @@ @OutputTimeUnit(TimeUnit.MILLISECONDS) public class TimelineHashMapBenchmark { - private final static int NUM_ENTRIES = 1_000_000; + private static final int NUM_ENTRIES = 1_000_000; @Benchmark public Map testAddEntriesInHashMap() { diff --git a/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java b/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java index 2ffd0744cfbf0..eb33823bf323d 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java +++ b/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java @@ -50,9 +50,9 @@ * works because partition IDs cannot be negative. */ public class BrokersToIsrs { - private final static int LEADER_FLAG = 0x8000_0000; + private static final int LEADER_FLAG = 0x8000_0000; - private final static int REPLICA_MASK = 0x7fff_ffff; + private static final int REPLICA_MASK = 0x7fff_ffff; static class PartitionsOnReplicaIterator implements Iterator { private final Iterator> iterator; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java index f0bd98776bc38..9d5b16f1ad655 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java @@ -80,7 +80,7 @@ * brokers being fenced or unfenced, and broker feature versions. */ public class ClusterControlManager { - final static long DEFAULT_SESSION_TIMEOUT_NS = NANOSECONDS.convert(9, TimeUnit.SECONDS); + static final long DEFAULT_SESSION_TIMEOUT_NS = NANOSECONDS.convert(9, TimeUnit.SECONDS); static class Builder { private LogContext logContext = null; diff --git a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java index 789c369c9b206..05b62dee085b1 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java +++ b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java @@ -180,19 +180,19 @@ public final class QuorumController implements Controller { /** * The maximum records that the controller will write in a single batch. */ - private final static int MAX_RECORDS_PER_BATCH = 10000; + private static final int MAX_RECORDS_PER_BATCH = 10000; /** * The maximum records any user-initiated operation is allowed to generate. * * For now, this is set to the maximum records in a single batch. */ - final static int MAX_RECORDS_PER_USER_OP = MAX_RECORDS_PER_BATCH; + static final int MAX_RECORDS_PER_USER_OP = MAX_RECORDS_PER_BATCH; /** * A builder class which creates the QuorumController. */ - static public class Builder { + public static class Builder { private final int nodeId; private final String clusterId; private FaultHandler nonFatalFaultHandler = null; diff --git a/metadata/src/main/java/org/apache/kafka/controller/QuorumFeatures.java b/metadata/src/main/java/org/apache/kafka/controller/QuorumFeatures.java index 327bbd954fc50..fd91b1a966ec9 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/QuorumFeatures.java +++ b/metadata/src/main/java/org/apache/kafka/controller/QuorumFeatures.java @@ -39,7 +39,7 @@ public final class QuorumFeatures { private final Map localSupportedFeatures; private final List quorumNodeIds; - static public Optional reasonNotSupported( + public static Optional reasonNotSupported( short newVersion, String what, VersionRange range diff --git a/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java b/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java index 37906b34b8bb5..520e697480c20 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java +++ b/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java @@ -35,23 +35,23 @@ * @link{org.apache.kafka.controller.metrics.QuorumControllerMetrics}, not here. */ public final class ControllerMetadataMetrics implements AutoCloseable { - private final static MetricName FENCED_BROKER_COUNT = getMetricName( + private static final MetricName FENCED_BROKER_COUNT = getMetricName( "KafkaController", "FencedBrokerCount"); - private final static MetricName ACTIVE_BROKER_COUNT = getMetricName( + private static final MetricName ACTIVE_BROKER_COUNT = getMetricName( "KafkaController", "ActiveBrokerCount"); - private final static MetricName MIGRATING_ZK_BROKER_COUNT = getMetricName( + private static final MetricName MIGRATING_ZK_BROKER_COUNT = getMetricName( "KafkaController", "MigratingZkBrokerCount"); - private final static MetricName GLOBAL_TOPIC_COUNT = getMetricName( + private static final MetricName GLOBAL_TOPIC_COUNT = getMetricName( "KafkaController", "GlobalTopicCount"); - private final static MetricName GLOBAL_PARTITION_COUNT = getMetricName( + private static final MetricName GLOBAL_PARTITION_COUNT = getMetricName( "KafkaController", "GlobalPartitionCount"); - private final static MetricName OFFLINE_PARTITION_COUNT = getMetricName( + private static final MetricName OFFLINE_PARTITION_COUNT = getMetricName( "KafkaController", "OfflinePartitionsCount"); - private final static MetricName PREFERRED_REPLICA_IMBALANCE_COUNT = getMetricName( + private static final MetricName PREFERRED_REPLICA_IMBALANCE_COUNT = getMetricName( "KafkaController", "PreferredReplicaImbalanceCount"); - private final static MetricName METADATA_ERROR_COUNT = getMetricName( + private static final MetricName METADATA_ERROR_COUNT = getMetricName( "KafkaController", "MetadataErrorCount"); - private final static MetricName ZK_MIGRATION_STATE = getMetricName( + private static final MetricName ZK_MIGRATION_STATE = getMetricName( "KafkaController", "ZkMigrationState"); private final Optional registry; diff --git a/metadata/src/main/java/org/apache/kafka/controller/metrics/QuorumControllerMetrics.java b/metadata/src/main/java/org/apache/kafka/controller/metrics/QuorumControllerMetrics.java index 9ef3f79b5722c..9b67f0a945a2e 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/metrics/QuorumControllerMetrics.java +++ b/metadata/src/main/java/org/apache/kafka/controller/metrics/QuorumControllerMetrics.java @@ -38,33 +38,33 @@ * @link{org.apache.kafka.controller.metrics.ControllerMetadataMetrics}, not here. */ public class QuorumControllerMetrics implements AutoCloseable { - private final static MetricName ACTIVE_CONTROLLER_COUNT = getMetricName( + private static final MetricName ACTIVE_CONTROLLER_COUNT = getMetricName( "KafkaController", "ActiveControllerCount"); - private final static MetricName EVENT_QUEUE_TIME_MS = getMetricName( + private static final MetricName EVENT_QUEUE_TIME_MS = getMetricName( "ControllerEventManager", "EventQueueTimeMs"); - private final static MetricName EVENT_QUEUE_PROCESSING_TIME_MS = getMetricName( + private static final MetricName EVENT_QUEUE_PROCESSING_TIME_MS = getMetricName( "ControllerEventManager", "EventQueueProcessingTimeMs"); - private final static MetricName ZK_WRITE_BEHIND_LAG = getMetricName( + private static final MetricName ZK_WRITE_BEHIND_LAG = getMetricName( "KafkaController", "ZkWriteBehindLag"); - private final static MetricName ZK_WRITE_SNAPSHOT_TIME_MS = getMetricName( + private static final MetricName ZK_WRITE_SNAPSHOT_TIME_MS = getMetricName( "KafkaController", "ZkWriteSnapshotTimeMs"); - private final static MetricName ZK_WRITE_DELTA_TIME_MS = getMetricName( + private static final MetricName ZK_WRITE_DELTA_TIME_MS = getMetricName( "KafkaController", "ZkWriteDeltaTimeMs"); - private final static MetricName LAST_APPLIED_RECORD_OFFSET = getMetricName( + private static final MetricName LAST_APPLIED_RECORD_OFFSET = getMetricName( "KafkaController", "LastAppliedRecordOffset"); - private final static MetricName LAST_COMMITTED_RECORD_OFFSET = getMetricName( + private static final MetricName LAST_COMMITTED_RECORD_OFFSET = getMetricName( "KafkaController", "LastCommittedRecordOffset"); - private final static MetricName LAST_APPLIED_RECORD_TIMESTAMP = getMetricName( + private static final MetricName LAST_APPLIED_RECORD_TIMESTAMP = getMetricName( "KafkaController", "LastAppliedRecordTimestamp"); - private final static MetricName LAST_APPLIED_RECORD_LAG_MS = getMetricName( + private static final MetricName LAST_APPLIED_RECORD_LAG_MS = getMetricName( "KafkaController", "LastAppliedRecordLagMs"); - private final static MetricName TIMED_OUT_BROKER_HEARTBEAT_COUNT = getMetricName( + private static final MetricName TIMED_OUT_BROKER_HEARTBEAT_COUNT = getMetricName( "KafkaController", "TimedOutBrokerHeartbeatCount"); - private final static MetricName EVENT_QUEUE_OPERATIONS_STARTED_COUNT = getMetricName( + private static final MetricName EVENT_QUEUE_OPERATIONS_STARTED_COUNT = getMetricName( "KafkaController", "EventQueueOperationsStartedCount"); - private final static MetricName EVENT_QUEUE_OPERATIONS_TIMED_OUT_COUNT = getMetricName( + private static final MetricName EVENT_QUEUE_OPERATIONS_TIMED_OUT_COUNT = getMetricName( "KafkaController", "EventQueueOperationsTimedOutCount"); - private final static MetricName NEW_ACTIVE_CONTROLLERS_COUNT = getMetricName( + private static final MetricName NEW_ACTIVE_CONTROLLERS_COUNT = getMetricName( "KafkaController", "NewActiveControllersCount"); private final Optional registry; diff --git a/metadata/src/main/java/org/apache/kafka/image/ClientQuotaImage.java b/metadata/src/main/java/org/apache/kafka/image/ClientQuotaImage.java index 6c7bae44f33e6..63aef5dedf45e 100644 --- a/metadata/src/main/java/org/apache/kafka/image/ClientQuotaImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/ClientQuotaImage.java @@ -40,7 +40,7 @@ * This class is thread-safe. */ public final class ClientQuotaImage { - public final static ClientQuotaImage EMPTY = new ClientQuotaImage(Collections.emptyMap()); + public static final ClientQuotaImage EMPTY = new ClientQuotaImage(Collections.emptyMap()); private final Map quotas; diff --git a/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java b/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java index 4e539f8a48874..840fca55de843 100644 --- a/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java @@ -50,7 +50,7 @@ * This class is thread-safe. */ public final class ClientQuotasImage { - public final static ClientQuotasImage EMPTY = new ClientQuotasImage(Collections.emptyMap()); + public static final ClientQuotasImage EMPTY = new ClientQuotasImage(Collections.emptyMap()); private final Map entities; diff --git a/metadata/src/main/java/org/apache/kafka/image/MetadataImage.java b/metadata/src/main/java/org/apache/kafka/image/MetadataImage.java index 62995a4b0982c..dca085ae02d41 100644 --- a/metadata/src/main/java/org/apache/kafka/image/MetadataImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/MetadataImage.java @@ -31,7 +31,7 @@ * This class is thread-safe. */ public final class MetadataImage { - public final static MetadataImage EMPTY = new MetadataImage( + public static final MetadataImage EMPTY = new MetadataImage( MetadataProvenance.EMPTY, FeaturesImage.EMPTY, ClusterImage.EMPTY, diff --git a/metadata/src/main/java/org/apache/kafka/image/ProducerIdsImage.java b/metadata/src/main/java/org/apache/kafka/image/ProducerIdsImage.java index e1ed7baccb981..36a1f49048dad 100644 --- a/metadata/src/main/java/org/apache/kafka/image/ProducerIdsImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/ProducerIdsImage.java @@ -31,7 +31,7 @@ * This class is thread-safe. */ public final class ProducerIdsImage { - public final static ProducerIdsImage EMPTY = new ProducerIdsImage(-1L); + public static final ProducerIdsImage EMPTY = new ProducerIdsImage(-1L); /** * The next producer ID, or -1 in the special case where no producer IDs have been issued. diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetrics.java b/metadata/src/main/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetrics.java index 763732de0bb44..ac3cbc3daf57d 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetrics.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetrics.java @@ -35,11 +35,11 @@ * These are the metrics which are managed by the MetadataLoader class. */ public final class MetadataLoaderMetrics implements AutoCloseable { - private final static MetricName CURRENT_METADATA_VERSION = getMetricName( + private static final MetricName CURRENT_METADATA_VERSION = getMetricName( "MetadataLoader", "CurrentMetadataVersion"); - private final static MetricName HANDLE_LOAD_SNAPSHOT_COUNT = getMetricName( + private static final MetricName HANDLE_LOAD_SNAPSHOT_COUNT = getMetricName( "MetadataLoader", "HandleLoadSnapshotCount"); - public final static MetricName CURRENT_CONTROLLER_ID = getMetricName( + public static final MetricName CURRENT_CONTROLLER_ID = getMetricName( "MetadataLoader", "CurrentControllerId"); private final Optional registry; diff --git a/metadata/src/main/java/org/apache/kafka/image/node/AclsImageByIdNode.java b/metadata/src/main/java/org/apache/kafka/image/node/AclsImageByIdNode.java index 33f4b3ec1a54a..e6ea2a334a064 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/AclsImageByIdNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/AclsImageByIdNode.java @@ -29,7 +29,7 @@ public class AclsImageByIdNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "byId"; + public static final String NAME = "byId"; /** * The ACLs image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageBrokersNode.java b/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageBrokersNode.java index d0b2d7872d7b6..24b56f02e61d1 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageBrokersNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageBrokersNode.java @@ -28,7 +28,7 @@ public class ClusterImageBrokersNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "brokers"; + public static final String NAME = "brokers"; /** * The cluster image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageControllersNode.java b/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageControllersNode.java index 02bc281344fe2..ea5b3dc119d54 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageControllersNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageControllersNode.java @@ -28,7 +28,7 @@ public class ClusterImageControllersNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "controllers"; + public static final String NAME = "controllers"; /** * The cluster image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageNode.java b/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageNode.java index 778378477ad52..e631c0ef6d965 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/ClusterImageNode.java @@ -27,7 +27,7 @@ public class ClusterImageNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "cluster"; + public static final String NAME = "cluster"; /** * The cluster image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/ConfigurationsImageNode.java b/metadata/src/main/java/org/apache/kafka/image/node/ConfigurationsImageNode.java index 6d30c13609da4..78c86c4df22d9 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/ConfigurationsImageNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/ConfigurationsImageNode.java @@ -29,7 +29,7 @@ public class ConfigurationsImageNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "configs"; + public static final String NAME = "configs"; /** * The configurations image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/DelegationTokenImageNode.java b/metadata/src/main/java/org/apache/kafka/image/node/DelegationTokenImageNode.java index a132c3c18cc75..73566eff3980a 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/DelegationTokenImageNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/DelegationTokenImageNode.java @@ -26,7 +26,7 @@ public class DelegationTokenImageNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "delegationToken"; + public static final String NAME = "delegationToken"; /** * The DelegationToken image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/FeaturesImageNode.java b/metadata/src/main/java/org/apache/kafka/image/node/FeaturesImageNode.java index 33b51bfd58835..8882c7fe42502 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/FeaturesImageNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/FeaturesImageNode.java @@ -27,22 +27,22 @@ public class FeaturesImageNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "features"; + public static final String NAME = "features"; /** * The name of the metadata version child node. */ - public final static String METADATA_VERSION = "metadataVersion"; + public static final String METADATA_VERSION = "metadataVersion"; /** * The name of the zk migration state child node. */ - public final static String ZK_MIGRATION_STATE = "zkMigrationState"; + public static final String ZK_MIGRATION_STATE = "zkMigrationState"; /** * The prefix to put before finalized feature children. */ - public final static String FINALIZED_PREFIX = "finalized_"; + public static final String FINALIZED_PREFIX = "finalized_"; /** * The features image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/MetadataImageNode.java b/metadata/src/main/java/org/apache/kafka/image/node/MetadataImageNode.java index 72a6eb11b7e05..b13598d47380b 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/MetadataImageNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/MetadataImageNode.java @@ -30,14 +30,14 @@ public class MetadataImageNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "image"; + public static final String NAME = "image"; /** * The metadata image. */ private final MetadataImage image; - private final static Map> CHILDREN; + private static final Map> CHILDREN; static { Map> children = new HashMap<>(); diff --git a/metadata/src/main/java/org/apache/kafka/image/node/ProvenanceNode.java b/metadata/src/main/java/org/apache/kafka/image/node/ProvenanceNode.java index 00b468fb90e62..6687be8d42dda 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/ProvenanceNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/ProvenanceNode.java @@ -30,7 +30,7 @@ public class ProvenanceNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "provenance"; + public static final String NAME = "provenance"; /** * The metadata provenance. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/ScramImageNode.java b/metadata/src/main/java/org/apache/kafka/image/node/ScramImageNode.java index 66b1fe692e29c..fcae7984f81ec 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/ScramImageNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/ScramImageNode.java @@ -31,7 +31,7 @@ public class ScramImageNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "scram"; + public static final String NAME = "scram"; /** * The SCRAM image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByIdNode.java b/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByIdNode.java index 6ccc86a754d3d..76359e702395b 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByIdNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByIdNode.java @@ -29,7 +29,7 @@ public class TopicsImageByIdNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "byId"; + public static final String NAME = "byId"; /** * The topics image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByNameNode.java b/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByNameNode.java index 1a1902b807d22..444ce4830b2a6 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByNameNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByNameNode.java @@ -27,7 +27,7 @@ public class TopicsImageByNameNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "byName"; + public static final String NAME = "byName"; /** * The topics image. diff --git a/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageNode.java b/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageNode.java index f8286e7bae27e..b01f927c6fdf9 100644 --- a/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageNode.java +++ b/metadata/src/main/java/org/apache/kafka/image/node/TopicsImageNode.java @@ -27,7 +27,7 @@ public class TopicsImageNode implements MetadataNode { /** * The name of this node. */ - public final static String NAME = "topics"; + public static final String NAME = "topics"; /** * The topics image. diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java index b486a42864881..8dcd19d8300c1 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java @@ -42,7 +42,7 @@ public class SnapshotEmitter implements SnapshotGenerator.Emitter { * However, it's more convenient to limit the batch size here in terms of number of records. * So we chose a low number that will not cause problems. */ - private final static int DEFAULT_BATCH_SIZE = 1024; + private static final int DEFAULT_BATCH_SIZE = 1024; public static class Builder { private Time time = Time.SYSTEM; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetrics.java b/metadata/src/main/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetrics.java index 5e59942c960c3..d46b738d2a415 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetrics.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetrics.java @@ -31,9 +31,9 @@ * These are the metrics which are managed by the SnapshotEmitter class. */ public final class SnapshotEmitterMetrics implements AutoCloseable { - private final static MetricName LATEST_SNAPSHOT_GENERATED_BYTES = getMetricName( + private static final MetricName LATEST_SNAPSHOT_GENERATED_BYTES = getMetricName( "SnapshotEmitter", "LatestSnapshotGeneratedBytes"); - private final static MetricName LATEST_SNAPSHOT_GENERATED_AGE_MS = getMetricName( + private static final MetricName LATEST_SNAPSHOT_GENERATED_AGE_MS = getMetricName( "SnapshotEmitter", "LatestSnapshotGeneratedAgeMs"); private final Optional registry; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/BrokerRegistrationFencingChange.java b/metadata/src/main/java/org/apache/kafka/metadata/BrokerRegistrationFencingChange.java index ee007dd5378ac..a14cb3e3a4763 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/BrokerRegistrationFencingChange.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/BrokerRegistrationFencingChange.java @@ -33,7 +33,7 @@ public enum BrokerRegistrationFencingChange { private final Optional asBoolean; - private final static Map VALUE_TO_ENUM = + private static final Map VALUE_TO_ENUM = Arrays.stream(BrokerRegistrationFencingChange.values()). collect(Collectors.toMap(v -> v.value(), Function.identity())); diff --git a/metadata/src/main/java/org/apache/kafka/metadata/BrokerRegistrationInControlledShutdownChange.java b/metadata/src/main/java/org/apache/kafka/metadata/BrokerRegistrationInControlledShutdownChange.java index 3d49b495da55a..94d09d49e0608 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/BrokerRegistrationInControlledShutdownChange.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/BrokerRegistrationInControlledShutdownChange.java @@ -34,7 +34,7 @@ public enum BrokerRegistrationInControlledShutdownChange { private final Optional asBoolean; - private final static Map VALUE_TO_ENUM = + private static final Map VALUE_TO_ENUM = Arrays.stream(BrokerRegistrationInControlledShutdownChange.values()). collect(Collectors.toMap(v -> v.value(), Function.identity())); diff --git a/metadata/src/main/java/org/apache/kafka/metadata/BrokerState.java b/metadata/src/main/java/org/apache/kafka/metadata/BrokerState.java index 82f1215eaf562..eb96cf9235ae9 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/BrokerState.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/BrokerState.java @@ -82,7 +82,7 @@ public enum BrokerState { */ UNKNOWN((byte) 127); - private final static Map VALUES_TO_ENUMS = new HashMap<>(); + private static final Map VALUES_TO_ENUMS = new HashMap<>(); static { for (BrokerState state : BrokerState.values()) { diff --git a/metadata/src/main/java/org/apache/kafka/metadata/ListenerInfo.java b/metadata/src/main/java/org/apache/kafka/metadata/ListenerInfo.java index 6f954d12608cf..11e80ece4955b 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/ListenerInfo.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/ListenerInfo.java @@ -72,8 +72,8 @@ * in the port which is chosen at runtime. The withEphemeralPortsCorrected resolves this by filling * in the missing information for ephemeral ports. */ -final public class ListenerInfo { - private final static Logger log = LoggerFactory.getLogger(ListenerInfo.class); +public final class ListenerInfo { + private static final Logger log = LoggerFactory.getLogger(ListenerInfo.class); /** * Create a ListenerInfo from data in a ControllerRegistrationRequest RPC. diff --git a/metadata/src/main/java/org/apache/kafka/metadata/PartitionRegistration.java b/metadata/src/main/java/org/apache/kafka/metadata/PartitionRegistration.java index 72476cf206cda..97b77ecd7c34a 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/PartitionRegistration.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/PartitionRegistration.java @@ -41,7 +41,7 @@ public class PartitionRegistration { /** * A builder class which creates a PartitionRegistration. */ - static public class Builder { + public static class Builder { private int[] replicas; private Uuid[] directories; private int[] isr; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/Replicas.java b/metadata/src/main/java/org/apache/kafka/metadata/Replicas.java index 9a923900e6a8b..4977af201af61 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/Replicas.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/Replicas.java @@ -28,7 +28,7 @@ public class Replicas { /** * An empty replica array. */ - public final static int[] NONE = new int[0]; + public static final int[] NONE = new int[0]; /** * Convert an array of integers to a list of ints. diff --git a/metadata/src/main/java/org/apache/kafka/metadata/VersionRange.java b/metadata/src/main/java/org/apache/kafka/metadata/VersionRange.java index ed0648bef51d0..18c37db8e5054 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/VersionRange.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/VersionRange.java @@ -23,7 +23,7 @@ * An immutable class which represents version ranges. */ public class VersionRange { - public final static VersionRange ALL = of((short) 0, Short.MAX_VALUE); + public static final VersionRange ALL = of((short) 0, Short.MAX_VALUE); private final short min; private final short max; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAcl.java b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAcl.java index 3fe8ac70da57a..8817b93bae4c6 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAcl.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAcl.java @@ -33,7 +33,7 @@ /** * A Kafka ACLs which is identified by a UUID and stored in the metadata log. */ -final public class StandardAcl implements Comparable { +public final class StandardAcl implements Comparable { public static StandardAcl fromRecord(AccessControlEntryRecord record) { return new StandardAcl( ResourceType.fromCode(record.resourceType()), diff --git a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAclWithId.java b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAclWithId.java index 986e251e24fc8..822a7752e0e0a 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAclWithId.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAclWithId.java @@ -27,7 +27,7 @@ /** * A tuple of (id, acl) */ -final public class StandardAclWithId { +public final class StandardAclWithId { public static StandardAclWithId fromRecord(AccessControlEntryRecord record) { return new StandardAclWithId(record.id(), StandardAcl.fromRecord(record)); } diff --git a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizer.java b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizer.java index 106f6aba94990..ce6de613586af 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizer.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizer.java @@ -49,9 +49,9 @@ * configured. */ public class StandardAuthorizer implements ClusterMetadataAuthorizer { - public final static String SUPER_USERS_CONFIG = "super.users"; + public static final String SUPER_USERS_CONFIG = "super.users"; - public final static String ALLOW_EVERYONE_IF_NO_ACL_IS_FOUND_CONFIG = "allow.everyone.if.no.acl.found"; + public static final String ALLOW_EVERYONE_IF_NO_ACL_IS_FOUND_CONFIG = "allow.everyone.if.no.acl.found"; /** * A future which is completed once we have loaded up to the initial high watermark. diff --git a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java index 4c796f9eade73..147e2bcd91321 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java @@ -81,14 +81,14 @@ public long nextPollTimeMs() { } } - private final static Consumer NO_OP_HANDLER = ex -> { }; + private static final Consumer NO_OP_HANDLER = ex -> { }; /** * When waiting for the metadata layer to commit batches, we block the migration driver thread for this * amount of time. A large value is selected to avoid timeouts in the common case, but prevent us from * blocking indefinitely. */ - final static int METADATA_COMMIT_MAX_WAIT_MS = 300_000; + static final int METADATA_COMMIT_MAX_WAIT_MS = 300_000; private final Time time; private final Logger log; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/placement/StripedReplicaPlacer.java b/metadata/src/main/java/org/apache/kafka/metadata/placement/StripedReplicaPlacer.java index 9203c1a7111d5..5cff0f668894a 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/placement/StripedReplicaPlacer.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/placement/StripedReplicaPlacer.java @@ -120,7 +120,7 @@ public class StripedReplicaPlacer implements ReplicaPlacer { * A list of brokers that we can iterate through. */ static class BrokerList { - final static BrokerList EMPTY = new BrokerList(); + static final BrokerList EMPTY = new BrokerList(); private final List brokers = new ArrayList<>(0); /** diff --git a/metadata/src/test/java/org/apache/kafka/controller/ClientQuotaControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ClientQuotaControlManagerTest.java index a9d4cbfc6f60f..cc455ceff2588 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ClientQuotaControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ClientQuotaControlManagerTest.java @@ -422,7 +422,7 @@ private static void testConfigKeysError( assertEquals(expectedError, ClientQuotaControlManager.configKeysForEntityType(entity, output)); } - private final static HashMap VALID_CLIENT_ID_QUOTA_KEYS; + private static final HashMap VALID_CLIENT_ID_QUOTA_KEYS; static { VALID_CLIENT_ID_QUOTA_KEYS = new HashMap<>(); diff --git a/metadata/src/test/java/org/apache/kafka/controller/PartitionChangeBuilderTest.java b/metadata/src/test/java/org/apache/kafka/controller/PartitionChangeBuilderTest.java index db3d1e162b361..8bb1707b0f112 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/PartitionChangeBuilderTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/PartitionChangeBuilderTest.java @@ -116,7 +116,7 @@ public void testChangeRecordIsNoOp() { setPartitionEpoch(200). build(); - private final static Uuid FOO_ID = Uuid.fromString("FbrrdcfiR-KC2CPSTHaJrg"); + private static final Uuid FOO_ID = Uuid.fromString("FbrrdcfiR-KC2CPSTHaJrg"); private static MetadataVersion metadataVersionForPartitionChangeRecordVersion(short version) { switch (version) { @@ -169,7 +169,7 @@ private static PartitionChangeBuilder createFooBuilder(short version) { setPartitionEpoch(200). build(); - private final static Uuid BAR_ID = Uuid.fromString("LKfUsCBnQKekvL9O5dY9nw"); + private static final Uuid BAR_ID = Uuid.fromString("LKfUsCBnQKekvL9O5dY9nw"); private static boolean isElrEnabled(short partitionChangeRecordVersion) { return partitionChangeRecordVersion >= 2; @@ -200,7 +200,7 @@ private static PartitionChangeBuilder createBarBuilder(short version) { setPartitionEpoch(200). build(); - private final static Uuid BAZ_ID = Uuid.fromString("wQzt5gkSTwuQNXZF5gIw7A"); + private static final Uuid BAZ_ID = Uuid.fromString("wQzt5gkSTwuQNXZF5gIw7A"); private static PartitionChangeBuilder createBazBuilder(short version) { return new PartitionChangeBuilder(BAZ, @@ -243,7 +243,7 @@ private static PartitionChangeBuilder createBazBuilder(short version) { setPartitionEpoch(200). build(); - private final static Uuid OFFLINE_ID = Uuid.fromString("LKfUsCBnQKekvL9O5dY9nw"); + private static final Uuid OFFLINE_ID = Uuid.fromString("LKfUsCBnQKekvL9O5dY9nw"); private static PartitionChangeBuilder createOfflineBuilder(short partitionChangeRecordVersion) { MetadataVersion metadataVersion = diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerIntegrationTestUtils.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerIntegrationTestUtils.java index 9fbb8ee855c36..bddff88772ca5 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerIntegrationTestUtils.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerIntegrationTestUtils.java @@ -51,7 +51,7 @@ * Utility functions for use in QuorumController integration tests. */ public class QuorumControllerIntegrationTestUtils { - private final static Logger log = LoggerFactory.getLogger(QuorumControllerIntegrationTestUtils.class); + private static final Logger log = LoggerFactory.getLogger(QuorumControllerIntegrationTestUtils.class); BrokerRegistrationRequestData.FeatureCollection brokerFeatures() { return brokerFeatures(MetadataVersion.MINIMUM_KRAFT_VERSION, MetadataVersion.latestTesting()); diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java index 1b18c9648de4f..566f22f1b13d7 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java @@ -175,7 +175,7 @@ @Timeout(value = 40) public class QuorumControllerTest { - private final static Logger log = LoggerFactory.getLogger(QuorumControllerTest.class); + private static final Logger log = LoggerFactory.getLogger(QuorumControllerTest.class); static final BootstrapMetadata SIMPLE_BOOTSTRAP = BootstrapMetadata. fromVersion(MetadataVersion.IBP_3_7_IV0, "test-provided bootstrap"); @@ -1346,7 +1346,7 @@ public void close() throws Exception { } } - private final static List PRE_PRODUCTION_RECORDS = + private static final List PRE_PRODUCTION_RECORDS = Collections.unmodifiableList(Arrays.asList( new ApiMessageAndVersion(new RegisterBrokerRecord(). setBrokerEpoch(42). @@ -1363,7 +1363,7 @@ public void close() throws Exception { setTopicId(Uuid.fromString("cxBT72dK4si8Ied1iP4wBA")), (short) 0))); - private final static BootstrapMetadata COMPLEX_BOOTSTRAP = BootstrapMetadata.fromRecords( + private static final BootstrapMetadata COMPLEX_BOOTSTRAP = BootstrapMetadata.fromRecords( Arrays.asList( new ApiMessageAndVersion(new FeatureLevelRecord(). setName(MetadataVersion.FEATURE_NAME). @@ -1775,7 +1775,7 @@ public void testActivationRecordsPartialTransactionNoSupport() { ); } - private final static List ZK_MIGRATION_RECORDS = + private static final List ZK_MIGRATION_RECORDS = Collections.unmodifiableList(Arrays.asList( new ApiMessageAndVersion(new TopicRecord(). setName("spam"). diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumFeaturesTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumFeaturesTest.java index 099acea2de4be..64efb92e708eb 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumFeaturesTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumFeaturesTest.java @@ -36,9 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class QuorumFeaturesTest { - private final static Map LOCAL; + private static final Map LOCAL; - private final static QuorumFeatures QUORUM_FEATURES; + private static final QuorumFeatures QUORUM_FEATURES; static { Map local = new HashMap<>(); diff --git a/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java index a5cfcce07b00f..6829c3720270f 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java @@ -161,8 +161,8 @@ @Timeout(40) public class ReplicationControlManagerTest { - private final static Logger log = LoggerFactory.getLogger(ReplicationControlManagerTest.class); - private final static int BROKER_SESSION_TIMEOUT_MS = 1000; + private static final Logger log = LoggerFactory.getLogger(ReplicationControlManagerTest.class); + private static final int BROKER_SESSION_TIMEOUT_MS = 1000; private static class ReplicationControlTestContext { private static class Builder { @@ -1703,7 +1703,7 @@ public void testValidateBadManualPartitionAssignments() { OptionalInt.of(3))).getMessage()); } - private final static ListPartitionReassignmentsResponseData NONE_REASSIGNING = + private static final ListPartitionReassignmentsResponseData NONE_REASSIGNING = new ListPartitionReassignmentsResponseData().setErrorMessage(null); @ParameterizedTest diff --git a/metadata/src/test/java/org/apache/kafka/image/AclsImageTest.java b/metadata/src/test/java/org/apache/kafka/image/AclsImageTest.java index 9302713876502..5ba2716e24e09 100644 --- a/metadata/src/test/java/org/apache/kafka/image/AclsImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/AclsImageTest.java @@ -40,13 +40,13 @@ @Timeout(value = 40) public class AclsImageTest { - public final static AclsImage IMAGE1; + public static final AclsImage IMAGE1; - public final static List DELTA1_RECORDS; + public static final List DELTA1_RECORDS; - final static AclsDelta DELTA1; + static final AclsDelta DELTA1; - final static AclsImage IMAGE2; + static final AclsImage IMAGE2; static { Map map = new HashMap<>(); diff --git a/metadata/src/test/java/org/apache/kafka/image/ClientQuotasImageTest.java b/metadata/src/test/java/org/apache/kafka/image/ClientQuotasImageTest.java index 3b9fd83910b4f..02602019bdbef 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ClientQuotasImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ClientQuotasImageTest.java @@ -43,13 +43,13 @@ @Timeout(value = 40) public class ClientQuotasImageTest { - public final static ClientQuotasImage IMAGE1; + public static final ClientQuotasImage IMAGE1; - public final static List DELTA1_RECORDS; + public static final List DELTA1_RECORDS; - final static ClientQuotasDelta DELTA1; + static final ClientQuotasDelta DELTA1; - final static ClientQuotasImage IMAGE2; + static final ClientQuotasImage IMAGE2; static { Map entities1 = new HashMap<>(); diff --git a/metadata/src/test/java/org/apache/kafka/image/ConfigurationsImageTest.java b/metadata/src/test/java/org/apache/kafka/image/ConfigurationsImageTest.java index 995a44b3f8f84..9cc7f9052d546 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ConfigurationsImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ConfigurationsImageTest.java @@ -40,13 +40,13 @@ @Timeout(value = 40) public class ConfigurationsImageTest { - public final static ConfigurationsImage IMAGE1; + public static final ConfigurationsImage IMAGE1; - public final static List DELTA1_RECORDS; + public static final List DELTA1_RECORDS; - final static ConfigurationsDelta DELTA1; + static final ConfigurationsDelta DELTA1; - final static ConfigurationsImage IMAGE2; + static final ConfigurationsImage IMAGE2; static { Map map1 = new HashMap<>(); diff --git a/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java b/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java index 7d33323b53af0..13d61ddbd7d67 100644 --- a/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java @@ -43,13 +43,13 @@ @Timeout(value = 40) public class DelegationTokenImageTest { - public final static DelegationTokenImage IMAGE1; + public static final DelegationTokenImage IMAGE1; - public final static List DELTA1_RECORDS; + public static final List DELTA1_RECORDS; - final static DelegationTokenDelta DELTA1; + static final DelegationTokenDelta DELTA1; - final static DelegationTokenImage IMAGE2; + static final DelegationTokenImage IMAGE2; static DelegationTokenData randomDelegationTokenData(String tokenId, long expireTimestamp) { TokenInformation ti = new TokenInformation( diff --git a/metadata/src/test/java/org/apache/kafka/image/FeaturesImageTest.java b/metadata/src/test/java/org/apache/kafka/image/FeaturesImageTest.java index 99e97d64757a7..c2c67f9a84f97 100644 --- a/metadata/src/test/java/org/apache/kafka/image/FeaturesImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/FeaturesImageTest.java @@ -41,13 +41,13 @@ @Timeout(value = 40) public class FeaturesImageTest { - public final static FeaturesImage IMAGE1; - public final static List DELTA1_RECORDS; - final static FeaturesDelta DELTA1; - final static FeaturesImage IMAGE2; - final static List DELTA2_RECORDS; - final static FeaturesDelta DELTA2; - final static FeaturesImage IMAGE3; + public static final FeaturesImage IMAGE1; + public static final List DELTA1_RECORDS; + static final FeaturesDelta DELTA1; + static final FeaturesImage IMAGE2; + static final List DELTA2_RECORDS; + static final FeaturesDelta DELTA2; + static final FeaturesImage IMAGE3; static { Map map1 = new HashMap<>(); diff --git a/metadata/src/test/java/org/apache/kafka/image/MetadataImageTest.java b/metadata/src/test/java/org/apache/kafka/image/MetadataImageTest.java index 0a0d97dd5585d..b2cefade5dfa6 100644 --- a/metadata/src/test/java/org/apache/kafka/image/MetadataImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/MetadataImageTest.java @@ -32,11 +32,11 @@ @Timeout(value = 40) public class MetadataImageTest { - public final static MetadataImage IMAGE1; + public static final MetadataImage IMAGE1; - public final static MetadataDelta DELTA1; + public static final MetadataDelta DELTA1; - public final static MetadataImage IMAGE2; + public static final MetadataImage IMAGE2; static { IMAGE1 = new MetadataImage( diff --git a/metadata/src/test/java/org/apache/kafka/image/MetadataVersionChangeTest.java b/metadata/src/test/java/org/apache/kafka/image/MetadataVersionChangeTest.java index decf6d315f6aa..2fd869d715225 100644 --- a/metadata/src/test/java/org/apache/kafka/image/MetadataVersionChangeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/MetadataVersionChangeTest.java @@ -30,10 +30,10 @@ @Timeout(value = 40) public class MetadataVersionChangeTest { - private final static MetadataVersionChange CHANGE_3_0_IV1_TO_3_3_IV0 = + private static final MetadataVersionChange CHANGE_3_0_IV1_TO_3_3_IV0 = new MetadataVersionChange(IBP_3_0_IV1, IBP_3_3_IV0); - private final static MetadataVersionChange CHANGE_3_3_IV0_TO_3_0_IV1 = + private static final MetadataVersionChange CHANGE_3_3_IV0_TO_3_0_IV1 = new MetadataVersionChange(IBP_3_3_IV0, IBP_3_0_IV1); @Test diff --git a/metadata/src/test/java/org/apache/kafka/image/ProducerIdsImageTest.java b/metadata/src/test/java/org/apache/kafka/image/ProducerIdsImageTest.java index 32d42efda7a8c..a99e90bdc7f00 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ProducerIdsImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ProducerIdsImageTest.java @@ -34,13 +34,13 @@ @Timeout(value = 40) public class ProducerIdsImageTest { - public final static ProducerIdsImage IMAGE1; + public static final ProducerIdsImage IMAGE1; - final static List DELTA1_RECORDS; + static final List DELTA1_RECORDS; - final static ProducerIdsDelta DELTA1; + static final ProducerIdsDelta DELTA1; - final static ProducerIdsImage IMAGE2; + static final ProducerIdsImage IMAGE2; static { IMAGE1 = new ProducerIdsImage(123); diff --git a/metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java b/metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java index 26f860579e07d..56f9846673c5b 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java @@ -45,13 +45,13 @@ @Timeout(value = 40) public class ScramImageTest { - public final static ScramImage IMAGE1; + public static final ScramImage IMAGE1; - public final static List DELTA1_RECORDS; + public static final List DELTA1_RECORDS; - final static ScramDelta DELTA1; + static final ScramDelta DELTA1; - final static ScramImage IMAGE2; + static final ScramImage IMAGE2; static byte[] randomBuffer(Random random, int length) { byte[] buf = new byte[length]; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageBrokersNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageBrokersNodeTest.java index 23d943a160318..58c43dc257c33 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageBrokersNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageBrokersNodeTest.java @@ -49,7 +49,7 @@ public class ClusterImageBrokersNodeTest { setInControlledShutdown(false).build()), Collections.emptyMap()); - private final static ClusterImageBrokersNode NODE = new ClusterImageBrokersNode(TEST_IMAGE); + private static final ClusterImageBrokersNode NODE = new ClusterImageBrokersNode(TEST_IMAGE); @Test public void testChildNames() { diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageControllersNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageControllersNodeTest.java index 3d347ec3178f4..8004802359cc6 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageControllersNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageControllersNodeTest.java @@ -46,7 +46,7 @@ public class ClusterImageControllersNodeTest { setListeners(Collections.emptyMap()). build())); - private final static ClusterImageControllersNode NODE = new ClusterImageControllersNode(TEST_IMAGE); + private static final ClusterImageControllersNode NODE = new ClusterImageControllersNode(TEST_IMAGE); @Test public void testChildNames() { diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageNodeTest.java index f56e13100b8e9..64a50aa072c5f 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageNodeTest.java @@ -30,7 +30,7 @@ @Timeout(value = 40) public class ClusterImageNodeTest { - private final static ClusterImageNode NODE = new ClusterImageNode(ClusterImage.EMPTY); + private static final ClusterImageNode NODE = new ClusterImageNode(ClusterImage.EMPTY); @Test public void testChildNames() { diff --git a/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java index 83855d94b8c48..39f98b1f74bfb 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java @@ -32,7 +32,7 @@ @Timeout(value = 40) public class TopicImageNodeTest { - private final static TopicImageNode NODE = new TopicImageNode(new TopicImage("topic-image-node-test-topic", Uuid.ZERO_UUID, Collections.emptyMap())); + private static final TopicImageNode NODE = new TopicImageNode(new TopicImage("topic-image-node-test-topic", Uuid.ZERO_UUID, Collections.emptyMap())); @Test public void testChildNames() { diff --git a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java index ebbe52d24e014..54f634a3f02c7 100644 --- a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java @@ -88,7 +88,7 @@ static LogDeltaManifest.Builder logDeltaManifestBuilder() { .numBytes(100); } - private final static MetadataDelta TEST_DELTA; + private static final MetadataDelta TEST_DELTA; static { TEST_DELTA = new MetadataDelta.Builder(). @@ -97,7 +97,7 @@ static LogDeltaManifest.Builder logDeltaManifestBuilder() { TEST_DELTA.replay(RecordTestUtils.testRecord(0).message()); } - private final static MetadataImage TEST_IMAGE = TEST_DELTA.apply(MetadataProvenance.EMPTY); + private static final MetadataImage TEST_IMAGE = TEST_DELTA.apply(MetadataProvenance.EMPTY); @Test public void testCreateSnapshot() throws Exception { diff --git a/metadata/src/test/java/org/apache/kafka/metadata/LeaderRecoveryStateTest.java b/metadata/src/test/java/org/apache/kafka/metadata/LeaderRecoveryStateTest.java index 45268dfbc3d55..5e1513b1e0e5d 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/LeaderRecoveryStateTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/LeaderRecoveryStateTest.java @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -final public class LeaderRecoveryStateTest { +public final class LeaderRecoveryStateTest { private static final byte NO_CHANGE = (byte) -1; @Test diff --git a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclTest.java b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclTest.java index d8ab89f08a574..e2264eb7db2d0 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclTest.java @@ -37,7 +37,7 @@ @Timeout(value = 40) public class StandardAclTest { - public final static List TEST_ACLS = new ArrayList<>(); + public static final List TEST_ACLS = new ArrayList<>(); static { TEST_ACLS.add(new StandardAcl( diff --git a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclWithIdTest.java b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclWithIdTest.java index c44861ffe8b97..c4393f5ed590d 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclWithIdTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclWithIdTest.java @@ -31,7 +31,7 @@ @Timeout(value = 40) public class StandardAclWithIdTest { - public final static List TEST_ACLS = new ArrayList<>(); + public static final List TEST_ACLS = new ArrayList<>(); static { TEST_ACLS.add(new StandardAclWithId(Uuid.fromString("QZDDv-R7SyaPgetDPGd0Mw"), diff --git a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerTest.java b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerTest.java index a186cc60ff4f9..25ebf65b1823e 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerTest.java @@ -254,7 +254,7 @@ static StandardAuthorizer createAndInitializeStandardAuthorizer() { return authorizer; } - private final static AtomicLong NEXT_ID = new AtomicLong(0); + private static final AtomicLong NEXT_ID = new AtomicLong(0); static StandardAcl newFooAcl(AclOperation op, AclPermissionType permission) { return new StandardAcl( diff --git a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java index 4f5ff6ec8ffa7..0a3d4d6f9dbfc 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java @@ -38,7 +38,7 @@ @Timeout(40) public class BootstrapDirectoryTest { - final static List SAMPLE_RECORDS1 = unmodifiableList(asList( + static final List SAMPLE_RECORDS1 = unmodifiableList(asList( new ApiMessageAndVersion(new FeatureLevelRecord(). setName(MetadataVersion.FEATURE_NAME). setFeatureLevel((short) 7), (short) 0), diff --git a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java index f22351f10fbaf..682be9516ea9f 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java @@ -38,7 +38,7 @@ @Timeout(60) public class BootstrapMetadataTest { - final static List SAMPLE_RECORDS1 = unmodifiableList(asList( + static final List SAMPLE_RECORDS1 = unmodifiableList(asList( new ApiMessageAndVersion(new FeatureLevelRecord(). setName(FEATURE_NAME). setFeatureLevel((short) 7), (short) 0), @@ -76,7 +76,7 @@ public void testCopyWithOnlyVersion() { BootstrapMetadata.fromRecords(SAMPLE_RECORDS1, "baz").copyWithOnlyVersion()); } - final static List RECORDS_WITH_OLD_METADATA_VERSION = unmodifiableList(asList( + static final List RECORDS_WITH_OLD_METADATA_VERSION = unmodifiableList(asList( new ApiMessageAndVersion(new FeatureLevelRecord(). setName(FEATURE_NAME). setFeatureLevel(IBP_3_0_IV1.featureLevel()), (short) 0))); diff --git a/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationDriverTest.java b/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationDriverTest.java index dea5e62db969d..3dbed8c69c1d3 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationDriverTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationDriverTest.java @@ -87,7 +87,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class KRaftMigrationDriverTest { - private final static QuorumFeatures QUORUM_FEATURES = new QuorumFeatures(4, + private static final QuorumFeatures QUORUM_FEATURES = new QuorumFeatures(4, QuorumFeatures.defaultFeatureMap(true), Arrays.asList(4, 5, 6)); diff --git a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java index 6266df68065a0..51193aa9d6299 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java @@ -50,7 +50,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -final public class MetaPropertiesEnsembleTest { +public final class MetaPropertiesEnsembleTest { private static final MetaPropertiesEnsemble FOO = new MetaPropertiesEnsemble( new HashSet<>(Arrays.asList("/tmp/empty1", "/tmp/empty2")), @@ -294,7 +294,7 @@ public void testMetaPropertiesEnsembleLoadError() throws IOException { assertEquals(1, metaPropertiesEnsemble.logDirProps().size()); } - static private void verifyCopy( + private static void verifyCopy( MetaPropertiesEnsemble expected, MetaPropertiesEnsemble.Copier copier ) { @@ -393,7 +393,7 @@ public void testCopierVerificationFailsOnErrorAndLogDirsOverlap() { assertThrows(RuntimeException.class, () -> copier.verify()).getMessage()); } - private final static List SAMPLE_META_PROPS_LIST = Arrays.asList( + private static final List SAMPLE_META_PROPS_LIST = Arrays.asList( new MetaProperties.Builder(). setVersion(MetaPropertiesVersion.V1). setClusterId("AtgGav8yQjiaJ3rTXE7VCA"). diff --git a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesTest.java b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesTest.java index c440965d4a5ab..44dd24497cfa6 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesTest.java @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -final public class MetaPropertiesTest { +public final class MetaPropertiesTest { @Test public void testV0SerializationWithNothing() { testV0Serialization(Optional.empty(), diff --git a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesVersionTest.java b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesVersionTest.java index 6fb017213a5da..6c8841e9bcb35 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesVersionTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesVersionTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -final public class MetaPropertiesVersionTest { +public final class MetaPropertiesVersionTest { @Test public void testV0ToNumber() { assertEquals(0, MetaPropertiesVersion.V0.number()); diff --git a/metadata/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java b/metadata/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java index 2b9f6d5b13c36..a633a7c66bf0b 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -final public class PropertiesUtilsTest { +public final class PropertiesUtilsTest { @Test public void testReadPropertiesFile() throws IOException { File tempFile = TestUtils.tempFile(); diff --git a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java index d2de01b824d4c..c03530192c106 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -final public class BatchFileWriterReaderTest { +public final class BatchFileWriterReaderTest { @Test public void testHeaderFooter() throws Exception { File tempFile = TestUtils.tempFile(); diff --git a/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java b/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java index 631d440ddf362..9fb77ad96805f 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -final public class RecordRedactorTest { +public final class RecordRedactorTest { public static final Map CONFIGS = new HashMap<>(); static { diff --git a/raft/src/main/java/org/apache/kafka/raft/ValidOffsetAndEpoch.java b/raft/src/main/java/org/apache/kafka/raft/ValidOffsetAndEpoch.java index 320e3d9ca2e0c..1de7bffb9ab9c 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ValidOffsetAndEpoch.java +++ b/raft/src/main/java/org/apache/kafka/raft/ValidOffsetAndEpoch.java @@ -19,8 +19,8 @@ import java.util.Objects; public final class ValidOffsetAndEpoch { - final private Kind kind; - final private OffsetAndEpoch offsetAndEpoch; + private final Kind kind; + private final OffsetAndEpoch offsetAndEpoch; private ValidOffsetAndEpoch(Kind kind, OffsetAndEpoch offsetAndEpoch) { this.kind = kind; diff --git a/raft/src/main/java/org/apache/kafka/raft/errors/BufferAllocationException.java b/raft/src/main/java/org/apache/kafka/raft/errors/BufferAllocationException.java index ecd36b313516d..7735dfc0c13f2 100644 --- a/raft/src/main/java/org/apache/kafka/raft/errors/BufferAllocationException.java +++ b/raft/src/main/java/org/apache/kafka/raft/errors/BufferAllocationException.java @@ -21,7 +21,7 @@ */ public class BufferAllocationException extends RaftException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public BufferAllocationException(String s) { super(s); diff --git a/raft/src/main/java/org/apache/kafka/raft/errors/NotLeaderException.java b/raft/src/main/java/org/apache/kafka/raft/errors/NotLeaderException.java index 7f737fa3a8b85..e6c0f576f15fa 100644 --- a/raft/src/main/java/org/apache/kafka/raft/errors/NotLeaderException.java +++ b/raft/src/main/java/org/apache/kafka/raft/errors/NotLeaderException.java @@ -22,7 +22,7 @@ */ public class NotLeaderException extends RaftException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public NotLeaderException(String s) { super(s); diff --git a/raft/src/main/java/org/apache/kafka/raft/errors/RaftException.java b/raft/src/main/java/org/apache/kafka/raft/errors/RaftException.java index 6df196bbd08f2..5d21e53f4179c 100644 --- a/raft/src/main/java/org/apache/kafka/raft/errors/RaftException.java +++ b/raft/src/main/java/org/apache/kafka/raft/errors/RaftException.java @@ -23,7 +23,7 @@ */ public class RaftException extends KafkaException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public RaftException(String s) { super(s); diff --git a/raft/src/main/java/org/apache/kafka/raft/errors/UnexpectedBaseOffsetException.java b/raft/src/main/java/org/apache/kafka/raft/errors/UnexpectedBaseOffsetException.java index 192e8b2bb66ce..ccf34de4046d4 100644 --- a/raft/src/main/java/org/apache/kafka/raft/errors/UnexpectedBaseOffsetException.java +++ b/raft/src/main/java/org/apache/kafka/raft/errors/UnexpectedBaseOffsetException.java @@ -21,7 +21,7 @@ * unexpected base offset. */ public class UnexpectedBaseOffsetException extends RaftException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public UnexpectedBaseOffsetException(String s) { super(s); diff --git a/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotWriter.java b/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotWriter.java index 818a346ac0aef..0c6ea10825442 100644 --- a/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotWriter.java +++ b/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotWriter.java @@ -33,11 +33,11 @@ import java.util.OptionalLong; import java.util.function.Supplier; -final public class RecordsSnapshotWriter implements SnapshotWriter { - final private RawSnapshotWriter snapshot; - final private BatchAccumulator accumulator; - final private Time time; - final private long lastContainedLogTimestamp; +public final class RecordsSnapshotWriter implements SnapshotWriter { + private final RawSnapshotWriter snapshot; + private final BatchAccumulator accumulator; + private final Time time; + private final long lastContainedLogTimestamp; private RecordsSnapshotWriter( RawSnapshotWriter snapshot, diff --git a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientSnapshotTest.java b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientSnapshotTest.java index 07d8b5a0d6e6f..64283fc580a2e 100644 --- a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientSnapshotTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientSnapshotTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; -final public class KafkaRaftClientSnapshotTest { +public final class KafkaRaftClientSnapshotTest { @Test public void testLatestSnapshotId() throws Exception { int localId = 0; @@ -1961,7 +1961,7 @@ private static SnapshotWriter snapshotWriter(RaftClientTestContext conte ); } - private final static class MemorySnapshotWriter implements RawSnapshotWriter { + private static final class MemorySnapshotWriter implements RawSnapshotWriter { private final OffsetAndEpoch snapshotId; private ByteBuffer data; private AtomicLong frozenPosition; diff --git a/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java b/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java index c6c7cb8949dd2..8345e7201dc9f 100644 --- a/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java @@ -379,7 +379,7 @@ private void schedulePolling(EventScheduler scheduler, } } - private static abstract class Event implements Comparable { + private abstract static class Event implements Comparable { final int eventId; final long deadlineMs; final Runnable action; diff --git a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java index d081e886520ca..c1ffadda45455 100644 --- a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java +++ b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java @@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -final public class SnapshotWriterReaderTest { +public final class SnapshotWriterReaderTest { private final int localId = 0; private final Set voters = Collections.singleton(localId); diff --git a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java index 57aca28220f28..e8f3cff8b254d 100644 --- a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java +++ b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotsTest.java @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -final public class SnapshotsTest { +public final class SnapshotsTest { @Test public void testValidSnapshotFilename() { diff --git a/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java b/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java index 72d8026824adb..8914931448d83 100644 --- a/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java +++ b/server-common/src/main/java/org/apache/kafka/queue/EventQueue.java @@ -127,7 +127,7 @@ public OptionalLong apply(OptionalLong prevDeadlineNs) { } class VoidEvent implements Event { - public final static VoidEvent INSTANCE = new VoidEvent(); + public static final VoidEvent INSTANCE = new VoidEvent(); @Override public void run() throws Exception { diff --git a/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfigs.java b/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfigs.java index 88b49b82827e4..36332e1aa3770 100644 --- a/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfigs.java +++ b/server-common/src/main/java/org/apache/kafka/server/config/QuotaConfigs.java @@ -98,7 +98,7 @@ public class QuotaConfigs { public static final int IP_CONNECTION_RATE_DEFAULT = Integer.MAX_VALUE; - private final static Set USER_AND_CLIENT_QUOTA_NAMES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( + private static final Set USER_AND_CLIENT_QUOTA_NAMES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( PRODUCER_BYTE_RATE_OVERRIDE_CONFIG, CONSUMER_BYTE_RATE_OVERRIDE_CONFIG, REQUEST_PERCENTAGE_OVERRIDE_CONFIG, diff --git a/server-common/src/main/java/org/apache/kafka/server/fault/ProcessTerminatingFaultHandler.java b/server-common/src/main/java/org/apache/kafka/server/fault/ProcessTerminatingFaultHandler.java index a15c924c98b18..943de3ca34ed1 100644 --- a/server-common/src/main/java/org/apache/kafka/server/fault/ProcessTerminatingFaultHandler.java +++ b/server-common/src/main/java/org/apache/kafka/server/fault/ProcessTerminatingFaultHandler.java @@ -25,7 +25,7 @@ /** * This is a fault handler which terminates the JVM process. */ -final public class ProcessTerminatingFaultHandler implements FaultHandler { +public final class ProcessTerminatingFaultHandler implements FaultHandler { private static final Logger log = LoggerFactory.getLogger(ProcessTerminatingFaultHandler.class); private final Runnable action; diff --git a/server-common/src/main/java/org/apache/kafka/server/mutable/BoundedListTooLongException.java b/server-common/src/main/java/org/apache/kafka/server/mutable/BoundedListTooLongException.java index 336d48e508b05..30e43fe839766 100644 --- a/server-common/src/main/java/org/apache/kafka/server/mutable/BoundedListTooLongException.java +++ b/server-common/src/main/java/org/apache/kafka/server/mutable/BoundedListTooLongException.java @@ -21,7 +21,7 @@ * An exception that is thrown when the BoundedList cannot add any more elements. */ public class BoundedListTooLongException extends RuntimeException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public BoundedListTooLongException(String message) { super(message); diff --git a/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java b/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java index e51f6cd321f71..6ffd5f7950193 100644 --- a/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java +++ b/server-common/src/main/java/org/apache/kafka/server/util/CommandLineUtils.java @@ -198,7 +198,7 @@ public static void maybeMergeOptions(Properties props, String key, OptionSet } static class InitializeBootstrapException extends RuntimeException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; InitializeBootstrapException(String message) { super(message); diff --git a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java index 56462c3aff5bb..9f484185602cd 100644 --- a/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java +++ b/server-common/src/main/java/org/apache/kafka/timeline/SnapshotRegistry.java @@ -33,7 +33,7 @@ * Therefore, we use ArrayLists here rather than a data structure with higher overhead. */ public class SnapshotRegistry { - public final static long LATEST_EPOCH = Long.MAX_VALUE; + public static final long LATEST_EPOCH = Long.MAX_VALUE; /** * Iterate through the list of snapshots in order of creation, such that older diff --git a/server-common/src/main/java/org/apache/kafka/timeline/SnapshottableHashTable.java b/server-common/src/main/java/org/apache/kafka/timeline/SnapshottableHashTable.java index 26f8f245964d9..8fb3dbd50d320 100644 --- a/server-common/src/main/java/org/apache/kafka/timeline/SnapshottableHashTable.java +++ b/server-common/src/main/java/org/apache/kafka/timeline/SnapshottableHashTable.java @@ -92,7 +92,7 @@ class SnapshottableHashTable { assertEquals(1, statusCode); diff --git a/server-common/src/test/java/org/apache/kafka/server/network/EndpointReadyFuturesTest.java b/server-common/src/test/java/org/apache/kafka/server/network/EndpointReadyFuturesTest.java index 2d76e5df37dbd..c15ed5ebef10a 100644 --- a/server-common/src/test/java/org/apache/kafka/server/network/EndpointReadyFuturesTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/network/EndpointReadyFuturesTest.java @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -final public class EndpointReadyFuturesTest { +public final class EndpointReadyFuturesTest { private static final Endpoint EXTERNAL = new Endpoint("EXTERNAL", SecurityProtocol.SSL, "127.0.0.1", 9092); diff --git a/server-common/src/test/java/org/apache/kafka/server/util/CommandLineUtilsTest.java b/server-common/src/test/java/org/apache/kafka/server/util/CommandLineUtilsTest.java index e52f39cf846a6..0d2e754b81ff1 100644 --- a/server-common/src/test/java/org/apache/kafka/server/util/CommandLineUtilsTest.java +++ b/server-common/src/test/java/org/apache/kafka/server/util/CommandLineUtilsTest.java @@ -226,7 +226,7 @@ public void testMaybeMergeOptionsNotOverwriteExisting() { assertEquals("500", props.get("iondkey")); } - static private Properties createTestProps() { + private static Properties createTestProps() { Properties props = new Properties(); props.setProperty("bootstrap.servers", "this"); props.setProperty("bootstrap.controllers", "that"); diff --git a/server/src/main/java/org/apache/kafka/server/config/KafkaSecurityConfigs.java b/server/src/main/java/org/apache/kafka/server/config/KafkaSecurityConfigs.java index 271ed16887084..1934844fc3365 100644 --- a/server/src/main/java/org/apache/kafka/server/config/KafkaSecurityConfigs.java +++ b/server/src/main/java/org/apache/kafka/server/config/KafkaSecurityConfigs.java @@ -37,203 +37,203 @@ public class KafkaSecurityConfigs { /** ********* SSL Configuration ****************/ - public final static String SSL_PROTOCOL_CONFIG = SslConfigs.SSL_PROTOCOL_CONFIG; - public final static String SSL_PROTOCOL_DOC = SslConfigs.SSL_PROTOCOL_DOC; + public static final String SSL_PROTOCOL_CONFIG = SslConfigs.SSL_PROTOCOL_CONFIG; + public static final String SSL_PROTOCOL_DOC = SslConfigs.SSL_PROTOCOL_DOC; public static final String SSL_PROTOCOL_DEFAULT = SslConfigs.DEFAULT_SSL_PROTOCOL; - public final static String SSL_PROVIDER_CONFIG = SslConfigs.SSL_PROVIDER_CONFIG; - public final static String SSL_PROVIDER_DOC = SslConfigs.SSL_PROVIDER_DOC; + public static final String SSL_PROVIDER_CONFIG = SslConfigs.SSL_PROVIDER_CONFIG; + public static final String SSL_PROVIDER_DOC = SslConfigs.SSL_PROVIDER_DOC; - public final static String SSL_CIPHER_SUITES_CONFIG = SslConfigs.SSL_CIPHER_SUITES_CONFIG; - public final static String SSL_CIPHER_SUITES_DOC = SslConfigs.SSL_CIPHER_SUITES_DOC; + public static final String SSL_CIPHER_SUITES_CONFIG = SslConfigs.SSL_CIPHER_SUITES_CONFIG; + public static final String SSL_CIPHER_SUITES_DOC = SslConfigs.SSL_CIPHER_SUITES_DOC; - public final static String SSL_ENABLED_PROTOCOLS_CONFIG = SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG; - public final static String SSL_ENABLED_PROTOCOLS_DOC = SslConfigs.SSL_ENABLED_PROTOCOLS_DOC; + public static final String SSL_ENABLED_PROTOCOLS_CONFIG = SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG; + public static final String SSL_ENABLED_PROTOCOLS_DOC = SslConfigs.SSL_ENABLED_PROTOCOLS_DOC; public static final String SSL_ENABLED_PROTOCOLS_DEFAULTS = SslConfigs.DEFAULT_SSL_ENABLED_PROTOCOLS; - public final static String SSL_KEYSTORE_TYPE_CONFIG = SslConfigs.SSL_KEYSTORE_TYPE_CONFIG; - public final static String SSL_KEYSTORE_TYPE_DOC = SslConfigs.SSL_KEYSTORE_TYPE_DOC; + public static final String SSL_KEYSTORE_TYPE_CONFIG = SslConfigs.SSL_KEYSTORE_TYPE_CONFIG; + public static final String SSL_KEYSTORE_TYPE_DOC = SslConfigs.SSL_KEYSTORE_TYPE_DOC; public static final String SSL_KEYSTORE_TYPE_DEFAULT = SslConfigs.DEFAULT_SSL_KEYSTORE_TYPE; - public final static String SSL_KEYSTORE_LOCATION_CONFIG = SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG; - public final static String SSL_KEYSTORE_LOCATION_DOC = SslConfigs.SSL_KEYSTORE_LOCATION_DOC; + public static final String SSL_KEYSTORE_LOCATION_CONFIG = SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG; + public static final String SSL_KEYSTORE_LOCATION_DOC = SslConfigs.SSL_KEYSTORE_LOCATION_DOC; - public final static String SSL_KEYSTORE_PASSWORD_CONFIG = SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG; - public final static String SSL_KEYSTORE_PASSWORD_DOC = SslConfigs.SSL_KEYSTORE_PASSWORD_DOC; + public static final String SSL_KEYSTORE_PASSWORD_CONFIG = SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG; + public static final String SSL_KEYSTORE_PASSWORD_DOC = SslConfigs.SSL_KEYSTORE_PASSWORD_DOC; - public final static String SSL_KEY_PASSWORD_CONFIG = SslConfigs.SSL_KEY_PASSWORD_CONFIG; - public final static String SSL_KEY_PASSWORD_DOC = SslConfigs.SSL_KEY_PASSWORD_DOC; + public static final String SSL_KEY_PASSWORD_CONFIG = SslConfigs.SSL_KEY_PASSWORD_CONFIG; + public static final String SSL_KEY_PASSWORD_DOC = SslConfigs.SSL_KEY_PASSWORD_DOC; - public final static String SSL_KEYSTORE_KEY_CONFIG = SslConfigs.SSL_KEYSTORE_KEY_CONFIG; - public final static String SSL_KEYSTORE_KEY_DOC = SslConfigs.SSL_KEYSTORE_KEY_DOC; + public static final String SSL_KEYSTORE_KEY_CONFIG = SslConfigs.SSL_KEYSTORE_KEY_CONFIG; + public static final String SSL_KEYSTORE_KEY_DOC = SslConfigs.SSL_KEYSTORE_KEY_DOC; - public final static String SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG = SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG; - public final static String SSL_KEYSTORE_CERTIFICATE_CHAIN_DOC = SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_DOC; - public final static String SSL_TRUSTSTORE_TYPE_CONFIG = SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG; - public final static String SSL_TRUSTSTORE_TYPE_DOC = SslConfigs.SSL_TRUSTSTORE_TYPE_DOC; + public static final String SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG = SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG; + public static final String SSL_KEYSTORE_CERTIFICATE_CHAIN_DOC = SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_DOC; + public static final String SSL_TRUSTSTORE_TYPE_CONFIG = SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG; + public static final String SSL_TRUSTSTORE_TYPE_DOC = SslConfigs.SSL_TRUSTSTORE_TYPE_DOC; public static final String SSL_TRUSTSTORE_TYPE_DEFAULT = SslConfigs.DEFAULT_SSL_TRUSTSTORE_TYPE; - public final static String SSL_TRUSTSTORE_LOCATION_CONFIG = SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG; - public final static String SSL_TRUSTSTORE_PASSWORD_DOC = SslConfigs.SSL_TRUSTSTORE_PASSWORD_DOC; + public static final String SSL_TRUSTSTORE_LOCATION_CONFIG = SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG; + public static final String SSL_TRUSTSTORE_PASSWORD_DOC = SslConfigs.SSL_TRUSTSTORE_PASSWORD_DOC; - public final static String SSL_TRUSTSTORE_PASSWORD_CONFIG = SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG; - public final static String SSL_TRUSTSTORE_LOCATION_DOC = SslConfigs.SSL_TRUSTSTORE_LOCATION_DOC; + public static final String SSL_TRUSTSTORE_PASSWORD_CONFIG = SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG; + public static final String SSL_TRUSTSTORE_LOCATION_DOC = SslConfigs.SSL_TRUSTSTORE_LOCATION_DOC; - public final static String SSL_TRUSTSTORE_CERTIFICATES_CONFIG = SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG; - public final static String SSL_TRUSTSTORE_CERTIFICATES_DOC = SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_DOC; + public static final String SSL_TRUSTSTORE_CERTIFICATES_CONFIG = SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG; + public static final String SSL_TRUSTSTORE_CERTIFICATES_DOC = SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_DOC; - public final static String SSL_KEYMANAGER_ALGORITHM_CONFIG = SslConfigs.SSL_KEYMANAGER_ALGORITHM_CONFIG; - public final static String SSL_KEYMANAGER_ALGORITHM_DOC = SslConfigs.SSL_KEYMANAGER_ALGORITHM_DOC; + public static final String SSL_KEYMANAGER_ALGORITHM_CONFIG = SslConfigs.SSL_KEYMANAGER_ALGORITHM_CONFIG; + public static final String SSL_KEYMANAGER_ALGORITHM_DOC = SslConfigs.SSL_KEYMANAGER_ALGORITHM_DOC; public static final String SSL_KEYMANAGER_ALGORITHM_DEFAULT = SslConfigs.DEFAULT_SSL_KEYMANGER_ALGORITHM; - public final static String SSL_TRUSTMANAGER_ALGORITHM_CONFIG = SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_CONFIG; - public final static String SSL_TRUSTMANAGER_ALGORITHM_DOC = SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_DOC; + public static final String SSL_TRUSTMANAGER_ALGORITHM_CONFIG = SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_CONFIG; + public static final String SSL_TRUSTMANAGER_ALGORITHM_DOC = SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_DOC; public static final String SSL_TRUSTMANAGER_ALGORITHM_DEFAULT = SslConfigs.DEFAULT_SSL_TRUSTMANAGER_ALGORITHM; - public final static String SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG = SslConfigs.SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG; - public final static String SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_DOC = SslConfigs.SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_DOC; + public static final String SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG = SslConfigs.SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG; + public static final String SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_DOC = SslConfigs.SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_DOC; public static final String SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_DEFAULT = SslConfigs.DEFAULT_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM; - public final static String SSL_SECURE_RANDOM_IMPLEMENTATION_CONFIG = SslConfigs.SSL_SECURE_RANDOM_IMPLEMENTATION_CONFIG; - public final static String SSL_SECURE_RANDOM_IMPLEMENTATION_DOC = SslConfigs.SSL_SECURE_RANDOM_IMPLEMENTATION_DOC; + public static final String SSL_SECURE_RANDOM_IMPLEMENTATION_CONFIG = SslConfigs.SSL_SECURE_RANDOM_IMPLEMENTATION_CONFIG; + public static final String SSL_SECURE_RANDOM_IMPLEMENTATION_DOC = SslConfigs.SSL_SECURE_RANDOM_IMPLEMENTATION_DOC; - public final static String SSL_CLIENT_AUTH_CONFIG = BrokerSecurityConfigs.SSL_CLIENT_AUTH_CONFIG; - public final static String SSL_CLIENT_AUTH_DOC = BrokerSecurityConfigs.SSL_CLIENT_AUTH_DOC; + public static final String SSL_CLIENT_AUTH_CONFIG = BrokerSecurityConfigs.SSL_CLIENT_AUTH_CONFIG; + public static final String SSL_CLIENT_AUTH_DOC = BrokerSecurityConfigs.SSL_CLIENT_AUTH_DOC; public static final String SSL_CLIENT_AUTH_DEFAULT = SslClientAuth.NONE.name().toLowerCase(Locale.ROOT); public static final String[] SSL_CLIENT_AUTHENTICATION_VALID_VALUES = SslClientAuth.VALUES.stream() .map(v -> v.toString().toLowerCase(Locale.ROOT)).toArray(String[]::new); - public final static String SSL_PRINCIPAL_MAPPING_RULES_CONFIG = BrokerSecurityConfigs.SSL_PRINCIPAL_MAPPING_RULES_CONFIG; - public final static String SSL_PRINCIPAL_MAPPING_RULES_DOC = BrokerSecurityConfigs.SSL_PRINCIPAL_MAPPING_RULES_DOC; + public static final String SSL_PRINCIPAL_MAPPING_RULES_CONFIG = BrokerSecurityConfigs.SSL_PRINCIPAL_MAPPING_RULES_CONFIG; + public static final String SSL_PRINCIPAL_MAPPING_RULES_DOC = BrokerSecurityConfigs.SSL_PRINCIPAL_MAPPING_RULES_DOC; public static final String SSL_PRINCIPAL_MAPPING_RULES_DEFAULT = BrokerSecurityConfigs.DEFAULT_SSL_PRINCIPAL_MAPPING_RULES; - public final static String SSL_ENGINE_FACTORY_CLASS_CONFIG = SslConfigs.SSL_ENGINE_FACTORY_CLASS_CONFIG; - public final static String SSL_ENGINE_FACTORY_CLASS_DOC = SslConfigs.SSL_ENGINE_FACTORY_CLASS_DOC; + public static final String SSL_ENGINE_FACTORY_CLASS_CONFIG = SslConfigs.SSL_ENGINE_FACTORY_CLASS_CONFIG; + public static final String SSL_ENGINE_FACTORY_CLASS_DOC = SslConfigs.SSL_ENGINE_FACTORY_CLASS_DOC; - public final static String SSL_ALLOW_DN_CHANGES_CONFIG = BrokerSecurityConfigs.SSL_ALLOW_DN_CHANGES_CONFIG; - public final static String SSL_ALLOW_DN_CHANGES_DOC = BrokerSecurityConfigs.SSL_ALLOW_DN_CHANGES_DOC; - public final static boolean SSL_ALLOW_DN_CHANGES_DEFAULT = BrokerSecurityConfigs.DEFAULT_SSL_ALLOW_DN_CHANGES_VALUE; + public static final String SSL_ALLOW_DN_CHANGES_CONFIG = BrokerSecurityConfigs.SSL_ALLOW_DN_CHANGES_CONFIG; + public static final String SSL_ALLOW_DN_CHANGES_DOC = BrokerSecurityConfigs.SSL_ALLOW_DN_CHANGES_DOC; + public static final boolean SSL_ALLOW_DN_CHANGES_DEFAULT = BrokerSecurityConfigs.DEFAULT_SSL_ALLOW_DN_CHANGES_VALUE; - public final static String SSL_ALLOW_SAN_CHANGES_CONFIG = BrokerSecurityConfigs.SSL_ALLOW_SAN_CHANGES_CONFIG; - public final static String SSL_ALLOW_SAN_CHANGES_DOC = BrokerSecurityConfigs.SSL_ALLOW_SAN_CHANGES_DOC; - public final static boolean SSL_ALLOW_SAN_CHANGES_DEFAULT = BrokerSecurityConfigs.DEFAULT_SSL_ALLOW_SAN_CHANGES_VALUE; + public static final String SSL_ALLOW_SAN_CHANGES_CONFIG = BrokerSecurityConfigs.SSL_ALLOW_SAN_CHANGES_CONFIG; + public static final String SSL_ALLOW_SAN_CHANGES_DOC = BrokerSecurityConfigs.SSL_ALLOW_SAN_CHANGES_DOC; + public static final boolean SSL_ALLOW_SAN_CHANGES_DEFAULT = BrokerSecurityConfigs.DEFAULT_SSL_ALLOW_SAN_CHANGES_VALUE; /** ********* SASL Configuration ****************/ - public final static String SASL_MECHANISM_INTER_BROKER_PROTOCOL_CONFIG = BrokerSecurityConfigs.SASL_MECHANISM_INTER_BROKER_PROTOCOL_CONFIG; - public final static String SASL_MECHANISM_INTER_BROKER_PROTOCOL_DOC = BrokerSecurityConfigs.SASL_MECHANISM_INTER_BROKER_PROTOCOL_DOC; + public static final String SASL_MECHANISM_INTER_BROKER_PROTOCOL_CONFIG = BrokerSecurityConfigs.SASL_MECHANISM_INTER_BROKER_PROTOCOL_CONFIG; + public static final String SASL_MECHANISM_INTER_BROKER_PROTOCOL_DOC = BrokerSecurityConfigs.SASL_MECHANISM_INTER_BROKER_PROTOCOL_DOC; public static final String SASL_MECHANISM_INTER_BROKER_PROTOCOL_DEFAULT = SaslConfigs.DEFAULT_SASL_MECHANISM; - public final static String SASL_JAAS_CONFIG = SaslConfigs.SASL_JAAS_CONFIG; - public final static String SASL_JAAS_CONFIG_DOC = SaslConfigs.SASL_JAAS_CONFIG_DOC; - public final static String SASL_ENABLED_MECHANISMS_CONFIG = BrokerSecurityConfigs.SASL_ENABLED_MECHANISMS_CONFIG; - public final static String SASL_ENABLED_MECHANISMS_DOC = BrokerSecurityConfigs.SASL_ENABLED_MECHANISMS_DOC; + public static final String SASL_JAAS_CONFIG = SaslConfigs.SASL_JAAS_CONFIG; + public static final String SASL_JAAS_CONFIG_DOC = SaslConfigs.SASL_JAAS_CONFIG_DOC; + public static final String SASL_ENABLED_MECHANISMS_CONFIG = BrokerSecurityConfigs.SASL_ENABLED_MECHANISMS_CONFIG; + public static final String SASL_ENABLED_MECHANISMS_DOC = BrokerSecurityConfigs.SASL_ENABLED_MECHANISMS_DOC; public static final List SASL_ENABLED_MECHANISMS_DEFAULT = BrokerSecurityConfigs.DEFAULT_SASL_ENABLED_MECHANISMS; - public final static String SASL_SERVER_CALLBACK_HANDLER_CLASS_CONFIG = BrokerSecurityConfigs.SASL_SERVER_CALLBACK_HANDLER_CLASS; - public final static String SASL_SERVER_CALLBACK_HANDLER_CLASS_DOC = BrokerSecurityConfigs.SASL_SERVER_CALLBACK_HANDLER_CLASS_DOC; - public final static String SASL_CLIENT_CALLBACK_HANDLER_CLASS_CONFIG = SaslConfigs.SASL_CLIENT_CALLBACK_HANDLER_CLASS; - public final static String SASL_CLIENT_CALLBACK_HANDLER_CLASS_DOC = SaslConfigs.SASL_CLIENT_CALLBACK_HANDLER_CLASS_DOC; - public final static String SASL_LOGIN_CLASS_CONFIG = SaslConfigs.SASL_LOGIN_CLASS; - public final static String SASL_LOGIN_CLASS_DOC = SaslConfigs.SASL_LOGIN_CLASS_DOC; - public final static String SASL_LOGIN_CALLBACK_HANDLER_CLASS_CONFIG = SaslConfigs.SASL_LOGIN_CALLBACK_HANDLER_CLASS; - public final static String SASL_LOGIN_CALLBACK_HANDLER_CLASS_DOC = SaslConfigs.SASL_LOGIN_CALLBACK_HANDLER_CLASS_DOC; - public final static String SASL_KERBEROS_SERVICE_NAME_CONFIG = SaslConfigs.SASL_KERBEROS_SERVICE_NAME; - public final static String SASL_KERBEROS_SERVICE_NAME_DOC = SaslConfigs.SASL_KERBEROS_SERVICE_NAME_DOC; - public final static String SASL_KERBEROS_KINIT_CMD_CONFIG = SaslConfigs.SASL_KERBEROS_KINIT_CMD; - public final static String SASL_KERBEROS_KINIT_CMD_DOC = SaslConfigs.SASL_KERBEROS_KINIT_CMD_DOC; + public static final String SASL_SERVER_CALLBACK_HANDLER_CLASS_CONFIG = BrokerSecurityConfigs.SASL_SERVER_CALLBACK_HANDLER_CLASS; + public static final String SASL_SERVER_CALLBACK_HANDLER_CLASS_DOC = BrokerSecurityConfigs.SASL_SERVER_CALLBACK_HANDLER_CLASS_DOC; + public static final String SASL_CLIENT_CALLBACK_HANDLER_CLASS_CONFIG = SaslConfigs.SASL_CLIENT_CALLBACK_HANDLER_CLASS; + public static final String SASL_CLIENT_CALLBACK_HANDLER_CLASS_DOC = SaslConfigs.SASL_CLIENT_CALLBACK_HANDLER_CLASS_DOC; + public static final String SASL_LOGIN_CLASS_CONFIG = SaslConfigs.SASL_LOGIN_CLASS; + public static final String SASL_LOGIN_CLASS_DOC = SaslConfigs.SASL_LOGIN_CLASS_DOC; + public static final String SASL_LOGIN_CALLBACK_HANDLER_CLASS_CONFIG = SaslConfigs.SASL_LOGIN_CALLBACK_HANDLER_CLASS; + public static final String SASL_LOGIN_CALLBACK_HANDLER_CLASS_DOC = SaslConfigs.SASL_LOGIN_CALLBACK_HANDLER_CLASS_DOC; + public static final String SASL_KERBEROS_SERVICE_NAME_CONFIG = SaslConfigs.SASL_KERBEROS_SERVICE_NAME; + public static final String SASL_KERBEROS_SERVICE_NAME_DOC = SaslConfigs.SASL_KERBEROS_SERVICE_NAME_DOC; + public static final String SASL_KERBEROS_KINIT_CMD_CONFIG = SaslConfigs.SASL_KERBEROS_KINIT_CMD; + public static final String SASL_KERBEROS_KINIT_CMD_DOC = SaslConfigs.SASL_KERBEROS_KINIT_CMD_DOC; public static final String SASL_KERBEROS_KINIT_CMD_DEFAULT = SaslConfigs.DEFAULT_KERBEROS_KINIT_CMD; - public final static String SASL_KERBEROS_TICKET_RENEW_WINDOW_FACTOR_CONFIG = SaslConfigs.SASL_KERBEROS_TICKET_RENEW_WINDOW_FACTOR; - public final static String SASL_KERBEROS_TICKET_RENEW_WINDOW_FACTOR_DOC = SaslConfigs.SASL_KERBEROS_TICKET_RENEW_WINDOW_FACTOR_DOC; + public static final String SASL_KERBEROS_TICKET_RENEW_WINDOW_FACTOR_CONFIG = SaslConfigs.SASL_KERBEROS_TICKET_RENEW_WINDOW_FACTOR; + public static final String SASL_KERBEROS_TICKET_RENEW_WINDOW_FACTOR_DOC = SaslConfigs.SASL_KERBEROS_TICKET_RENEW_WINDOW_FACTOR_DOC; public static final double SASL_KERBEROS_TICKET_RENEW_WINDOW_FACTOR_DEFAULT = SaslConfigs.DEFAULT_KERBEROS_TICKET_RENEW_WINDOW_FACTOR; - public final static String SASL_KERBEROS_TICKET_RENEW_JITTER_CONFIG = SaslConfigs.SASL_KERBEROS_TICKET_RENEW_JITTER; - public final static String SASL_KERBEROS_TICKET_RENEW_JITTER_DOC = SaslConfigs.SASL_KERBEROS_TICKET_RENEW_JITTER_DOC; + public static final String SASL_KERBEROS_TICKET_RENEW_JITTER_CONFIG = SaslConfigs.SASL_KERBEROS_TICKET_RENEW_JITTER; + public static final String SASL_KERBEROS_TICKET_RENEW_JITTER_DOC = SaslConfigs.SASL_KERBEROS_TICKET_RENEW_JITTER_DOC; public static final double SASL_KERBEROS_TICKET_RENEW_JITTER_DEFAULT = SaslConfigs.DEFAULT_KERBEROS_TICKET_RENEW_JITTER; - public final static String SASL_KERBEROS_MIN_TIME_BEFORE_RELOGIN_CONFIG = SaslConfigs.SASL_KERBEROS_MIN_TIME_BEFORE_RELOGIN; - public final static String SASL_KERBEROS_MIN_TIME_BEFORE_RELOGIN_DOC = SaslConfigs.SASL_KERBEROS_MIN_TIME_BEFORE_RELOGIN_DOC; + public static final String SASL_KERBEROS_MIN_TIME_BEFORE_RELOGIN_CONFIG = SaslConfigs.SASL_KERBEROS_MIN_TIME_BEFORE_RELOGIN; + public static final String SASL_KERBEROS_MIN_TIME_BEFORE_RELOGIN_DOC = SaslConfigs.SASL_KERBEROS_MIN_TIME_BEFORE_RELOGIN_DOC; public static final long SASL_KERBEROS_MIN_TIME_BEFORE_RELOGIN_DEFAULT = SaslConfigs.DEFAULT_KERBEROS_MIN_TIME_BEFORE_RELOGIN; - public final static String SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_CONFIG = BrokerSecurityConfigs.SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_CONFIG; - public final static String SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_DOC = BrokerSecurityConfigs.SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_DOC; + public static final String SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_CONFIG = BrokerSecurityConfigs.SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_CONFIG; + public static final String SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_DOC = BrokerSecurityConfigs.SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_DOC; public static final List SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_DEFAULT = BrokerSecurityConfigs.DEFAULT_SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES; - public final static String SASL_LOGIN_REFRESH_WINDOW_FACTOR_CONFIG = SaslConfigs.SASL_LOGIN_REFRESH_WINDOW_FACTOR; - public final static String SASL_LOGIN_REFRESH_WINDOW_FACTOR_DOC = SaslConfigs.SASL_LOGIN_REFRESH_WINDOW_FACTOR_DOC; + public static final String SASL_LOGIN_REFRESH_WINDOW_FACTOR_CONFIG = SaslConfigs.SASL_LOGIN_REFRESH_WINDOW_FACTOR; + public static final String SASL_LOGIN_REFRESH_WINDOW_FACTOR_DOC = SaslConfigs.SASL_LOGIN_REFRESH_WINDOW_FACTOR_DOC; public static final double SASL_LOGIN_REFRESH_WINDOW_FACTOR_DEFAULT = SaslConfigs.DEFAULT_LOGIN_REFRESH_WINDOW_FACTOR; - public final static String SASL_LOGIN_REFRESH_WINDOW_JITTER_CONFIG = SaslConfigs.SASL_LOGIN_REFRESH_WINDOW_JITTER; - public final static String SASL_LOGIN_REFRESH_WINDOW_JITTER_DOC = SaslConfigs.SASL_LOGIN_REFRESH_WINDOW_JITTER_DOC; + public static final String SASL_LOGIN_REFRESH_WINDOW_JITTER_CONFIG = SaslConfigs.SASL_LOGIN_REFRESH_WINDOW_JITTER; + public static final String SASL_LOGIN_REFRESH_WINDOW_JITTER_DOC = SaslConfigs.SASL_LOGIN_REFRESH_WINDOW_JITTER_DOC; public static final double SASL_LOGIN_REFRESH_WINDOW_JITTER_DEFAULT = SaslConfigs.DEFAULT_LOGIN_REFRESH_WINDOW_JITTER; - public final static String SASL_LOGIN_REFRESH_MIN_PERIOD_SECONDS_CONFIG = SaslConfigs.SASL_LOGIN_REFRESH_MIN_PERIOD_SECONDS; - public final static String SASL_LOGIN_REFRESH_MIN_PERIOD_SECONDS_DOC = SaslConfigs.SASL_LOGIN_REFRESH_MIN_PERIOD_SECONDS_DOC; + public static final String SASL_LOGIN_REFRESH_MIN_PERIOD_SECONDS_CONFIG = SaslConfigs.SASL_LOGIN_REFRESH_MIN_PERIOD_SECONDS; + public static final String SASL_LOGIN_REFRESH_MIN_PERIOD_SECONDS_DOC = SaslConfigs.SASL_LOGIN_REFRESH_MIN_PERIOD_SECONDS_DOC; public static final short SASL_LOGIN_REFRESH_MIN_PERIOD_SECONDS_DEFAULT = SaslConfigs.DEFAULT_LOGIN_REFRESH_MIN_PERIOD_SECONDS; - public final static String SASL_LOGIN_REFRESH_BUFFER_SECONDS_CONFIG = SaslConfigs.SASL_LOGIN_REFRESH_BUFFER_SECONDS; - public final static String SASL_LOGIN_REFRESH_BUFFER_SECONDS_DOC = SaslConfigs.SASL_LOGIN_REFRESH_BUFFER_SECONDS_DOC; + public static final String SASL_LOGIN_REFRESH_BUFFER_SECONDS_CONFIG = SaslConfigs.SASL_LOGIN_REFRESH_BUFFER_SECONDS; + public static final String SASL_LOGIN_REFRESH_BUFFER_SECONDS_DOC = SaslConfigs.SASL_LOGIN_REFRESH_BUFFER_SECONDS_DOC; public static final short SASL_LOGIN_REFRESH_BUFFER_SECONDS_DEFAULT = SaslConfigs.DEFAULT_LOGIN_REFRESH_BUFFER_SECONDS; - public final static String SASL_LOGIN_CONNECT_TIMEOUT_MS_CONFIG = SaslConfigs.SASL_LOGIN_CONNECT_TIMEOUT_MS; - public final static String SASL_LOGIN_CONNECT_TIMEOUT_MS_DOC = SaslConfigs.SASL_LOGIN_CONNECT_TIMEOUT_MS_DOC; - public final static String SASL_LOGIN_READ_TIMEOUT_MS_CONFIG = SaslConfigs.SASL_LOGIN_READ_TIMEOUT_MS; - public final static String SASL_LOGIN_READ_TIMEOUT_MS_DOC = SaslConfigs.SASL_LOGIN_READ_TIMEOUT_MS_DOC; - public final static String SASL_LOGIN_RETRY_BACKOFF_MAX_MS_CONFIG = SaslConfigs.SASL_LOGIN_RETRY_BACKOFF_MAX_MS; - public final static String SASL_LOGIN_RETRY_BACKOFF_MAX_MS_DOC = SaslConfigs.SASL_LOGIN_RETRY_BACKOFF_MAX_MS_DOC; + public static final String SASL_LOGIN_CONNECT_TIMEOUT_MS_CONFIG = SaslConfigs.SASL_LOGIN_CONNECT_TIMEOUT_MS; + public static final String SASL_LOGIN_CONNECT_TIMEOUT_MS_DOC = SaslConfigs.SASL_LOGIN_CONNECT_TIMEOUT_MS_DOC; + public static final String SASL_LOGIN_READ_TIMEOUT_MS_CONFIG = SaslConfigs.SASL_LOGIN_READ_TIMEOUT_MS; + public static final String SASL_LOGIN_READ_TIMEOUT_MS_DOC = SaslConfigs.SASL_LOGIN_READ_TIMEOUT_MS_DOC; + public static final String SASL_LOGIN_RETRY_BACKOFF_MAX_MS_CONFIG = SaslConfigs.SASL_LOGIN_RETRY_BACKOFF_MAX_MS; + public static final String SASL_LOGIN_RETRY_BACKOFF_MAX_MS_DOC = SaslConfigs.SASL_LOGIN_RETRY_BACKOFF_MAX_MS_DOC; public static final long SASL_LOGIN_RETRY_BACKOFF_MAX_MS_DEFAULT = SaslConfigs.DEFAULT_SASL_LOGIN_RETRY_BACKOFF_MAX_MS; - public final static String SASL_LOGIN_RETRY_BACKOFF_MS_CONFIG = SaslConfigs.SASL_LOGIN_RETRY_BACKOFF_MS; - public final static String SASL_LOGIN_RETRY_BACKOFF_MS_DOC = SaslConfigs.SASL_LOGIN_RETRY_BACKOFF_MS_DOC; + public static final String SASL_LOGIN_RETRY_BACKOFF_MS_CONFIG = SaslConfigs.SASL_LOGIN_RETRY_BACKOFF_MS; + public static final String SASL_LOGIN_RETRY_BACKOFF_MS_DOC = SaslConfigs.SASL_LOGIN_RETRY_BACKOFF_MS_DOC; public static final long SASL_LOGIN_RETRY_BACKOFF_MS_DEFAULT = SaslConfigs.DEFAULT_SASL_LOGIN_RETRY_BACKOFF_MS; - public final static String SASL_OAUTHBEARER_SCOPE_CLAIM_NAME_CONFIG = SaslConfigs.SASL_OAUTHBEARER_SCOPE_CLAIM_NAME; - public final static String SASL_OAUTHBEARER_SCOPE_CLAIM_NAME_DOC = SaslConfigs.SASL_OAUTHBEARER_SCOPE_CLAIM_NAME_DOC; + public static final String SASL_OAUTHBEARER_SCOPE_CLAIM_NAME_CONFIG = SaslConfigs.SASL_OAUTHBEARER_SCOPE_CLAIM_NAME; + public static final String SASL_OAUTHBEARER_SCOPE_CLAIM_NAME_DOC = SaslConfigs.SASL_OAUTHBEARER_SCOPE_CLAIM_NAME_DOC; public static final String SASL_OAUTHBEARER_SCOPE_CLAIM_NAME_DEFAULT = SaslConfigs.DEFAULT_SASL_OAUTHBEARER_SCOPE_CLAIM_NAME; - public final static String SASL_OAUTHBEARER_SUB_CLAIM_NAME_CONFIG = SaslConfigs.SASL_OAUTHBEARER_SUB_CLAIM_NAME; - public final static String SASL_OAUTHBEARER_SUB_CLAIM_NAME_DOC = SaslConfigs.SASL_OAUTHBEARER_SUB_CLAIM_NAME_DOC; + public static final String SASL_OAUTHBEARER_SUB_CLAIM_NAME_CONFIG = SaslConfigs.SASL_OAUTHBEARER_SUB_CLAIM_NAME; + public static final String SASL_OAUTHBEARER_SUB_CLAIM_NAME_DOC = SaslConfigs.SASL_OAUTHBEARER_SUB_CLAIM_NAME_DOC; public static final String SASL_OAUTHBEARER_SUB_CLAIM_NAME_DEFAULT = SaslConfigs.DEFAULT_SASL_OAUTHBEARER_SUB_CLAIM_NAME; - public final static String SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL_CONFIG = SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; - public final static String SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL_DOC = SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL_DOC; + public static final String SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL_CONFIG = SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL; + public static final String SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL_DOC = SaslConfigs.SASL_OAUTHBEARER_TOKEN_ENDPOINT_URL_DOC; - public final static String SASL_OAUTHBEARER_JWKS_ENDPOINT_URL_CONFIG = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_URL; - public final static String SASL_OAUTHBEARER_JWKS_ENDPOINT_URL_DOC = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_URL_DOC; - public final static String SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS_CONFIG = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS; - public final static String SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS_DOC = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS_DOC; + public static final String SASL_OAUTHBEARER_JWKS_ENDPOINT_URL_CONFIG = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_URL; + public static final String SASL_OAUTHBEARER_JWKS_ENDPOINT_URL_DOC = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_URL_DOC; + public static final String SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS_CONFIG = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS; + public static final String SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS_DOC = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS_DOC; public static final long SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS_DEFAULT = SaslConfigs.DEFAULT_SASL_OAUTHBEARER_JWKS_ENDPOINT_REFRESH_MS; - public final static String SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS_CONFIG = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS; - public final static String SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS_DOC = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS_DOC; + public static final String SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS_CONFIG = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS; + public static final String SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS_DOC = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS_DOC; public static final long SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS_DEFAULT = SaslConfigs.DEFAULT_SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MAX_MS; - public final static String SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS_CONFIG = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS; - public final static String SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS_DOC = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS_DOC; + public static final String SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS_CONFIG = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS; + public static final String SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS_DOC = SaslConfigs.SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS_DOC; public static final long SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS_DEFAULT = SaslConfigs.DEFAULT_SASL_OAUTHBEARER_JWKS_ENDPOINT_RETRY_BACKOFF_MS; - public final static String SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS_CONFIG = SaslConfigs.SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS; - public final static String SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS_DOC = SaslConfigs.SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS_DOC; + public static final String SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS_CONFIG = SaslConfigs.SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS; + public static final String SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS_DOC = SaslConfigs.SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS_DOC; public static final int SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS_DEFAULT = SaslConfigs.DEFAULT_SASL_OAUTHBEARER_CLOCK_SKEW_SECONDS; - public final static String SASL_OAUTHBEARER_EXPECTED_AUDIENCE_CONFIG = SaslConfigs.SASL_OAUTHBEARER_EXPECTED_AUDIENCE; - public final static String SASL_OAUTHBEARER_EXPECTED_AUDIENCE_DOC = SaslConfigs.SASL_OAUTHBEARER_EXPECTED_AUDIENCE_DOC; - public final static String SASL_OAUTHBEARER_EXPECTED_ISSUER_CONFIG = SaslConfigs.SASL_OAUTHBEARER_EXPECTED_ISSUER; - public final static String SASL_OAUTHBEARER_EXPECTED_ISSUER_DOC = SaslConfigs.SASL_OAUTHBEARER_EXPECTED_ISSUER_DOC; + public static final String SASL_OAUTHBEARER_EXPECTED_AUDIENCE_CONFIG = SaslConfigs.SASL_OAUTHBEARER_EXPECTED_AUDIENCE; + public static final String SASL_OAUTHBEARER_EXPECTED_AUDIENCE_DOC = SaslConfigs.SASL_OAUTHBEARER_EXPECTED_AUDIENCE_DOC; + public static final String SASL_OAUTHBEARER_EXPECTED_ISSUER_CONFIG = SaslConfigs.SASL_OAUTHBEARER_EXPECTED_ISSUER; + public static final String SASL_OAUTHBEARER_EXPECTED_ISSUER_DOC = SaslConfigs.SASL_OAUTHBEARER_EXPECTED_ISSUER_DOC; /** ******** Common Security Configuration *************/ - public final static String PRINCIPAL_BUILDER_CLASS_CONFIG = BrokerSecurityConfigs.PRINCIPAL_BUILDER_CLASS_CONFIG; - public final static String PRINCIPAL_BUILDER_CLASS_DOC = BrokerSecurityConfigs.PRINCIPAL_BUILDER_CLASS_DOC; + public static final String PRINCIPAL_BUILDER_CLASS_CONFIG = BrokerSecurityConfigs.PRINCIPAL_BUILDER_CLASS_CONFIG; + public static final String PRINCIPAL_BUILDER_CLASS_DOC = BrokerSecurityConfigs.PRINCIPAL_BUILDER_CLASS_DOC; public static final Class PRINCIPAL_BUILDER_CLASS_DEFAULT = DefaultKafkaPrincipalBuilder.class; - public final static String CONNECTIONS_MAX_REAUTH_MS_CONFIG = BrokerSecurityConfigs.CONNECTIONS_MAX_REAUTH_MS; - public final static String CONNECTIONS_MAX_REAUTH_MS_DOC = BrokerSecurityConfigs.CONNECTIONS_MAX_REAUTH_MS_DOC; + public static final String CONNECTIONS_MAX_REAUTH_MS_CONFIG = BrokerSecurityConfigs.CONNECTIONS_MAX_REAUTH_MS; + public static final String CONNECTIONS_MAX_REAUTH_MS_DOC = BrokerSecurityConfigs.CONNECTIONS_MAX_REAUTH_MS_DOC; public static final long CONNECTIONS_MAX_REAUTH_MS_DEFAULT = BrokerSecurityConfigs.DEFAULT_CONNECTIONS_MAX_REAUTH_MS; - public final static String SASL_SERVER_MAX_RECEIVE_SIZE_CONFIG = BrokerSecurityConfigs.SASL_SERVER_MAX_RECEIVE_SIZE_CONFIG; - public final static String SASL_SERVER_MAX_RECEIVE_SIZE_DOC = BrokerSecurityConfigs.SASL_SERVER_MAX_RECEIVE_SIZE_DOC; + public static final String SASL_SERVER_MAX_RECEIVE_SIZE_CONFIG = BrokerSecurityConfigs.SASL_SERVER_MAX_RECEIVE_SIZE_CONFIG; + public static final String SASL_SERVER_MAX_RECEIVE_SIZE_DOC = BrokerSecurityConfigs.SASL_SERVER_MAX_RECEIVE_SIZE_DOC; public static final int SASL_SERVER_MAX_RECEIVE_SIZE_DEFAULT = BrokerSecurityConfigs.DEFAULT_SASL_SERVER_MAX_RECEIVE_SIZE; - public final static String SECURITY_PROVIDER_CLASS_CONFIG = SecurityConfig.SECURITY_PROVIDERS_CONFIG; - public final static String SECURITY_PROVIDERS_DOC = SecurityConfig.SECURITY_PROVIDERS_DOC; + public static final String SECURITY_PROVIDER_CLASS_CONFIG = SecurityConfig.SECURITY_PROVIDERS_CONFIG; + public static final String SECURITY_PROVIDERS_DOC = SecurityConfig.SECURITY_PROVIDERS_DOC; } diff --git a/server/src/main/java/org/apache/kafka/server/metrics/DefaultClientTelemetryPayload.java b/server/src/main/java/org/apache/kafka/server/metrics/DefaultClientTelemetryPayload.java index f7c50515228fa..f90f473b1eda3 100644 --- a/server/src/main/java/org/apache/kafka/server/metrics/DefaultClientTelemetryPayload.java +++ b/server/src/main/java/org/apache/kafka/server/metrics/DefaultClientTelemetryPayload.java @@ -27,10 +27,10 @@ */ public class DefaultClientTelemetryPayload implements ClientTelemetryPayload { - final private Uuid clientInstanceId; - final private boolean isClientTerminating; - final private String metricsContentType; - final private ByteBuffer metricsData; + private final Uuid clientInstanceId; + private final boolean isClientTerminating; + private final String metricsContentType; + private final ByteBuffer metricsData; DefaultClientTelemetryPayload(PushTelemetryRequest request) { this.clientInstanceId = request.data().clientInstanceId(); diff --git a/shell/src/main/java/org/apache/kafka/shell/command/CatCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/CatCommandHandler.java index 9cd7603f94caa..793cbadbab121 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/CatCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/CatCommandHandler.java @@ -39,7 +39,7 @@ public final class CatCommandHandler implements Commands.Handler { private static final Logger log = LoggerFactory.getLogger(CatCommandHandler.class); - public final static Commands.Type TYPE = new CatCommandType(); + public static final Commands.Type TYPE = new CatCommandType(); public static class CatCommandType implements Commands.Type { private CatCommandType() { diff --git a/shell/src/main/java/org/apache/kafka/shell/command/CdCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/CdCommandHandler.java index 71057a4ade75f..d12c9be3bb6ae 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/CdCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/CdCommandHandler.java @@ -32,7 +32,7 @@ * Implements the cd command. */ public final class CdCommandHandler implements Commands.Handler { - public final static Commands.Type TYPE = new CdCommandType(); + public static final Commands.Type TYPE = new CdCommandType(); public static class CdCommandType implements Commands.Type { private CdCommandType() { diff --git a/shell/src/main/java/org/apache/kafka/shell/command/ExitCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/ExitCommandHandler.java index 56f92de30f318..05eff7b34a293 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/ExitCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/ExitCommandHandler.java @@ -32,7 +32,7 @@ * Implements the exit command. */ public final class ExitCommandHandler implements Commands.Handler { - public final static Commands.Type TYPE = new ExitCommandType(); + public static final Commands.Type TYPE = new ExitCommandType(); public static class ExitCommandType implements Commands.Type { private ExitCommandType() { diff --git a/shell/src/main/java/org/apache/kafka/shell/command/FindCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/FindCommandHandler.java index a41b0b21ca318..f579c1c85c3f1 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/FindCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/FindCommandHandler.java @@ -35,7 +35,7 @@ * Implements the find command. */ public final class FindCommandHandler implements Commands.Handler { - public final static Commands.Type TYPE = new FindCommandType(); + public static final Commands.Type TYPE = new FindCommandType(); public static class FindCommandType implements Commands.Type { private FindCommandType() { diff --git a/shell/src/main/java/org/apache/kafka/shell/command/HelpCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/HelpCommandHandler.java index 52345487b44a5..127ea46c94daf 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/HelpCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/HelpCommandHandler.java @@ -31,7 +31,7 @@ * Implements the help command. */ public final class HelpCommandHandler implements Commands.Handler { - public final static Commands.Type TYPE = new HelpCommandType(); + public static final Commands.Type TYPE = new HelpCommandType(); public static class HelpCommandType implements Commands.Type { private HelpCommandType() { diff --git a/shell/src/main/java/org/apache/kafka/shell/command/HistoryCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/HistoryCommandHandler.java index c3b299983ce78..69ee9da0fb363 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/HistoryCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/HistoryCommandHandler.java @@ -33,7 +33,7 @@ * Implements the history command. */ public final class HistoryCommandHandler implements Commands.Handler { - public final static Commands.Type TYPE = new HistoryCommandType(); + public static final Commands.Type TYPE = new HistoryCommandType(); public static class HistoryCommandType implements Commands.Type { private HistoryCommandType() { diff --git a/shell/src/main/java/org/apache/kafka/shell/command/LsCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/LsCommandHandler.java index 848b7bd5185be..66b6a1f9f21f3 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/LsCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/LsCommandHandler.java @@ -42,7 +42,7 @@ public final class LsCommandHandler implements Commands.Handler { private static final Logger log = LoggerFactory.getLogger(LsCommandHandler.class); - public final static Commands.Type TYPE = new LsCommandType(); + public static final Commands.Type TYPE = new LsCommandType(); public static class LsCommandType implements Commands.Type { private LsCommandType() { diff --git a/shell/src/main/java/org/apache/kafka/shell/command/ManCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/ManCommandHandler.java index f10e89b2bffef..a58607d1edcbc 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/ManCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/ManCommandHandler.java @@ -34,7 +34,7 @@ public final class ManCommandHandler implements Commands.Handler { private final String cmd; - public final static Commands.Type TYPE = new ManCommandType(); + public static final Commands.Type TYPE = new ManCommandType(); public static class ManCommandType implements Commands.Type { private ManCommandType() { diff --git a/shell/src/main/java/org/apache/kafka/shell/command/PwdCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/PwdCommandHandler.java index 4a0752a4e701d..f36ee52db6975 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/PwdCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/PwdCommandHandler.java @@ -31,7 +31,7 @@ * Implements the pwd command. */ public final class PwdCommandHandler implements Commands.Handler { - public final static Commands.Type TYPE = new PwdCommandType(); + public static final Commands.Type TYPE = new PwdCommandType(); public static class PwdCommandType implements Commands.Type { private PwdCommandType() { diff --git a/shell/src/main/java/org/apache/kafka/shell/command/TreeCommandHandler.java b/shell/src/main/java/org/apache/kafka/shell/command/TreeCommandHandler.java index 1489e1f150090..1e32486f14d56 100644 --- a/shell/src/main/java/org/apache/kafka/shell/command/TreeCommandHandler.java +++ b/shell/src/main/java/org/apache/kafka/shell/command/TreeCommandHandler.java @@ -39,7 +39,7 @@ public final class TreeCommandHandler implements Commands.Handler { private static final Logger log = LoggerFactory.getLogger(TreeCommandHandler.class); - public final static Commands.Type TYPE = new CatCommandType(); + public static final Commands.Type TYPE = new CatCommandType(); public static class CatCommandType implements Commands.Type { private CatCommandType() { diff --git a/shell/src/test/java/org/apache/kafka/shell/MetadataShellIntegrationTest.java b/shell/src/test/java/org/apache/kafka/shell/MetadataShellIntegrationTest.java index 3ef5044a82dae..d08be0bea7e3b 100644 --- a/shell/src/test/java/org/apache/kafka/shell/MetadataShellIntegrationTest.java +++ b/shell/src/test/java/org/apache/kafka/shell/MetadataShellIntegrationTest.java @@ -42,7 +42,7 @@ @Timeout(120) @Tag("integration") public class MetadataShellIntegrationTest { - private final static Logger LOG = LoggerFactory.getLogger(MetadataShellIntegrationTest.class); + private static final Logger LOG = LoggerFactory.getLogger(MetadataShellIntegrationTest.class); static class IntegrationEnv implements AutoCloseable { File tempDir; diff --git a/shell/src/test/java/org/apache/kafka/shell/glob/GlobVisitorTest.java b/shell/src/test/java/org/apache/kafka/shell/glob/GlobVisitorTest.java index 000d8f2f01775..5ef4e2cebf512 100644 --- a/shell/src/test/java/org/apache/kafka/shell/glob/GlobVisitorTest.java +++ b/shell/src/test/java/org/apache/kafka/shell/glob/GlobVisitorTest.java @@ -37,7 +37,7 @@ @Timeout(value = 5, unit = MINUTES) public class GlobVisitorTest { - static private final MetadataShellState DATA; + private static final MetadataShellState DATA; static class TestNode implements MetadataNode { private final String name; diff --git a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java index feba86a1ad01a..8511e76d094c4 100644 --- a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java +++ b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java @@ -55,45 +55,45 @@ public class RemoteStorageMetrics { public static final Set REMOTE_STORAGE_THREAD_POOL_METRICS = Collections.unmodifiableSet( new HashSet<>(Arrays.asList(REMOTE_LOG_READER_TASK_QUEUE_SIZE, REMOTE_LOG_READER_AVG_IDLE_PERCENT))); - public final static MetricName REMOTE_COPY_BYTES_PER_SEC_METRIC = getMetricName( + public static final MetricName REMOTE_COPY_BYTES_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_COPY_BYTES_PER_SEC); - public final static MetricName REMOTE_FETCH_BYTES_PER_SEC_METRIC = getMetricName( + public static final MetricName REMOTE_FETCH_BYTES_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_FETCH_BYTES_PER_SEC); - public final static MetricName REMOTE_FETCH_REQUESTS_PER_SEC_METRIC = getMetricName( + public static final MetricName REMOTE_FETCH_REQUESTS_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_FETCH_REQUESTS_PER_SEC); - public final static MetricName REMOTE_COPY_REQUESTS_PER_SEC_METRIC = getMetricName( + public static final MetricName REMOTE_COPY_REQUESTS_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_COPY_REQUESTS_PER_SEC); - public final static MetricName REMOTE_DELETE_REQUESTS_PER_SEC_METRIC = getMetricName( + public static final MetricName REMOTE_DELETE_REQUESTS_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_DELETE_REQUESTS_PER_SEC); - public final static MetricName BUILD_REMOTE_LOG_AUX_STATE_REQUESTS_PER_SEC_METRIC = getMetricName( + public static final MetricName BUILD_REMOTE_LOG_AUX_STATE_REQUESTS_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", BUILD_REMOTE_LOG_AUX_STATE_REQUESTS_PER_SEC); - public final static MetricName FAILED_REMOTE_FETCH_PER_SEC_METRIC = getMetricName( + public static final MetricName FAILED_REMOTE_FETCH_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", FAILED_REMOTE_FETCH_PER_SEC); - public final static MetricName FAILED_REMOTE_COPY_PER_SEC_METRIC = getMetricName( + public static final MetricName FAILED_REMOTE_COPY_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", FAILED_REMOTE_COPY_PER_SEC); - public final static MetricName REMOTE_LOG_METADATA_COUNT_METRIC = getMetricName( + public static final MetricName REMOTE_LOG_METADATA_COUNT_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_LOG_METADATA_COUNT); - public final static MetricName REMOTE_LOG_SIZE_BYTES_METRIC = getMetricName( + public static final MetricName REMOTE_LOG_SIZE_BYTES_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_LOG_SIZE_BYTES); - public final static MetricName REMOTE_LOG_SIZE_COMPUTATION_TIME_METRIC = getMetricName( + public static final MetricName REMOTE_LOG_SIZE_COMPUTATION_TIME_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_LOG_SIZE_COMPUTATION_TIME); - public final static MetricName FAILED_REMOTE_DELETE_PER_SEC_METRIC = getMetricName( + public static final MetricName FAILED_REMOTE_DELETE_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", FAILED_REMOTE_DELETE_PER_SEC); - public final static MetricName FAILED_BUILD_REMOTE_LOG_AUX_STATE_PER_SEC_METRIC = getMetricName( + public static final MetricName FAILED_BUILD_REMOTE_LOG_AUX_STATE_PER_SEC_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", FAILED_BUILD_REMOTE_LOG_AUX_STATE_PER_SEC); - public final static MetricName REMOTE_COPY_LAG_BYTES_METRIC = getMetricName( + public static final MetricName REMOTE_COPY_LAG_BYTES_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_COPY_LAG_BYTES); - public final static MetricName REMOTE_COPY_LAG_SEGMENTS_METRIC = getMetricName( + public static final MetricName REMOTE_COPY_LAG_SEGMENTS_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_COPY_LAG_SEGMENTS); - public final static MetricName REMOTE_DELETE_LAG_BYTES_METRIC = getMetricName( + public static final MetricName REMOTE_DELETE_LAG_BYTES_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_DELETE_LAG_BYTES); - public final static MetricName REMOTE_DELETE_LAG_SEGMENTS_METRIC = getMetricName( + public static final MetricName REMOTE_DELETE_LAG_SEGMENTS_METRIC = getMetricName( "kafka.server", "BrokerTopicMetrics", REMOTE_DELETE_LAG_SEGMENTS); - public final static MetricName REMOTE_LOG_MANAGER_TASKS_AVG_IDLE_PERCENT_METRIC = getMetricName( + public static final MetricName REMOTE_LOG_MANAGER_TASKS_AVG_IDLE_PERCENT_METRIC = getMetricName( "kafka.log.remote", "RemoteLogManager", REMOTE_LOG_MANAGER_TASKS_AVG_IDLE_PERCENT); - public final static MetricName REMOTE_LOG_READER_TASK_QUEUE_SIZE_METRIC = getMetricName( + public static final MetricName REMOTE_LOG_READER_TASK_QUEUE_SIZE_METRIC = getMetricName( "org.apache.kafka.storage.internals.log", "RemoteStorageThreadPool", REMOTE_LOG_READER_TASK_QUEUE_SIZE); - public final static MetricName REMOTE_LOG_READER_AVG_IDLE_PERCENT_METRIC = getMetricName( + public static final MetricName REMOTE_LOG_READER_AVG_IDLE_PERCENT_METRIC = getMetricName( "org.apache.kafka.storage.internals.log", "RemoteStorageThreadPool", REMOTE_LOG_READER_AVG_IDLE_PERCENT); public static Set allMetrics() { diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/VerificationStateEntry.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/VerificationStateEntry.java index 7fa0a658f14d6..b51ab7f5e3808 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/VerificationStateEntry.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/VerificationStateEntry.java @@ -29,8 +29,8 @@ */ public class VerificationStateEntry { - final private long timestamp; - final private VerificationGuard verificationGuard; + private final long timestamp; + private final VerificationGuard verificationGuard; private int lowestSequence; private short epoch; diff --git a/streams/examples/src/main/java/org/apache/kafka/streams/examples/pageview/PageViewTypedDemo.java b/streams/examples/src/main/java/org/apache/kafka/streams/examples/pageview/PageViewTypedDemo.java index f96d6974a1cd8..367c6e5597d60 100644 --- a/streams/examples/src/main/java/org/apache/kafka/streams/examples/pageview/PageViewTypedDemo.java +++ b/streams/examples/src/main/java/org/apache/kafka/streams/examples/pageview/PageViewTypedDemo.java @@ -144,29 +144,29 @@ public interface JSONSerdeCompatible { } // POJO classes - static public class PageView implements JSONSerdeCompatible { + public static class PageView implements JSONSerdeCompatible { public String user; public String page; public Long timestamp; } - static public class UserProfile implements JSONSerdeCompatible { + public static class UserProfile implements JSONSerdeCompatible { public String region; public Long timestamp; } - static public class PageViewByRegion implements JSONSerdeCompatible { + public static class PageViewByRegion implements JSONSerdeCompatible { public String user; public String page; public String region; } - static public class WindowedPageViewByRegion implements JSONSerdeCompatible { + public static class WindowedPageViewByRegion implements JSONSerdeCompatible { public long windowStart; public String region; } - static public class RegionCount implements JSONSerdeCompatible { + public static class RegionCount implements JSONSerdeCompatible { public long count; public String region; } diff --git a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java index 89f8458b206db..9cf91f163e27e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java +++ b/streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java @@ -772,7 +772,7 @@ public void onRestoreSuspended(final TopicPartition topicPartition, final String } } - final static class DelegatingStandbyUpdateListener implements StandbyUpdateListener { + static final class DelegatingStandbyUpdateListener implements StandbyUpdateListener { private StandbyUpdateListener userStandbyListener; private void throwOnFatalException(final Exception fatalUserException, diff --git a/streams/src/main/java/org/apache/kafka/streams/TopologyConfig.java b/streams/src/main/java/org/apache/kafka/streams/TopologyConfig.java index 2d4157eba7885..fbeda0141b4fe 100644 --- a/streams/src/main/java/org/apache/kafka/streams/TopologyConfig.java +++ b/streams/src/main/java/org/apache/kafka/streams/TopologyConfig.java @@ -117,7 +117,7 @@ public class TopologyConfig extends AbstractConfig { Importance.LOW, DSL_STORE_SUPPLIERS_CLASS_DOC); } - private final static Logger log = LoggerFactory.getLogger(TopologyConfig.class); + private static final Logger log = LoggerFactory.getLogger(TopologyConfig.class); private final StreamsConfig globalAppConfigs; diff --git a/streams/src/main/java/org/apache/kafka/streams/errors/BrokerNotFoundException.java b/streams/src/main/java/org/apache/kafka/streams/errors/BrokerNotFoundException.java index 24c5fcb480ee7..d2df27f8d3495 100644 --- a/streams/src/main/java/org/apache/kafka/streams/errors/BrokerNotFoundException.java +++ b/streams/src/main/java/org/apache/kafka/streams/errors/BrokerNotFoundException.java @@ -25,7 +25,7 @@ */ public class BrokerNotFoundException extends StreamsException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public BrokerNotFoundException(final String message) { super(message); diff --git a/streams/src/main/java/org/apache/kafka/streams/errors/InvalidStateStoreException.java b/streams/src/main/java/org/apache/kafka/streams/errors/InvalidStateStoreException.java index 50c961b7af4f0..6ad06a54096dd 100644 --- a/streams/src/main/java/org/apache/kafka/streams/errors/InvalidStateStoreException.java +++ b/streams/src/main/java/org/apache/kafka/streams/errors/InvalidStateStoreException.java @@ -23,7 +23,7 @@ */ public class InvalidStateStoreException extends StreamsException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public InvalidStateStoreException(final String message) { super(message); diff --git a/streams/src/main/java/org/apache/kafka/streams/errors/LockException.java b/streams/src/main/java/org/apache/kafka/streams/errors/LockException.java index ddaa69fcb8d0d..80bb592b4d4ab 100644 --- a/streams/src/main/java/org/apache/kafka/streams/errors/LockException.java +++ b/streams/src/main/java/org/apache/kafka/streams/errors/LockException.java @@ -24,7 +24,7 @@ */ public class LockException extends StreamsException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public LockException(final String message) { super(message); diff --git a/streams/src/main/java/org/apache/kafka/streams/errors/MissingSourceTopicException.java b/streams/src/main/java/org/apache/kafka/streams/errors/MissingSourceTopicException.java index c23ea4f54bc42..a0e5e8cd4ad9f 100644 --- a/streams/src/main/java/org/apache/kafka/streams/errors/MissingSourceTopicException.java +++ b/streams/src/main/java/org/apache/kafka/streams/errors/MissingSourceTopicException.java @@ -18,7 +18,7 @@ public class MissingSourceTopicException extends StreamsException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public MissingSourceTopicException(final String message) { super(message); diff --git a/streams/src/main/java/org/apache/kafka/streams/errors/ProcessorStateException.java b/streams/src/main/java/org/apache/kafka/streams/errors/ProcessorStateException.java index 8f1f6ac11697b..4463604378613 100644 --- a/streams/src/main/java/org/apache/kafka/streams/errors/ProcessorStateException.java +++ b/streams/src/main/java/org/apache/kafka/streams/errors/ProcessorStateException.java @@ -24,7 +24,7 @@ */ public class ProcessorStateException extends StreamsException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public ProcessorStateException(final String message) { super(message); diff --git a/streams/src/main/java/org/apache/kafka/streams/errors/StreamsException.java b/streams/src/main/java/org/apache/kafka/streams/errors/StreamsException.java index 32beb7ea19db6..c3c03f53001ff 100644 --- a/streams/src/main/java/org/apache/kafka/streams/errors/StreamsException.java +++ b/streams/src/main/java/org/apache/kafka/streams/errors/StreamsException.java @@ -29,7 +29,7 @@ */ public class StreamsException extends KafkaException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; private TaskId taskId; diff --git a/streams/src/main/java/org/apache/kafka/streams/errors/TaskAssignmentException.java b/streams/src/main/java/org/apache/kafka/streams/errors/TaskAssignmentException.java index 2be43d64a21a3..53b40ecae3e52 100644 --- a/streams/src/main/java/org/apache/kafka/streams/errors/TaskAssignmentException.java +++ b/streams/src/main/java/org/apache/kafka/streams/errors/TaskAssignmentException.java @@ -23,7 +23,7 @@ */ public class TaskAssignmentException extends StreamsException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public TaskAssignmentException(final String message) { super(message); diff --git a/streams/src/main/java/org/apache/kafka/streams/errors/TaskMigratedException.java b/streams/src/main/java/org/apache/kafka/streams/errors/TaskMigratedException.java index fdb3ab874afe4..7a2c0600b8189 100644 --- a/streams/src/main/java/org/apache/kafka/streams/errors/TaskMigratedException.java +++ b/streams/src/main/java/org/apache/kafka/streams/errors/TaskMigratedException.java @@ -24,7 +24,7 @@ */ public class TaskMigratedException extends StreamsException { - private final static long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; public TaskMigratedException(final String message) { super(message + "; it means all tasks belonging to this thread should be migrated."); diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/EmitStrategy.java b/streams/src/main/java/org/apache/kafka/streams/kstream/EmitStrategy.java index bacb4352b93d7..ef59591e5268c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/EmitStrategy.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/EmitStrategy.java @@ -52,7 +52,7 @@ private EmitStrategy strategy() { this.strategy = strategy; } - private final static Map TYPE_TO_STRATEGY = new HashMap<>(); + private static final Map TYPE_TO_STRATEGY = new HashMap<>(); static { for (final StrategyType type : StrategyType.values()) { @@ -109,4 +109,4 @@ static EmitStrategy onWindowClose() { static EmitStrategy onWindowUpdate() { return new WindowUpdateStrategy(); } -} \ No newline at end of file +} diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/WindowedSerdes.java b/streams/src/main/java/org/apache/kafka/streams/kstream/WindowedSerdes.java index 07e1cae369b53..92971e02bcba8 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/WindowedSerdes.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/WindowedSerdes.java @@ -23,7 +23,7 @@ public class WindowedSerdes { - static public class TimeWindowedSerde extends Serdes.WrapperSerde> { + public static class TimeWindowedSerde extends Serdes.WrapperSerde> { // Default constructor needed for reflection object creation public TimeWindowedSerde() { super(new TimeWindowedSerializer<>(), new TimeWindowedDeserializer<>()); @@ -47,7 +47,7 @@ public TimeWindowedSerde forChangelog(final boolean isChangelogTopic) { } } - static public class SessionWindowedSerde extends Serdes.WrapperSerde> { + public static class SessionWindowedSerde extends Serdes.WrapperSerde> { // Default constructor needed for reflection object creation public SessionWindowedSerde() { super(new SessionWindowedSerializer<>(), new SessionWindowedDeserializer<>()); @@ -62,7 +62,7 @@ public SessionWindowedSerde(final Serde inner) { * Construct a {@code TimeWindowedSerde} object for the specified inner class type. */ @Deprecated - static public Serde> timeWindowedSerdeFrom(final Class type) { + public static Serde> timeWindowedSerdeFrom(final Class type) { return new TimeWindowedSerde<>(Serdes.serdeFrom(type)); } @@ -70,14 +70,14 @@ static public Serde> timeWindowedSerdeFrom(final Class type) * Construct a {@code TimeWindowedSerde} object to deserialize changelog topic * for the specified inner class type and window size. */ - static public Serde> timeWindowedSerdeFrom(final Class type, final long windowSize) { + public static Serde> timeWindowedSerdeFrom(final Class type, final long windowSize) { return new TimeWindowedSerde<>(Serdes.serdeFrom(type), windowSize); } /** * Construct a {@code SessionWindowedSerde} object for the specified inner class type. */ - static public Serde> sessionWindowedSerdeFrom(final Class type) { + public static Serde> sessionWindowedSerdeFrom(final Class type) { return new SessionWindowedSerde<>(Serdes.serdeFrom(type)); } diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/AbstractKStreamTimeWindowAggregateProcessor.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/AbstractKStreamTimeWindowAggregateProcessor.java index dfef0d4aaae65..299665985ea25 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/AbstractKStreamTimeWindowAggregateProcessor.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/AbstractKStreamTimeWindowAggregateProcessor.java @@ -223,9 +223,9 @@ private void fetchAndEmit(final Record record, } // upper and lower bound are inclusive; the bounds could be negative in which case we would skip range fetching and emitting - abstract protected long emitRangeLowerBound(final long windowCloseTime); + protected abstract long emitRangeLowerBound(final long windowCloseTime); - abstract protected long emitRangeUpperBound(final long windowCloseTime); + protected abstract long emitRangeUpperBound(final long windowCloseTime); - abstract protected boolean shouldRangeFetch(final long emitRangeLowerBound, final long emitRangeUpperBound); + protected abstract boolean shouldRangeFetch(final long emitRangeLowerBound, final long emitRangeUpperBound); } diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/CogroupedKStreamImpl.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/CogroupedKStreamImpl.java index 141533e96b141..541751d741534 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/CogroupedKStreamImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/CogroupedKStreamImpl.java @@ -44,8 +44,8 @@ public class CogroupedKStreamImpl extends AbstractStream imple static final String AGGREGATE_NAME = "COGROUPKSTREAM-AGGREGATE-"; static final String MERGE_NAME = "COGROUPKSTREAM-MERGE-"; - final private Map, Aggregator> groupPatterns; - final private CogroupedStreamAggregateBuilder aggregateBuilder; + private final Map, Aggregator> groupPatterns; + private final CogroupedStreamAggregateBuilder aggregateBuilder; CogroupedKStreamImpl(final String name, final Set subTopologySourceNodes, @@ -147,4 +147,4 @@ private KTable doAggregate(final Initializer initializer, materializedInternal.queryableStoreName(), materializedInternal.storeSupplier() instanceof VersionedBytesStoreSupplier); } -} \ No newline at end of file +} diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionResponseWrapper.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionResponseWrapper.java index 99556f16e4621..25fbbac4c62ba 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionResponseWrapper.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionResponseWrapper.java @@ -22,7 +22,7 @@ import java.util.Arrays; public class SubscriptionResponseWrapper { - final static byte CURRENT_VERSION = 0; + static final byte CURRENT_VERSION = 0; // v0 fields: private final long[] originalValueHash; private final FV foreignValue; diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/SourceGraphNode.java b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/SourceGraphNode.java index 05052279b5721..682b95c7be7e9 100644 --- a/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/SourceGraphNode.java +++ b/streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/SourceGraphNode.java @@ -25,7 +25,7 @@ import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.streams.kstream.internals.ConsumedInternal; -abstract public class SourceGraphNode extends GraphNode { +public abstract class SourceGraphNode extends GraphNode { private final Set topicNames; private final Pattern topicPattern; @@ -72,4 +72,4 @@ public Serde valueSerde() { return consumedInternal.valueSerde(); } -} \ No newline at end of file +} diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractTask.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractTask.java index 9e16d3bd5472c..902b8ac7a55d9 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractTask.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractTask.java @@ -38,7 +38,7 @@ import static org.apache.kafka.streams.processor.internals.Task.State.CREATED; public abstract class AbstractTask implements Task { - private final static long NO_DEADLINE = -1L; + private static final long NO_DEADLINE = -1L; private Task.State state = CREATED; private long deadlineMs = NO_DEADLINE; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java index 9629a3bccee38..b1427107fa503 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdater.java @@ -69,7 +69,7 @@ public class DefaultStateUpdater implements StateUpdater { - private final static String BUG_ERROR_MESSAGE = "This indicates a bug. " + + private static final String BUG_ERROR_MESSAGE = "This indicates a bug. " + "Please report at https://issues.apache.org/jira/projects/KAFKA/issues or to the dev-mailing list (https://kafka.apache.org/contact)."; private class StateUpdaterThread extends Thread { diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java index d42e90bf33f4c..49ed4495fba27 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/GlobalStateManagerImpl.java @@ -66,7 +66,7 @@ * of Global State Stores. There is only ever 1 instance of this class per Application Instance. */ public class GlobalStateManagerImpl implements GlobalStateManager { - private final static long NO_DEADLINE = -1L; + private static final long NO_DEADLINE = -1L; private final Time time; private final Logger log; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java index 0448ba64535b2..64df7cb2bb0fa 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopicManager.java @@ -66,9 +66,9 @@ public class InternalTopicManager { - private final static String BUG_ERROR_MESSAGE = "This indicates a bug. " + + private static final String BUG_ERROR_MESSAGE = "This indicates a bug. " + "Please report at https://issues.apache.org/jira/projects/KAFKA/issues or to the dev-mailing list (https://kafka.apache.org/contact)."; - private final static String INTERRUPTED_ERROR_MESSAGE = "Thread got interrupted. " + BUG_ERROR_MESSAGE; + private static final String INTERRUPTED_ERROR_MESSAGE = "Thread got interrupted. " + BUG_ERROR_MESSAGE; private final Logger log; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopologyBuilder.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopologyBuilder.java index 6870f09a827f2..184f7f96f2b7c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopologyBuilder.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopologyBuilder.java @@ -183,7 +183,7 @@ public Deserializer valueDeserializer() { } } - private static abstract class NodeFactory { + private abstract static class NodeFactory { final String name; final String[] predecessors; @@ -359,12 +359,12 @@ public final InternalTopologyBuilder setApplicationId(final String applicationId return this; } - public synchronized final void setStreamsConfig(final StreamsConfig applicationConfig) { + public final synchronized void setStreamsConfig(final StreamsConfig applicationConfig) { Objects.requireNonNull(applicationConfig, "config can't be null"); topologyConfigs = new TopologyConfig(applicationConfig); } - public synchronized final void setNamedTopology(final NamedTopology namedTopology) { + public final synchronized void setNamedTopology(final NamedTopology namedTopology) { this.namedTopology = namedTopology; } @@ -380,7 +380,7 @@ public NamedTopology namedTopology() { return namedTopology; } - public synchronized final InternalTopologyBuilder rewriteTopology(final StreamsConfig config) { + public final synchronized InternalTopologyBuilder rewriteTopology(final StreamsConfig config) { Objects.requireNonNull(config, "config can't be null"); setApplicationId(config.getString(StreamsConfig.APPLICATION_ID_CONFIG)); @@ -1572,7 +1572,7 @@ public int compare(final TopologyDescription.Node node1, } } - private final static NodeComparator NODE_COMPARATOR = new NodeComparator(); + private static final NodeComparator NODE_COMPARATOR = new NodeComparator(); private static void updateSize(final AbstractNode node, final int delta) { @@ -1609,7 +1609,7 @@ private void describeSubtopology(final TopologyDescription description, new HashSet<>(nodesByName.values()))); } - public final static class GlobalStore implements TopologyDescription.GlobalStore { + public static final class GlobalStore implements TopologyDescription.GlobalStore { private final Source source; private final Processor processor; private final int id; @@ -1706,7 +1706,7 @@ public void addSuccessor(final TopologyDescription.Node successor) { } } - public final static class Source extends AbstractNode implements TopologyDescription.Source { + public static final class Source extends AbstractNode implements TopologyDescription.Source { private final Set topics; private final Pattern topicPattern; @@ -1772,7 +1772,7 @@ public int hashCode() { } } - public final static class Processor extends AbstractNode implements TopologyDescription.Processor { + public static final class Processor extends AbstractNode implements TopologyDescription.Processor { private final Set stores; public Processor(final String name, @@ -1815,7 +1815,7 @@ public int hashCode() { } } - public final static class Sink extends AbstractNode implements TopologyDescription.Sink { + public static final class Sink extends AbstractNode implements TopologyDescription.Sink { private final TopicNameExtractor topicNameExtractor; public Sink(final String name, final TopicNameExtractor topicNameExtractor) { @@ -1884,7 +1884,7 @@ public int hashCode() { } } - public final static class SubtopologyDescription implements TopologyDescription.Subtopology { + public static final class SubtopologyDescription implements TopologyDescription.Subtopology { private final int id; private final Set nodes; @@ -2019,7 +2019,7 @@ public int compare(final TopologyDescription.GlobalStore globalStore1, } } - private final static GlobalStoreComparator GLOBALSTORE_COMPARATOR = new GlobalStoreComparator(); + private static final GlobalStoreComparator GLOBALSTORE_COMPARATOR = new GlobalStoreComparator(); private static class SubtopologyComparator implements Comparator, Serializable { @Override @@ -2032,9 +2032,9 @@ public int compare(final TopologyDescription.Subtopology subtopology1, } } - private final static SubtopologyComparator SUBTOPOLOGY_COMPARATOR = new SubtopologyComparator(); + private static final SubtopologyComparator SUBTOPOLOGY_COMPARATOR = new SubtopologyComparator(); - public final static class TopologyDescription implements org.apache.kafka.streams.TopologyDescription { + public static final class TopologyDescription implements org.apache.kafka.streams.TopologyDescription { private final TreeSet subtopologies = new TreeSet<>(SUBTOPOLOGY_COMPARATOR); private final TreeSet globalStores = new TreeSet<>(GLOBALSTORE_COMPARATOR); private final String namedTopology; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PunctuationSchedule.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PunctuationSchedule.java index bd8a1507ac369..e95f262a7025d 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/PunctuationSchedule.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/PunctuationSchedule.java @@ -103,7 +103,7 @@ synchronized void setSchedule(final PunctuationSchedule schedule) { } @Override - synchronized public void cancel() { + public synchronized void cancel() { schedule.markCancelled(); } } diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java index 8abf5e897623f..f42bea2405b3e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/RecordCollectorImpl.java @@ -60,7 +60,7 @@ import static org.apache.kafka.streams.processor.internals.ClientUtils.producerRecordSizeInBytes; public class RecordCollectorImpl implements RecordCollector { - private final static String SEND_EXCEPTION_MESSAGE = "Error encountered sending record to topic %s for task %s due to:%n%s"; + private static final String SEND_EXCEPTION_MESSAGE = "Error encountered sending record to topic %s for task %s due to:%n%s"; private final Logger log; private final TaskId taskId; diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java index d04d1451bddc9..561fbeb29912c 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StoreChangelogReader.java @@ -189,7 +189,7 @@ int bufferedLimitIndex() { } } - private final static long DEFAULT_OFFSET_UPDATE_MS = Duration.ofMinutes(5L).toMillis(); + private static final long DEFAULT_OFFSET_UPDATE_MS = Duration.ofMinutes(5L).toMillis(); private ChangelogReaderState state; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/QueryableStoreTypes.java b/streams/src/main/java/org/apache/kafka/streams/state/QueryableStoreTypes.java index c818d08e53d72..bdb297df955d9 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/QueryableStoreTypes.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/QueryableStoreTypes.java @@ -92,7 +92,7 @@ public static QueryableStoreType> sessionStore return new SessionStoreType<>(); } - private static abstract class QueryableStoreTypeMatcher implements QueryableStoreType { + private abstract static class QueryableStoreTypeMatcher implements QueryableStoreType { private final Set matchTo; @@ -184,4 +184,4 @@ public ReadOnlySessionStore create(final StateStoreProvider storeProvider, } } -} \ No newline at end of file +} diff --git a/streams/src/main/java/org/apache/kafka/streams/state/StreamsMetadata.java b/streams/src/main/java/org/apache/kafka/streams/state/StreamsMetadata.java index 131d16fb917c5..834f53da399be 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/StreamsMetadata.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/StreamsMetadata.java @@ -37,7 +37,7 @@ public class StreamsMetadata { * Sentinel to indicate that the StreamsMetadata is currently unavailable. This can occur during rebalance * operations. */ - public final static StreamsMetadata NOT_AVAILABLE = new StreamsMetadata(HostInfo.unavailable(), + public static final StreamsMetadata NOT_AVAILABLE = new StreamsMetadata(HostInfo.unavailable(), Collections.emptySet(), Collections.emptySet(), Collections.emptySet(), diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStore.java index 284385a47de9f..8e69ada08d298 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractDualSchemaRocksDBSegmentedBytesStore.java @@ -126,7 +126,7 @@ public void remove(final Bytes rawBaseKey) { } } - abstract protected KeyValue getIndexKeyValue(final Bytes baseKey, final byte[] baseValue); + protected abstract KeyValue getIndexKeyValue(final Bytes baseKey, final byte[] baseValue); // isTimeFirstWindowSchema true implies ON_WINDOW_CLOSE semantics. There's an edge case // when retentionPeriod = grace Period. If we add 1, then actualFrom > to which would @@ -338,4 +338,4 @@ public Position getPosition() { public boolean hasIndex() { return indexKeySchema.isPresent(); } -} \ No newline at end of file +} diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractRocksDBTimeOrderedSegmentedBytesStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractRocksDBTimeOrderedSegmentedBytesStore.java index f8217c6d06699..148a91023fe7a 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractRocksDBTimeOrderedSegmentedBytesStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractRocksDBTimeOrderedSegmentedBytesStore.java @@ -108,7 +108,7 @@ public KeyValue next() { return KeyValue.pair(getBaseKey(ret.key), value); } - abstract protected Bytes getBaseKey(final Bytes indexKey); + protected abstract Bytes getBaseKey(final Bytes indexKey); } AbstractRocksDBTimeOrderedSegmentedBytesStore(final String name, @@ -135,7 +135,7 @@ public KeyValueIterator backwardFetch(final Bytes key, return fetch(key, from, to, false); } - abstract protected IndexToBaseStoreIterator getIndexToBaseStoreIterator(final SegmentIterator segmentIterator); + protected abstract IndexToBaseStoreIterator getIndexToBaseStoreIterator(final SegmentIterator segmentIterator); KeyValueIterator fetch(final Bytes key, final long from, @@ -291,4 +291,4 @@ public KeyValueIterator backwardFetchAll(final long timeFrom, binaryTo, false); } -} \ No newline at end of file +} diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractStoreBuilder.java index 4dde3bd3209f3..37c1eb257fc36 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractStoreBuilder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractStoreBuilder.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Objects; -abstract public class AbstractStoreBuilder implements StoreBuilder { +public abstract class AbstractStoreBuilder implements StoreBuilder { protected Map logConfig = new HashMap<>(); protected final String name; final Serde keySerde; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemorySessionStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemorySessionStore.java index 67a6ea46b6c3a..787ff5a93df13 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemorySessionStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemorySessionStore.java @@ -66,7 +66,7 @@ public class InMemorySessionStore implements SessionStore { private final long retentionPeriod; - private final static String INVALID_RANGE_WARN_MSG = + private static final String INVALID_RANGE_WARN_MSG = "Returning empty iterator for fetch with invalid key range: from > to. " + "This may be due to range arguments set in the wrong order, " + "or serdes that don't preserve ordering when lexicographically comparing the serialized bytes. " + diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryWindowStore.java index 2f85a1b4cc6ae..f9c4533a3c557 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryWindowStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryWindowStore.java @@ -479,7 +479,7 @@ interface ClosingCallback { void deregisterIterator(final InMemoryWindowStoreIteratorWrapper iterator); } - private static abstract class InMemoryWindowStoreIteratorWrapper { + private abstract static class InMemoryWindowStoreIteratorWrapper { private Iterator> recordIterator; private KeyValue next; diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ListValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ListValueStore.java index 628bfedc42f1d..338bbc3b24641 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ListValueStore.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ListValueStore.java @@ -42,7 +42,7 @@ public class ListValueStore extends WrappedStateStore, Bytes, byte[]> implements KeyValueStore { - static private final Serde> LIST_SERDE = Serdes.ListSerde(ArrayList.class, Serdes.ByteArray()); + private static final Serde> LIST_SERDE = Serdes.ListSerde(ArrayList.class, Serdes.ByteArray()); ListValueStore(final KeyValueStore bytesStore) { super(bytesStore); @@ -166,4 +166,4 @@ public void close() { currList.clear(); } } -} \ No newline at end of file +} diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/NamedCache.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/NamedCache.java index c4119906dd765..39afdd4f62d8b 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/NamedCache.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/NamedCache.java @@ -75,7 +75,7 @@ class NamedCache { ); } - synchronized final String name() { + final synchronized String name() { return name; } diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java index 31322d0ad21ad..ded0efe65f054 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java @@ -86,7 +86,7 @@ private KeyValueStore maybeWrapLogging(final KeyValueStore, Bytes, byte[]> implements KeyValueStore, TimestampedBytesStore { @@ -176,4 +176,4 @@ public boolean persistent() { return false; } } -} \ No newline at end of file +} diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java index 740e00e04ad43..7bc2ed0793d84 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java @@ -119,7 +119,7 @@ public long retentionPeriod() { } - private final static class InMemoryTimestampedWindowStoreMarker + private static final class InMemoryTimestampedWindowStoreMarker extends WrappedStateStore, Bytes, byte[]> implements WindowStore, TimestampedBytesStore { diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ValueAndTimestampDeserializer.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ValueAndTimestampDeserializer.java index 5ea4225c4c9cb..5f6cd98b7639e 100644 --- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ValueAndTimestampDeserializer.java +++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ValueAndTimestampDeserializer.java @@ -29,7 +29,7 @@ import static org.apache.kafka.streams.kstream.internals.WrappingNullableUtils.initNullableDeserializer; class ValueAndTimestampDeserializer implements WrappingNullableDeserializer, Void, V> { - private final static LongDeserializer LONG_DESERIALIZER = new LongDeserializer(); + private static final LongDeserializer LONG_DESERIALIZER = new LongDeserializer(); public final Deserializer valueDeserializer; private final Deserializer timestampDeserializer; @@ -94,4 +94,4 @@ public void setIfUnset(final SerdeGetter getter) { // but it may wrap a deserializer that itself wraps a null deserializer. initNullableDeserializer(valueDeserializer, getter); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java b/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java index f5a8dfdece456..ddfc6ef7c1e18 100644 --- a/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/KafkaStreamsTest.java @@ -144,9 +144,9 @@ public class KafkaStreamsTest { public Timeout globalTimeout = Timeout.seconds(600); private static final int NUM_THREADS = 2; - private final static String APPLICATION_ID = "appId"; - private final static String CLIENT_ID = "test-client"; - private final static Duration DEFAULT_DURATION = Duration.ofSeconds(30); + private static final String APPLICATION_ID = "appId"; + private static final String CLIENT_ID = "test-client"; + private static final Duration DEFAULT_DURATION = Duration.ofSeconds(30); @Rule public TestName testName = new TestName(); diff --git a/streams/src/test/java/org/apache/kafka/streams/TopologyTest.java b/streams/src/test/java/org/apache/kafka/streams/TopologyTest.java index ceecbc3bc2178..5a0c530857686 100644 --- a/streams/src/test/java/org/apache/kafka/streams/TopologyTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/TopologyTest.java @@ -403,7 +403,7 @@ public void shouldThrowOnUnassignedStateStoreAccess() { } private static class LocalMockProcessorSupplier implements ProcessorSupplier { - final static String STORE_NAME = "store"; + static final String STORE_NAME = "store"; @Override public Processor get() { diff --git a/streams/src/test/java/org/apache/kafka/streams/TopologyWrapper.java b/streams/src/test/java/org/apache/kafka/streams/TopologyWrapper.java index e1c7c1170ab01..8cbd68d87c0b3 100644 --- a/streams/src/test/java/org/apache/kafka/streams/TopologyWrapper.java +++ b/streams/src/test/java/org/apache/kafka/streams/TopologyWrapper.java @@ -25,7 +25,7 @@ */ public class TopologyWrapper extends Topology { - static public InternalTopologyBuilder getInternalTopologyBuilder(final Topology topology) { + public static InternalTopologyBuilder getInternalTopologyBuilder(final Topology topology) { return topology.internalTopologyBuilder.rewriteTopology(new StreamsConfig(StreamsTestUtils.getStreamsConfig())); } diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java index 20199267ecac8..64230d22735d9 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/EosIntegrationTest.java @@ -143,14 +143,14 @@ public static void closeCluster() { private String applicationId; - private final static int NUM_TOPIC_PARTITIONS = 2; - private final static String CONSUMER_GROUP_ID = "readCommitted"; - private final static String SINGLE_PARTITION_INPUT_TOPIC = "singlePartitionInputTopic"; - private final static String SINGLE_PARTITION_THROUGH_TOPIC = "singlePartitionThroughTopic"; - private final static String SINGLE_PARTITION_OUTPUT_TOPIC = "singlePartitionOutputTopic"; - private final static String MULTI_PARTITION_INPUT_TOPIC = "multiPartitionInputTopic"; - private final static String MULTI_PARTITION_THROUGH_TOPIC = "multiPartitionThroughTopic"; - private final static String MULTI_PARTITION_OUTPUT_TOPIC = "multiPartitionOutputTopic"; + private static final int NUM_TOPIC_PARTITIONS = 2; + private static final String CONSUMER_GROUP_ID = "readCommitted"; + private static final String SINGLE_PARTITION_INPUT_TOPIC = "singlePartitionInputTopic"; + private static final String SINGLE_PARTITION_THROUGH_TOPIC = "singlePartitionThroughTopic"; + private static final String SINGLE_PARTITION_OUTPUT_TOPIC = "singlePartitionOutputTopic"; + private static final String MULTI_PARTITION_INPUT_TOPIC = "multiPartitionInputTopic"; + private static final String MULTI_PARTITION_THROUGH_TOPIC = "multiPartitionThroughTopic"; + private static final String MULTI_PARTITION_OUTPUT_TOPIC = "multiPartitionOutputTopic"; private final String storeName = "store"; private AtomicBoolean errorInjected; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/EosV2UpgradeIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/EosV2UpgradeIntegrationTest.java index bac9ae37eb8e7..2aa6d38baf4bc 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/EosV2UpgradeIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/EosV2UpgradeIntegrationTest.java @@ -140,13 +140,13 @@ public static void closeCluster() { } private static String applicationId; - private final static int NUM_TOPIC_PARTITIONS = 4; - private final static String CONSUMER_GROUP_ID = "readCommitted"; - private final static String MULTI_PARTITION_INPUT_TOPIC = "multiPartitionInputTopic"; - private final static String MULTI_PARTITION_OUTPUT_TOPIC = "multiPartitionOutputTopic"; - private final static String APP_DIR_1 = "appDir1"; - private final static String APP_DIR_2 = "appDir2"; - private final static String UNEXPECTED_EXCEPTION_MSG = "Fail the test since we got an unexpected exception, or " + + private static final int NUM_TOPIC_PARTITIONS = 4; + private static final String CONSUMER_GROUP_ID = "readCommitted"; + private static final String MULTI_PARTITION_INPUT_TOPIC = "multiPartitionInputTopic"; + private static final String MULTI_PARTITION_OUTPUT_TOPIC = "multiPartitionOutputTopic"; + private static final String APP_DIR_1 = "appDir1"; + private static final String APP_DIR_2 = "appDir2"; + private static final String UNEXPECTED_EXCEPTION_MSG = "Fail the test since we got an unexpected exception, or " + "there are too many exceptions thrown, please check standard error log for more info."; private final String storeName = "store"; @@ -1159,7 +1159,7 @@ private Set keysFromInstance(final KafkaStreams streams) throws Exception // must be public to allow KafkaProducer to instantiate it public static class KeyPartitioner implements Partitioner { - private final static LongDeserializer LONG_DESERIALIZER = new LongDeserializer(); + private static final LongDeserializer LONG_DESERIALIZER = new LongDeserializer(); @Override public int partition(final String topic, diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java index 10ab37cee0714..cff5c6e39b715 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KStreamKStreamIntegrationTest.java @@ -62,17 +62,17 @@ @Timeout(600) @Tag("integration") public class KStreamKStreamIntegrationTest { - private final static int NUM_BROKERS = 1; + private static final int NUM_BROKERS = 1; - public final static EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(NUM_BROKERS); - private final static MockTime MOCK_TIME = CLUSTER.time; - private final static String LEFT_STREAM = "leftStream"; - private final static String RIGHT_STREAM = "rightStream"; - private final static String OUTPUT = "output"; + public static final EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(NUM_BROKERS); + private static final MockTime MOCK_TIME = CLUSTER.time; + private static final String LEFT_STREAM = "leftStream"; + private static final String RIGHT_STREAM = "rightStream"; + private static final String OUTPUT = "output"; private Properties streamsConfig; private KafkaStreams streams; - private final static Properties CONSUMER_CONFIG = new Properties(); - private final static Properties PRODUCER_CONFIG = new Properties(); + private static final Properties CONSUMER_CONFIG = new Properties(); + private static final Properties PRODUCER_CONFIG = new Properties(); @BeforeAll public static void startCluster() throws Exception { @@ -186,4 +186,4 @@ private static KafkaStreams prepareTopology(final Properties streamsConfig) { return new KafkaStreams(builder.build(streamsConfig), streamsConfig); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java index 6ed47c6c41dbd..ebdb6b7b631a8 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest.java @@ -74,22 +74,22 @@ @Timeout(600) @Tag("integration") public class KTableKTableForeignKeyInnerJoinCustomPartitionerIntegrationTest { - private final static int NUM_BROKERS = 1; + private static final int NUM_BROKERS = 1; - public final static EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(NUM_BROKERS); - private final static MockTime MOCK_TIME = CLUSTER.time; - private final static String TABLE_1 = "table1"; - private final static String TABLE_2 = "table2"; - private final static String OUTPUT = "output-"; + public static final EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(NUM_BROKERS); + private static final MockTime MOCK_TIME = CLUSTER.time; + private static final String TABLE_1 = "table1"; + private static final String TABLE_2 = "table2"; + private static final String OUTPUT = "output-"; private Properties streamsConfig; private Properties streamsConfigTwo; private Properties streamsConfigThree; private KafkaStreams streams; private KafkaStreams streamsTwo; private KafkaStreams streamsThree; - private final static Properties CONSUMER_CONFIG = new Properties(); - private final static Properties PRODUCER_CONFIG_1 = new Properties(); - private final static Properties PRODUCER_CONFIG_2 = new Properties(); + private static final Properties CONSUMER_CONFIG = new Properties(); + private static final Properties PRODUCER_CONFIG_1 = new Properties(); + private static final Properties PRODUCER_CONFIG_2 = new Properties(); static class MultiPartitioner implements StreamPartitioner { @@ -347,4 +347,4 @@ private static String getKeyB(final String value) { return value.substring(0, value.indexOf("-")); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java index dd387405cb04d..367717cfa00c1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableKTableForeignKeyInnerJoinMultiIntegrationTest.java @@ -65,25 +65,25 @@ @Timeout(600) @Tag("integration") public class KTableKTableForeignKeyInnerJoinMultiIntegrationTest { - private final static int NUM_BROKERS = 1; - - public final static EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(NUM_BROKERS); - private final static MockTime MOCK_TIME = CLUSTER.time; - private final static String TABLE_1 = "table1"; - private final static String TABLE_2 = "table2"; - private final static String TABLE_3 = "table3"; - private final static String OUTPUT = "output-"; + private static final int NUM_BROKERS = 1; + + public static final EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(NUM_BROKERS); + private static final MockTime MOCK_TIME = CLUSTER.time; + private static final String TABLE_1 = "table1"; + private static final String TABLE_2 = "table2"; + private static final String TABLE_3 = "table3"; + private static final String OUTPUT = "output-"; private final Properties streamsConfig = getStreamsConfig(); private final Properties streamsConfigTwo = getStreamsConfig(); private final Properties streamsConfigThree = getStreamsConfig(); private KafkaStreams streams; private KafkaStreams streamsTwo; private KafkaStreams streamsThree; - private final static Properties CONSUMER_CONFIG = new Properties(); + private static final Properties CONSUMER_CONFIG = new Properties(); - private final static Properties PRODUCER_CONFIG_1 = new Properties(); - private final static Properties PRODUCER_CONFIG_2 = new Properties(); - private final static Properties PRODUCER_CONFIG_3 = new Properties(); + private static final Properties PRODUCER_CONFIG_1 = new Properties(); + private static final Properties PRODUCER_CONFIG_2 = new Properties(); + private static final Properties PRODUCER_CONFIG_3 = new Properties(); @BeforeAll public static void startCluster() throws IOException, InterruptedException { diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java index 9f95d0a0823ec..b9b34be5e6cfd 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/MetricsReporterIntegrationTest.java @@ -84,7 +84,7 @@ public void before(final TestInfo testInfo) throws InterruptedException { streamsConfiguration.put(CommonClientConfigs.METRIC_REPORTER_CLASSES_CONFIG, MetricReporterImpl.class.getName()); } - final static Map METRIC_NAME_TO_INITIAL_VALUE = new HashMap<>(); + static final Map METRIC_NAME_TO_INITIAL_VALUE = new HashMap<>(); public static class MetricReporterImpl implements MetricsReporter { @@ -127,4 +127,4 @@ public void shouldBeAbleToProvideInitialMetricValueToMetricsReporter() { } } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java index 3864a0e8ffffc..71c9d483dc946 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/PurgeRepartitionTopicIntegrationTest.java @@ -91,7 +91,7 @@ public static void closeCluster() { private class RepartitionTopicCreatedWithExpectedConfigs implements TestCondition { @Override - final public boolean conditionMet() { + public final boolean conditionMet() { try { final Set topics = adminClient.listTopics().names().get(); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java index bac33419819ee..33f33a192a6d7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSIntegrationTest.java @@ -77,9 +77,9 @@ public class StandbyTaskEOSIntegrationTest { @Rule public Timeout globalTimeout = Timeout.seconds(600); - private final static long REBALANCE_TIMEOUT = Duration.ofMinutes(2L).toMillis(); - private final static int KEY_0 = 0; - private final static int KEY_1 = 1; + private static final long REBALANCE_TIMEOUT = Duration.ofMinutes(2L).toMillis(); + private static final int KEY_0 = 0; + private static final int KEY_1 = 1; @SuppressWarnings("deprecation") @Parameterized.Parameters(name = "{0}") diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java index c29475579bd16..e8d8d0098652e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/StandbyTaskEOSMultiRebalanceIntegrationTest.java @@ -65,7 +65,7 @@ public class StandbyTaskEOSMultiRebalanceIntegrationTest { private static final Logger LOG = LoggerFactory.getLogger(StandbyTaskEOSMultiRebalanceIntegrationTest.class); - private final static long TWO_MINUTE_TIMEOUT = Duration.ofMinutes(2L).toMillis(); + private static final long TWO_MINUTE_TIMEOUT = Duration.ofMinutes(2L).toMillis(); private String appId; private String inputTopic; diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java index e20f71680596d..006a32cca41ec 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/StoreQueryIntegrationTest.java @@ -97,7 +97,7 @@ public class StoreQueryIntegrationTest { private static final String INPUT_TOPIC_NAME = "input-topic"; private static final String TABLE_NAME = "source-table"; - public final static EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(NUM_BROKERS); + public static final EmbeddedKafkaCluster CLUSTER = new EmbeddedKafkaCluster(NUM_BROKERS); private String appId; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamGlobalKTableJoinTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamGlobalKTableJoinTest.java index 7160381c69093..f38c95b391e7d 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamGlobalKTableJoinTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamGlobalKTableJoinTest.java @@ -48,7 +48,7 @@ import static org.junit.Assert.assertEquals; public class KStreamGlobalKTableJoinTest { - private final static KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; + private static final KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; private final String streamTopic = "streamTopic"; private final String globalTableTopic = "globalTableTopic"; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamGlobalKTableLeftJoinTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamGlobalKTableLeftJoinTest.java index f1fedab4732f3..acd61d766c9bc 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamGlobalKTableLeftJoinTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamGlobalKTableLeftJoinTest.java @@ -48,7 +48,7 @@ import static org.junit.Assert.assertEquals; public class KStreamGlobalKTableLeftJoinTest { - private final static KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; + private static final KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; private final String streamTopic = "streamTopic"; private final String globalTableTopic = "globalTableTopic"; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKStreamLeftJoinTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKStreamLeftJoinTest.java index 48719c29daf48..0db1f28b03ca6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKStreamLeftJoinTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKStreamLeftJoinTest.java @@ -49,12 +49,12 @@ import static org.junit.Assert.assertEquals; public class KStreamKStreamLeftJoinTest { - private final static KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; + private static final KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; private final String topic1 = "topic1"; private final String topic2 = "topic2"; private final Consumed consumed = Consumed.with(Serdes.Integer(), Serdes.String()); - private final static Properties PROPS = StreamsTestUtils.getStreamsConfig(Serdes.String(), Serdes.String()); + private static final Properties PROPS = StreamsTestUtils.getStreamsConfig(Serdes.String(), Serdes.String()); @SuppressWarnings("deprecation") // old join semantics; can be removed when `JoinWindows.of()` is removed @Test diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKStreamOuterJoinTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKStreamOuterJoinTest.java index 762b078e758d5..044f6c37f138a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKStreamOuterJoinTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKStreamOuterJoinTest.java @@ -63,7 +63,7 @@ public class KStreamKStreamOuterJoinTest { private final String topic1 = "topic1"; private final String topic2 = "topic2"; private final Consumed consumed = Consumed.with(Serdes.Integer(), Serdes.String()); - private final static Properties PROPS = StreamsTestUtils.getStreamsConfig(Serdes.String(), Serdes.String()); + private static final Properties PROPS = StreamsTestUtils.getStreamsConfig(Serdes.String(), Serdes.String()); @SuppressWarnings("deprecation") // old join semantics; can be removed when `JoinWindows.of()` is removed @Test diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKTableJoinTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKTableJoinTest.java index c015f5a4d7350..cfb40ee1dbb47 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKTableJoinTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKTableJoinTest.java @@ -57,7 +57,7 @@ import org.junit.Test; public class KStreamKTableJoinTest { - private final static KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; + private static final KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; private final String streamTopic = "streamTopic"; private final String tableTopic = "tableTopic"; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKTableLeftJoinTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKTableLeftJoinTest.java index d68f9bf5833aa..56992745a1d4a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKTableLeftJoinTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KStreamKTableLeftJoinTest.java @@ -47,7 +47,7 @@ import static org.junit.Assert.assertEquals; public class KStreamKTableLeftJoinTest { - private final static KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; + private static final KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; private final String streamTopic = "streamTopic"; private final String tableTopic = "tableTopic"; diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java index 7e40b0978e9b6..ab48892644596 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableAggregateTest.java @@ -67,7 +67,7 @@ public class KTableAggregateTest { private final Consumed consumed = Consumed.with(stringSerde, stringSerde); private final Grouped stringSerialized = Grouped.with(stringSerde, stringSerde); private final MockApiProcessorSupplier supplier = new MockApiProcessorSupplier<>(); - private final static Properties CONFIG = mkProperties(mkMap( + private static final Properties CONFIG = mkProperties(mkMap( mkEntry(StreamsConfig.STATE_DIR_CONFIG, TestUtils.tempDirectory("kafka-test").getAbsolutePath()))); @Test diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableInnerJoinTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableInnerJoinTest.java index 0834727234eea..e0f579989a493 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableInnerJoinTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/KTableKTableInnerJoinTest.java @@ -55,7 +55,7 @@ import static org.junit.Assert.assertTrue; public class KTableKTableInnerJoinTest { - private final static KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; + private static final KeyValueTimestamp[] EMPTY = new KeyValueTimestamp[0]; private final String topic1 = "topic1"; private final String topic2 = "topic2"; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java index 4f6a659aca702..82846b128faf4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java @@ -79,24 +79,24 @@ class DefaultStateUpdaterTest { - private final static int COMMIT_INTERVAL = 100; - private final static long CALL_TIMEOUT = 1000; - private final static long VERIFICATION_TIMEOUT = 30000; - private final static TopicPartition TOPIC_PARTITION_A_0 = new TopicPartition("topicA", 0); - private final static TopicPartition TOPIC_PARTITION_A_1 = new TopicPartition("topicA", 1); - private final static TopicPartition TOPIC_PARTITION_B_0 = new TopicPartition("topicB", 0); - private final static TopicPartition TOPIC_PARTITION_B_1 = new TopicPartition("topicB", 1); - private final static TopicPartition TOPIC_PARTITION_C_0 = new TopicPartition("topicC", 0); - private final static TopicPartition TOPIC_PARTITION_D_0 = new TopicPartition("topicD", 0); - private final static TaskId TASK_0_0 = new TaskId(0, 0); - private final static TaskId TASK_0_1 = new TaskId(0, 1); - private final static TaskId TASK_0_2 = new TaskId(0, 2); - private final static TaskId TASK_1_0 = new TaskId(1, 0); - private final static TaskId TASK_1_1 = new TaskId(1, 1); - private final static TaskId TASK_A_0_0 = new TaskId(0, 0, "A"); - private final static TaskId TASK_A_0_1 = new TaskId(0, 1, "A"); - private final static TaskId TASK_B_0_0 = new TaskId(0, 0, "B"); - private final static TaskId TASK_B_0_1 = new TaskId(0, 1, "B"); + private static final int COMMIT_INTERVAL = 100; + private static final long CALL_TIMEOUT = 1000; + private static final long VERIFICATION_TIMEOUT = 30000; + private static final TopicPartition TOPIC_PARTITION_A_0 = new TopicPartition("topicA", 0); + private static final TopicPartition TOPIC_PARTITION_A_1 = new TopicPartition("topicA", 1); + private static final TopicPartition TOPIC_PARTITION_B_0 = new TopicPartition("topicB", 0); + private static final TopicPartition TOPIC_PARTITION_B_1 = new TopicPartition("topicB", 1); + private static final TopicPartition TOPIC_PARTITION_C_0 = new TopicPartition("topicC", 0); + private static final TopicPartition TOPIC_PARTITION_D_0 = new TopicPartition("topicD", 0); + private static final TaskId TASK_0_0 = new TaskId(0, 0); + private static final TaskId TASK_0_1 = new TaskId(0, 1); + private static final TaskId TASK_0_2 = new TaskId(0, 2); + private static final TaskId TASK_1_0 = new TaskId(1, 0); + private static final TaskId TASK_1_1 = new TaskId(1, 1); + private static final TaskId TASK_A_0_0 = new TaskId(0, 0, "A"); + private static final TaskId TASK_A_0_1 = new TaskId(0, 1, "A"); + private static final TaskId TASK_B_0_0 = new TaskId(0, 0, "B"); + private static final TaskId TASK_B_0_1 = new TaskId(0, 1, "B"); // need an auto-tick timer to work for draining with timeout private final Time time = new MockTime(1L); @@ -1889,4 +1889,4 @@ private void verifyDrainingExceptionsAndFailedTasks(final ExceptionAndTasks... e assertFalse(stateUpdater.hasExceptionsAndFailedTasks()); assertTrue(stateUpdater.drainExceptionsAndFailedTasks().isEmpty()); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java index c1b83aaef85ca..ed1ed9197ddd6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalStreamThreadTest.java @@ -76,8 +76,8 @@ public class GlobalStreamThreadTest { private StreamsConfig config; private String baseDirectoryName; - private final static String GLOBAL_STORE_TOPIC_NAME = "foo"; - private final static String GLOBAL_STORE_NAME = "bar"; + private static final String GLOBAL_STORE_TOPIC_NAME = "foo"; + private static final String GLOBAL_STORE_NAME = "bar"; private final TopicPartition topicPartition = new TopicPartition(GLOBAL_STORE_TOPIC_NAME, 0); @Before diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorRecordContextTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorRecordContextTest.java index 68eb21e40a3a8..7f62e2d8b87f6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorRecordContextTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorRecordContextTest.java @@ -25,7 +25,7 @@ public class ProcessorRecordContextTest { // timestamp + offset + partition: 8 + 8 + 4 - private final static long MIN_SIZE = 20L; + private static final long MIN_SIZE = 20L; @Test public void shouldNotAllowNullHeaders() { diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RackAwarenessStreamsPartitionAssignorTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RackAwarenessStreamsPartitionAssignorTest.java index c07447184c975..32c15f7e4faa4 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RackAwarenessStreamsPartitionAssignorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RackAwarenessStreamsPartitionAssignorTest.java @@ -108,7 +108,7 @@ public class RackAwarenessStreamsPartitionAssignorTest { emptySet(), emptySet()); - private final static List ALL_TAG_KEYS = new ArrayList<>(); + private static final List ALL_TAG_KEYS = new ArrayList<>(); static { for (int i = 0; i < StreamsConfig.MAX_RACK_AWARE_ASSIGNMENT_TAG_LIST_SIZE; i++) { ALL_TAG_KEYS.add("key-" + i); diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java index 44644ba1577b6..96478923f36be 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamThreadTest.java @@ -191,9 +191,9 @@ public static Collection data() { }); } - private final static String APPLICATION_ID = "stream-thread-test"; - private final static UUID PROCESS_ID = UUID.fromString("87bf53a8-54f2-485f-a4b6-acdbec0a8b3d"); - private final static String CLIENT_ID = APPLICATION_ID + "-" + PROCESS_ID; + private static final String APPLICATION_ID = "stream-thread-test"; + private static final UUID PROCESS_ID = UUID.fromString("87bf53a8-54f2-485f-a4b6-acdbec0a8b3d"); + private static final String CLIENT_ID = APPLICATION_ID + "-" + PROCESS_ID; public static final String STREAM_THREAD_TEST_COUNT_ONE_CHANGELOG = "stream-thread-test-count-one-changelog"; public static final String STREAM_THREAD_TEST_TABLE_TWO_CHANGELOG = "stream-thread-test-table-two-changelog"; @@ -216,7 +216,7 @@ public static Collection data() { @Mock private Consumer consumer; - private final static BiConsumer HANDLER = (e, b) -> { + private static final BiConsumer HANDLER = (e, b) -> { if (e instanceof RuntimeException) { throw (RuntimeException) e; } else if (e instanceof Error) { diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java index e14e033363436..03f76294203f7 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StreamsAssignmentScaleTest.java @@ -68,8 +68,8 @@ @Category({IntegrationTest.class}) @RunWith(MockitoJUnitRunner.StrictStubs.class) public class StreamsAssignmentScaleTest { - final static long MAX_ASSIGNMENT_DURATION = 120 * 1000L; // we should stay below `max.poll.interval.ms` - final static String APPLICATION_ID = "streams-assignment-scale-test"; + static final long MAX_ASSIGNMENT_DURATION = 120 * 1000L; // we should stay below `max.poll.interval.ms` + static final String APPLICATION_ID = "streams-assignment-scale-test"; private final Logger log = LoggerFactory.getLogger(StreamsAssignmentScaleTest.class); diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadataTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadataTest.java index 127999ad51d0c..5d6a5f0a67e8e 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadataTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TaskExecutionMetadataTest.java @@ -31,11 +31,11 @@ import static org.mockito.Mockito.when; public class TaskExecutionMetadataTest { - final static String TOPOLOGY1 = "topology1"; - final static String TOPOLOGY2 = "topology2"; - final static Set NAMED_TOPOLOGIES = new HashSet<>(Arrays.asList(TOPOLOGY1, TOPOLOGY2)); - final static int TIME_ZERO = 0; - final static int CONSTANT_BACKOFF_MS = 5000; + static final String TOPOLOGY1 = "topology1"; + static final String TOPOLOGY2 = "topology2"; + static final Set NAMED_TOPOLOGIES = new HashSet<>(Arrays.asList(TOPOLOGY1, TOPOLOGY2)); + static final int TIME_ZERO = 0; + static final int CONSTANT_BACKOFF_MS = 5000; @Test public void testCanProcessWithoutNamedTopologies() { @@ -120,4 +120,4 @@ private static Task createMockTask(final String topologyName) { when(mockTask.id()).thenReturn(taskId); return mockTask; } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java index f18c4299b462a..6c8702560de3f 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java @@ -42,16 +42,16 @@ public class TasksTest { - private final static TopicPartition TOPIC_PARTITION_A_0 = new TopicPartition("topicA", 0); - private final static TopicPartition TOPIC_PARTITION_A_1 = new TopicPartition("topicA", 1); - private final static TopicPartition TOPIC_PARTITION_B_0 = new TopicPartition("topicB", 0); - private final static TopicPartition TOPIC_PARTITION_B_1 = new TopicPartition("topicB", 1); - private final static TaskId TASK_0_0 = new TaskId(0, 0); - private final static TaskId TASK_0_1 = new TaskId(0, 1); - private final static TaskId TASK_0_2 = new TaskId(0, 2); - private final static TaskId TASK_1_0 = new TaskId(1, 0); - private final static TaskId TASK_1_1 = new TaskId(1, 1); - private final static TaskId TASK_1_2 = new TaskId(1, 2); + private static final TopicPartition TOPIC_PARTITION_A_0 = new TopicPartition("topicA", 0); + private static final TopicPartition TOPIC_PARTITION_A_1 = new TopicPartition("topicA", 1); + private static final TopicPartition TOPIC_PARTITION_B_0 = new TopicPartition("topicB", 0); + private static final TopicPartition TOPIC_PARTITION_B_1 = new TopicPartition("topicB", 1); + private static final TaskId TASK_0_0 = new TaskId(0, 0); + private static final TaskId TASK_0_1 = new TaskId(0, 1); + private static final TaskId TASK_0_2 = new TaskId(0, 2); + private static final TaskId TASK_1_0 = new TaskId(1, 0); + private static final TaskId TASK_1_1 = new TaskId(1, 1); + private static final TaskId TASK_1_2 = new TaskId(1, 2); private final Tasks tasks = new Tasks(new LogContext()); @@ -346,4 +346,4 @@ public void shouldOnlyKeepLastUpdateAction() { assertNull(tasks.removePendingTaskToCloseReviveAndUpdateInputPartitions(TASK_0_0)); assertNotNull(tasks.removePendingTaskToRecycle(TASK_0_0)); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TopologyMetadataTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TopologyMetadataTest.java index 8856f6ae2fdd3..37ba3424e1294 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TopologyMetadataTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TopologyMetadataTest.java @@ -31,8 +31,8 @@ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class TopologyMetadataTest { - final static String TOPOLOGY1 = "topology1"; - final static String TOPOLOGY2 = "topology2"; + static final String TOPOLOGY1 = "topology1"; + static final String TOPOLOGY2 = "topology2"; @Test public void testPauseResume() { diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/assignment/SubscriptionInfoTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/assignment/SubscriptionInfoTest.java index b635a50642774..caf043abe46a0 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/assignment/SubscriptionInfoTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/assignment/SubscriptionInfoTest.java @@ -85,7 +85,7 @@ public class SubscriptionInfoTest { ); private static final Map CLIENT_TAGS = mkMap(mkEntry("t1", "v1"), mkEntry("t2", "v2")); - private final static String IGNORED_USER_ENDPOINT = "ignoredUserEndpoint:80"; + private static final String IGNORED_USER_ENDPOINT = "ignoredUserEndpoint:80"; private static final byte IGNORED_UNIQUE_FIELD = (byte) 0; private static final int IGNORED_ERROR_CODE = 0; diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/StreamsMetricsImplTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/StreamsMetricsImplTest.java index 654f2e6b10ee1..973443d6fa2cb 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/StreamsMetricsImplTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/StreamsMetricsImplTest.java @@ -84,45 +84,45 @@ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class StreamsMetricsImplTest { - private final static String SENSOR_PREFIX_DELIMITER = "."; - private final static String SENSOR_NAME_DELIMITER = ".s."; - private final static String SENSOR_NAME_1 = "sensor1"; - private final static String SENSOR_NAME_2 = "sensor2"; - private final static String INTERNAL_PREFIX = "internal"; - private final static String VERSION = StreamsConfig.METRICS_LATEST; - private final static String CLIENT_ID = "test-client"; - private final static String THREAD_ID1 = "test-thread-1"; - private final static String TASK_ID1 = "test-task-1"; - private final static String TASK_ID2 = "test-task-2"; - private final static String NODE_ID1 = "test-node-1"; - private final static String NODE_ID2 = "test-node-2"; - private final static String TOPIC_ID1 = "test-topic-1"; - private final static String TOPIC_ID2 = "test-topic-2"; - private final static String METRIC_NAME1 = "test-metric1"; - private final static String METRIC_NAME2 = "test-metric2"; - private final static String THREAD_ID_TAG = "thread-id"; - private final static String TASK_ID_TAG = "task-id"; - private final static String SCOPE_NAME = "test-scope"; - private final static String STORE_ID_TAG = "-state-id"; - private final static String STORE_NAME1 = "store1"; - private final static String STORE_NAME2 = "store2"; - private final static Map STORE_LEVEL_TAG_MAP = mkMap( + private static final String SENSOR_PREFIX_DELIMITER = "."; + private static final String SENSOR_NAME_DELIMITER = ".s."; + private static final String SENSOR_NAME_1 = "sensor1"; + private static final String SENSOR_NAME_2 = "sensor2"; + private static final String INTERNAL_PREFIX = "internal"; + private static final String VERSION = StreamsConfig.METRICS_LATEST; + private static final String CLIENT_ID = "test-client"; + private static final String THREAD_ID1 = "test-thread-1"; + private static final String TASK_ID1 = "test-task-1"; + private static final String TASK_ID2 = "test-task-2"; + private static final String NODE_ID1 = "test-node-1"; + private static final String NODE_ID2 = "test-node-2"; + private static final String TOPIC_ID1 = "test-topic-1"; + private static final String TOPIC_ID2 = "test-topic-2"; + private static final String METRIC_NAME1 = "test-metric1"; + private static final String METRIC_NAME2 = "test-metric2"; + private static final String THREAD_ID_TAG = "thread-id"; + private static final String TASK_ID_TAG = "task-id"; + private static final String SCOPE_NAME = "test-scope"; + private static final String STORE_ID_TAG = "-state-id"; + private static final String STORE_NAME1 = "store1"; + private static final String STORE_NAME2 = "store2"; + private static final Map STORE_LEVEL_TAG_MAP = mkMap( mkEntry(THREAD_ID_TAG, Thread.currentThread().getName()), mkEntry(TASK_ID_TAG, TASK_ID1), mkEntry(SCOPE_NAME + STORE_ID_TAG, STORE_NAME1) ); - private final static String RECORD_CACHE_ID_TAG = "record-cache-id"; - private final static String ENTITY_NAME = "test-entity"; - private final static String OPERATION_NAME = "test-operation"; - private final static String CUSTOM_TAG_KEY1 = "test-key1"; - private final static String CUSTOM_TAG_VALUE1 = "test-value1"; - private final static String CUSTOM_TAG_KEY2 = "test-key2"; - private final static String CUSTOM_TAG_VALUE2 = "test-value2"; - private final static RecordingLevel INFO_RECORDING_LEVEL = RecordingLevel.INFO; - private final static String DESCRIPTION1 = "description number one"; - private final static String DESCRIPTION2 = "description number two"; - private final static String DESCRIPTION3 = "description number three"; - private final static Gauge VALUE_PROVIDER = (config, now) -> "mutable-value"; + private static final String RECORD_CACHE_ID_TAG = "record-cache-id"; + private static final String ENTITY_NAME = "test-entity"; + private static final String OPERATION_NAME = "test-operation"; + private static final String CUSTOM_TAG_KEY1 = "test-key1"; + private static final String CUSTOM_TAG_VALUE1 = "test-value1"; + private static final String CUSTOM_TAG_KEY2 = "test-key2"; + private static final String CUSTOM_TAG_VALUE2 = "test-value2"; + private static final RecordingLevel INFO_RECORDING_LEVEL = RecordingLevel.INFO; + private static final String DESCRIPTION1 = "description number one"; + private static final String DESCRIPTION2 = "description number two"; + private static final String DESCRIPTION3 = "description number three"; + private static final Gauge VALUE_PROVIDER = (config, now) -> "mutable-value"; private final Metrics metrics = new Metrics(); private final Sensor sensor = metrics.sensor("dummy"); diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/TaskMetricsTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/TaskMetricsTest.java index 161a4f53289f2..155625369a655 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/TaskMetricsTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/metrics/TaskMetricsTest.java @@ -34,8 +34,8 @@ public class TaskMetricsTest { - private final static String THREAD_ID = "test-thread"; - private final static String TASK_ID = "test-task"; + private static final String THREAD_ID = "test-thread"; + private static final String TASK_ID = "test-task"; private final StreamsMetricsImpl streamsMetrics = mock(StreamsMetricsImpl.class); private final Sensor expectedSensor = mock(Sensor.class); diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java index a697aabf3bc29..c0f4dea4ff775 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskExecutorTest.java @@ -49,7 +49,7 @@ public class DefaultTaskExecutorTest { - private final static long VERIFICATION_TIMEOUT = 15000; + private static final long VERIFICATION_TIMEOUT = 15000; private final Time time = new MockTime(1L); private final StreamTask task = mock(StreamTask.class); diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManagerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManagerTest.java index e0b8a6c128728..7a0c255ddf619 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManagerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/tasks/DefaultTaskManagerTest.java @@ -51,7 +51,7 @@ public class DefaultTaskManagerTest { - private final static long VERIFICATION_TIMEOUT = 15000; + private static final long VERIFICATION_TIMEOUT = 15000; private final Time time = new MockTime(1L); private final TaskId taskId = new TaskId(0, 0, "A"); diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java index d790863cdfdf4..5ee80c343a4bf 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingInMemoryKeyValueStoreTest.java @@ -67,7 +67,7 @@ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class CachingInMemoryKeyValueStoreTest extends AbstractKeyValueStoreTest { - private final static String TOPIC = "topic"; + private static final String TOPIC = "topic"; private static final String CACHE_NAMESPACE = "0_0-store-name"; private final int maxCacheSizeBytes = 150; private InternalMockProcessorContext context; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java index a4ae8d99ec135..ea63ac182b459 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingPersistentWindowStoreTest.java @@ -95,7 +95,7 @@ public class CachingPersistentWindowStoreTest { private static final long DEFAULT_TIMESTAMP = 10L; private static final Long WINDOW_SIZE = 10L; private static final long SEGMENT_INTERVAL = 100L; - private final static String TOPIC = "topic"; + private static final String TOPIC = "topic"; private static final String CACHE_NAMESPACE = "0_0-store-name"; private InternalMockProcessorContext context; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java index 1db8fb857cd09..c0ed70ef14103 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java @@ -50,7 +50,7 @@ public class ChangeLoggingSessionBytesStoreTest { private final Bytes bytesKey = Bytes.wrap(value1); private final Windowed key1 = new Windowed<>(bytesKey, new SessionWindow(0, 0)); - private final static Position POSITION = Position.fromMap(mkMap(mkEntry("", mkMap(mkEntry(0, 1L))))); + private static final Position POSITION = Position.fromMap(mkMap(mkEntry("", mkMap(mkEntry(0, 1L))))); @Before public void setUp() { @@ -179,4 +179,4 @@ public void shouldCloseUnderlyingStore() { verify(inner).close(); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java index fc190d23ce2d8..10868779c3427 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java @@ -50,7 +50,7 @@ public class ChangeLoggingTimestampedWindowBytesStoreTest { private ProcessorContextImpl context; private ChangeLoggingTimestampedWindowBytesStore store; - private final static Position POSITION = Position.fromMap(mkMap(mkEntry("", mkMap(mkEntry(0, 1L))))); + private static final Position POSITION = Position.fromMap(mkMap(mkEntry("", mkMap(mkEntry(0, 1L))))); @Before public void setUp() { diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java index e636f2aa3eb36..41fcf8beca2ae 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java @@ -49,7 +49,7 @@ public class ChangeLoggingWindowBytesStoreTest { private ProcessorContextImpl context; private ChangeLoggingWindowBytesStore store; - private final static Position POSITION = Position.fromMap(mkMap(mkEntry("", mkMap(mkEntry(0, 1L))))); + private static final Position POSITION = Position.fromMap(mkMap(mkEntry("", mkMap(mkEntry(0, 1L))))); @Before public void setUp() { diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/GlobalStateStoreProviderTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/GlobalStateStoreProviderTest.java index 9432c2d1488e7..32786eac047f1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/GlobalStateStoreProviderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/GlobalStateStoreProviderTest.java @@ -60,7 +60,7 @@ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class GlobalStateStoreProviderTest { private final Map stores = new HashMap<>(); - private final static Map CONFIGS = mkMap(mkEntry(StreamsConfig.InternalConfig.TOPIC_PREFIX_ALTERNATIVE, "appId")); + private static final Map CONFIGS = mkMap(mkEntry(StreamsConfig.InternalConfig.TOPIC_PREFIX_ALTERNATIVE, "appId")); @Before public void before() { @@ -231,4 +231,4 @@ public void shouldReturnSessionStore() { assertThat(store, instanceOf(ReadOnlySessionStore.class)); } } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java index 87eb177ac8e3a..010b5d0ff15a6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryWindowStoreTest.java @@ -42,7 +42,7 @@ public class InMemoryWindowStoreTest extends AbstractWindowBytesStoreTest { - private final static String STORE_NAME = "InMemoryWindowStore"; + private static final String STORE_NAME = "InMemoryWindowStore"; @Override WindowStore buildWindowStore(final long retentionPeriod, diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheWrappedWindowStoreKeyValueIteratorTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheWrappedWindowStoreKeyValueIteratorTest.java index 0e0f184f6f680..7142afcc58c57 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheWrappedWindowStoreKeyValueIteratorTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MergedSortedCacheWrappedWindowStoreKeyValueIteratorTest.java @@ -70,7 +70,7 @@ public long segmentId(final Bytes key) { KeyValue.pair(new Windowed<>(Bytes.wrap(storeKey.getBytes()), storeWindow), storeKey.getBytes())).iterator(); private final TimeWindow cacheWindow = new TimeWindow(10, 20); private Iterator> cacheKvs; - final private Deserializer deserializer = Serdes.String().deserializer(); + private final Deserializer deserializer = Serdes.String().deserializer(); private StoreKeySerializer storeKeySerializer; private StoreKeyToWindowKey storeKeyToWindowKey; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreTest.java index b2febbd517c00..51605ca175d18 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreTest.java @@ -94,7 +94,7 @@ public class MeteredTimestampedKeyValueStoreTest { @Mock private InternalProcessorContext context; - private final static Map CONFIGS = mkMap(mkEntry(StreamsConfig.InternalConfig.TOPIC_PREFIX_ALTERNATIVE, APPLICATION_ID)); + private static final Map CONFIGS = mkMap(mkEntry(StreamsConfig.InternalConfig.TOPIC_PREFIX_ALTERNATIVE, APPLICATION_ID)); private MeteredTimestampedKeyValueStore metered; private final KeyValue byteKeyValueTimestampPair = KeyValue.pair(KEY_BYTES, diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSegmentedBytesStoreTest.java index 3b6904fe140a9..c51c3f0061cfb 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBSegmentedBytesStoreTest.java @@ -18,7 +18,7 @@ public class RocksDBSegmentedBytesStoreTest extends AbstractRocksDBSegmentedBytesStoreTest { - private final static String METRICS_SCOPE = "metrics-scope"; + private static final String METRICS_SCOPE = "metrics-scope"; @Override RocksDBSegmentedBytesStore getBytesStore() { diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java index b01e327d6fcf6..15c8a75994469 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java @@ -119,8 +119,8 @@ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class RocksDBStoreTest extends AbstractKeyValueStoreTest { private static boolean enableBloomFilters = false; - final static String DB_NAME = "db-name"; - final static String METRICS_SCOPE = "metrics-scope"; + static final String DB_NAME = "db-name"; + static final String METRICS_SCOPE = "metrics-scope"; private File dir; private final Time time = new MockTime(); diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java index 9908dfdb147ee..e1f519e696b10 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedKeyValueBytesStoreTest.java @@ -48,7 +48,7 @@ class RocksDBTimeOrderedKeyValueBytesStoreTest { private RocksDBTimeOrderedKeyValueBytesStore bytesStore; private File stateDir; final String storeName = "bytes-store"; - private final static String METRICS_SCOPE = "metrics-scope"; + private static final String METRICS_SCOPE = "metrics-scope"; private final String topic = "changelog"; @@ -107,4 +107,4 @@ private Bytes serializeKey(final String key, final int seqnum, final long timest timestamp, seqnum).get()); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowSegmentedBytesStoreTest.java index db02f5b6ff0d0..a14a0517cb87b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimeOrderedWindowSegmentedBytesStoreTest.java @@ -31,7 +31,7 @@ public class RocksDBTimeOrderedWindowSegmentedBytesStoreTest extends AbstractDualSchemaRocksDBSegmentedBytesStoreTest { - private final static String METRICS_SCOPE = "metrics-scope"; + private static final String METRICS_SCOPE = "metrics-scope"; private enum SchemaType { WindowSchemaWithIndex, diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedSegmentedBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedSegmentedBytesStoreTest.java index 814a04c50b2af..bb9b5d5075be6 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedSegmentedBytesStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedSegmentedBytesStoreTest.java @@ -19,7 +19,7 @@ public class RocksDBTimestampedSegmentedBytesStoreTest extends AbstractRocksDBSegmentedBytesStoreTest { - private final static String METRICS_SCOPE = "metrics-scope"; + private static final String METRICS_SCOPE = "metrics-scope"; RocksDBTimestampedSegmentedBytesStore getBytesStore() { return new RocksDBTimestampedSegmentedBytesStore( diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDbVersionedKeyValueBytesStoreSupplierTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDbVersionedKeyValueBytesStoreSupplierTest.java index 4dfb83e017bf6..ea6fde1c705cd 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDbVersionedKeyValueBytesStoreSupplierTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDbVersionedKeyValueBytesStoreSupplierTest.java @@ -23,7 +23,7 @@ public class RocksDbVersionedKeyValueBytesStoreSupplierTest { - private final static String STORE_NAME = "versioned_store"; + private static final String STORE_NAME = "versioned_store"; @Test public void shouldUseDefaultSegmentInterval() { @@ -50,4 +50,4 @@ private void verifyExpectedSegmentInterval(final long historyRetention, final lo new RocksDbVersionedKeyValueBytesStoreSupplier(STORE_NAME, historyRetention).segmentIntervalMs(), is(expectedSegmentInterval)); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentedCacheFunctionTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentedCacheFunctionTest.java index 1f6a747849072..70ada56454174 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentedCacheFunctionTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SegmentedCacheFunctionTest.java @@ -33,7 +33,7 @@ public class SegmentedCacheFunctionTest { private static final int TIMESTAMP = 736213517; private static final Bytes THE_KEY = WindowKeySchema.toStoreKeyBinary(new byte[]{0xA, 0xB, 0xC}, TIMESTAMP, 42); - private final static Bytes THE_CACHE_KEY = Bytes.wrap( + private static final Bytes THE_CACHE_KEY = Bytes.wrap( ByteBuffer.allocate(8 + THE_KEY.get().length) .putLong(TIMESTAMP / SEGMENT_INTERVAL) .put(THE_KEY.get()).array() diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java index a078e8aae833b..0456b91e50d80 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedCachingPersistentWindowStoreTest.java @@ -102,7 +102,7 @@ public class TimeOrderedCachingPersistentWindowStoreTest { private static final long DEFAULT_TIMESTAMP = 10L; private static final Long WINDOW_SIZE = 10L; private static final long SEGMENT_INTERVAL = 100L; - private final static String TOPIC = "topic"; + private static final String TOPIC = "topic"; private static final String CACHE_NAMESPACE = "0_0-store-name"; private ThreadCache cache; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java index 4c30a79567a32..95929e01d9d42 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimeOrderedWindowStoreTest.java @@ -103,7 +103,7 @@ public class TimeOrderedWindowStoreTest { private static final long DEFAULT_TIMESTAMP = 10L; private static final Long WINDOW_SIZE = 10L; private static final long SEGMENT_INTERVAL = 100L; - private final static String TOPIC = "topic"; + private static final String TOPIC = "topic"; private static final String CACHE_NAMESPACE = "0_0-store-name"; private InternalMockProcessorContext context; diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowKeySchemaTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowKeySchemaTest.java index 4729a73f14f6f..4286b4ceecae9 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowKeySchemaTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowKeySchemaTest.java @@ -119,18 +119,18 @@ interface TriFunction { mkEntry(SchemaType.PrefixedTimeFirstSchema, TimeFirstWindowKeySchema::fromNonPrefixWindowKey) ); - final private String key = "key"; - final private String topic = "topic"; - final private long startTime = 50L; - final private long endTime = 100L; - final private Serde serde = Serdes.String(); - - final private Window window = new TimeWindow(startTime, endTime); - final private Windowed windowedKey = new Windowed<>(key, window); - final private KeySchema keySchema; - final private Serde> keySerde = new WindowedSerdes.TimeWindowedSerde<>(serde, Long.MAX_VALUE); - final private StateSerdes stateSerdes = new StateSerdes<>("dummy", serde, Serdes.ByteArray()); - final public SchemaType schemaType; + private final String key = "key"; + private final String topic = "topic"; + private final long startTime = 50L; + private final long endTime = 100L; + private final Serde serde = Serdes.String(); + + private final Window window = new TimeWindow(startTime, endTime); + private final Windowed windowedKey = new Windowed<>(key, window); + private final KeySchema keySchema; + private final Serde> keySerde = new WindowedSerdes.TimeWindowedSerde<>(serde, Long.MAX_VALUE); + private final StateSerdes stateSerdes = new StateSerdes<>("dummy", serde, Serdes.ByteArray()); + public final SchemaType schemaType; private enum SchemaType { WindowKeySchema, diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java index 0e58783588eba..598b95fc743ee 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java @@ -59,13 +59,13 @@ @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.STRICT_STUBS) public class RocksDBMetricsRecorderTest { - private final static String METRICS_SCOPE = "metrics-scope"; - private final static TaskId TASK_ID1 = new TaskId(0, 0); - private final static TaskId TASK_ID2 = new TaskId(0, 1); - private final static String STORE_NAME = "store-name"; - private final static String SEGMENT_STORE_NAME_1 = "segment-store-name-1"; - private final static String SEGMENT_STORE_NAME_2 = "segment-store-name-2"; - private final static String SEGMENT_STORE_NAME_3 = "segment-store-name-3"; + private static final String METRICS_SCOPE = "metrics-scope"; + private static final TaskId TASK_ID1 = new TaskId(0, 0); + private static final TaskId TASK_ID2 = new TaskId(0, 1); + private static final String STORE_NAME = "store-name"; + private static final String SEGMENT_STORE_NAME_1 = "segment-store-name-1"; + private static final String SEGMENT_STORE_NAME_2 = "segment-store-name-2"; + private static final String SEGMENT_STORE_NAME_3 = "segment-store-name-3"; private final RocksDB dbToAdd1 = mock(RocksDB.class); private final RocksDB dbToAdd2 = mock(RocksDB.class); @@ -587,4 +587,4 @@ private void setUpMetricsMock() { dbMetrics.when(() -> RocksDBMetrics.numberOfFileErrorsSensor(streamsMetrics, metricsContext)) .thenReturn(numberOfFileErrorsSensor); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecordingTriggerTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecordingTriggerTest.java index 535fb27471c44..2057d153ace14 100644 --- a/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecordingTriggerTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecordingTriggerTest.java @@ -32,10 +32,10 @@ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class RocksDBMetricsRecordingTriggerTest { - private final static String STORE_NAME1 = "store-name1"; - private final static String STORE_NAME2 = "store-name2"; - private final static TaskId TASK_ID1 = new TaskId(1, 2); - private final static TaskId TASK_ID2 = new TaskId(2, 4); + private static final String STORE_NAME1 = "store-name1"; + private static final String STORE_NAME2 = "store-name2"; + private static final TaskId TASK_ID1 = new TaskId(1, 2); + private static final TaskId TASK_ID2 = new TaskId(2, 4); @Mock private RocksDBMetricsRecorder recorder1; @Mock @@ -82,4 +82,4 @@ public void shouldThrowIfRecorderToRemoveCouldNotBeFound() { () -> recordingTrigger.removeMetricsRecorder(recorder2) ); } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/EosTestDriver.java b/streams/src/test/java/org/apache/kafka/streams/tests/EosTestDriver.java index 77d0fc3ad6c12..a8058a1cd3abe 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/EosTestDriver.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/EosTestDriver.java @@ -59,7 +59,7 @@ public class EosTestDriver extends SmokeTestUtil { private static final int MAX_NUMBER_OF_KEYS = 20000; private static final long MAX_IDLE_TIME_MS = 600000L; - private volatile static boolean isRunning = true; + private static volatile boolean isRunning = true; private static CountDownLatch terminated = new CountDownLatch(1); private static int numRecordsProduced = 0; diff --git a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index e0c45d0c1c954..f1cb97819166a 100644 --- a/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/src/test/java/org/apache/kafka/test/MockAggregator.java b/streams/src/test/java/org/apache/kafka/test/MockAggregator.java index 42416ec39a8da..0b1ac70255fea 100644 --- a/streams/src/test/java/org/apache/kafka/test/MockAggregator.java +++ b/streams/src/test/java/org/apache/kafka/test/MockAggregator.java @@ -20,8 +20,8 @@ public class MockAggregator { - public final static Aggregator TOSTRING_ADDER = toStringInstance("+"); - public final static Aggregator TOSTRING_REMOVER = toStringInstance("-"); + public static final Aggregator TOSTRING_ADDER = toStringInstance("+"); + public static final Aggregator TOSTRING_REMOVER = toStringInstance("-"); public static Aggregator toStringInstance(final String sep) { return (aggKey, value, aggregate) -> aggregate + sep + value; diff --git a/streams/src/test/java/org/apache/kafka/test/MockInitializer.java b/streams/src/test/java/org/apache/kafka/test/MockInitializer.java index d5d69c85d68ff..782f5363a5bd0 100644 --- a/streams/src/test/java/org/apache/kafka/test/MockInitializer.java +++ b/streams/src/test/java/org/apache/kafka/test/MockInitializer.java @@ -27,5 +27,5 @@ public String apply() { } } - public final static Initializer STRING_INIT = new StringInit(); + public static final Initializer STRING_INIT = new StringInit(); } diff --git a/streams/src/test/java/org/apache/kafka/test/MockReducer.java b/streams/src/test/java/org/apache/kafka/test/MockReducer.java index 0ecb4a183befe..83a464280db87 100644 --- a/streams/src/test/java/org/apache/kafka/test/MockReducer.java +++ b/streams/src/test/java/org/apache/kafka/test/MockReducer.java @@ -53,11 +53,11 @@ public Integer apply(final Integer value1, final Integer value2) { } } - public final static Reducer STRING_ADDER = new StringAdd(); + public static final Reducer STRING_ADDER = new StringAdd(); - public final static Reducer STRING_REMOVER = new StringRemove(); + public static final Reducer STRING_REMOVER = new StringRemove(); - public final static Reducer INTEGER_ADDER = new IntegerAdd(); + public static final Reducer INTEGER_ADDER = new IntegerAdd(); - public final static Reducer INTEGER_SUBTRACTOR = new IntegerSubtract(); -} \ No newline at end of file + public static final Reducer INTEGER_SUBTRACTOR = new IntegerSubtract(); +} diff --git a/streams/src/test/java/org/apache/kafka/test/MockValueJoiner.java b/streams/src/test/java/org/apache/kafka/test/MockValueJoiner.java index b1842ff5aa32a..e5e0763bd2ab4 100644 --- a/streams/src/test/java/org/apache/kafka/test/MockValueJoiner.java +++ b/streams/src/test/java/org/apache/kafka/test/MockValueJoiner.java @@ -20,7 +20,7 @@ public class MockValueJoiner { - public final static ValueJoiner TOSTRING_JOINER = instance("+"); + public static final ValueJoiner TOSTRING_JOINER = instance("+"); public static ValueJoiner instance(final String separator) { return new ValueJoiner() { diff --git a/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java b/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java index 244ebdff90a98..a3658f10fffd3 100644 --- a/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java +++ b/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java @@ -221,8 +221,8 @@ public class TopologyTestDriver implements Closeable { private final Time mockWallClockTime; private InternalTopologyBuilder internalTopologyBuilder; - private final static int PARTITION_ID = 0; - private final static TaskId TASK_ID = new TaskId(0, PARTITION_ID); + private static final int PARTITION_ID = 0; + private static final TaskId TASK_ID = new TaskId(0, PARTITION_ID); StreamTask task; private GlobalStateUpdateTask globalStateTask; private GlobalStateManager globalStateManager; diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/TestTopicsTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/TestTopicsTest.java index ac82c938d7d3d..fef45de3c3327 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/TestTopicsTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/TestTopicsTest.java @@ -52,10 +52,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows; public class TestTopicsTest { - private final static String INPUT_TOPIC = "input"; - private final static String OUTPUT_TOPIC = "output1"; - private final static String INPUT_TOPIC_MAP = OUTPUT_TOPIC; - private final static String OUTPUT_TOPIC_MAP = "output2"; + private static final String INPUT_TOPIC = "input"; + private static final String OUTPUT_TOPIC = "output1"; + private static final String INPUT_TOPIC_MAP = OUTPUT_TOPIC; + private static final String OUTPUT_TOPIC_MAP = "output2"; private TopologyTestDriver testDriver; private final Serde stringSerde = new Serdes.StringSerde(); diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java index aa940f8539ed9..922619b456208 100644 --- a/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java +++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/TopologyTestDriverTest.java @@ -103,10 +103,10 @@ public abstract class TopologyTestDriverTest { config.putAll(overrides); } - private final static String SOURCE_TOPIC_1 = "source-topic-1"; - private final static String SOURCE_TOPIC_2 = "source-topic-2"; - private final static String SINK_TOPIC_1 = "sink-topic-1"; - private final static String SINK_TOPIC_2 = "sink-topic-2"; + private static final String SOURCE_TOPIC_1 = "source-topic-1"; + private static final String SOURCE_TOPIC_2 = "source-topic-2"; + private static final String SINK_TOPIC_1 = "sink-topic-1"; + private static final String SINK_TOPIC_2 = "sink-topic-2"; private final Headers headers = new RecordHeaders(new Header[]{new RecordHeader("key", "value".getBytes())}); @@ -126,7 +126,7 @@ public abstract class TopologyTestDriverTest { private final StringDeserializer stringDeserializer = new StringDeserializer(); private final LongDeserializer longDeserializer = new LongDeserializer(); - private final static class TTDTestRecord { + private static final class TTDTestRecord { private final Object key; private final Object value; private final long timestamp; @@ -192,7 +192,7 @@ public int hashCode() { } } - private final static class Punctuation { + private static final class Punctuation { private final long intervalMs; private final PunctuationType punctuationType; private final Punctuator callback; @@ -206,7 +206,7 @@ private final static class Punctuation { } } - private final static class MockPunctuator implements Punctuator { + private static final class MockPunctuator implements Punctuator { private final List punctuatedAt = new LinkedList<>(); @Override @@ -215,7 +215,7 @@ public void punctuate(final long timestamp) { } } - private final static class MockProcessor implements Processor { + private static final class MockProcessor implements Processor { private final Collection punctuations; private ProcessorContext context; diff --git a/streams/upgrade-system-tests-22/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-22/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index e8ec04c23ca52..a00ea47178fe9 100644 --- a/streams/upgrade-system-tests-22/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-22/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-23/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-23/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index e8ec04c23ca52..a00ea47178fe9 100644 --- a/streams/upgrade-system-tests-23/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-23/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-24/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-24/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index e8ec04c23ca52..a00ea47178fe9 100644 --- a/streams/upgrade-system-tests-24/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-24/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-25/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-25/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index e8ec04c23ca52..a00ea47178fe9 100644 --- a/streams/upgrade-system-tests-25/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-25/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-26/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-26/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index e8ec04c23ca52..a00ea47178fe9 100644 --- a/streams/upgrade-system-tests-26/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-26/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-27/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-27/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index e8ec04c23ca52..a00ea47178fe9 100644 --- a/streams/upgrade-system-tests-27/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-27/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-28/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-28/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index 519b5d5a353a8..5d49e79da8ef9 100644 --- a/streams/upgrade-system-tests-28/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-28/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-30/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-30/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index 425e2afe6dc8c..7c5b1a6440781 100644 --- a/streams/upgrade-system-tests-30/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-30/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-31/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-31/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index 4833ba9c50b0e..e1093fc64a4a4 100644 --- a/streams/upgrade-system-tests-31/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-31/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-32/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-32/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index 9f17760c7454a..9f64435e452da 100644 --- a/streams/upgrade-system-tests-32/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-32/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-33/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-33/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index 2a99f0b808597..f10c570078733 100644 --- a/streams/upgrade-system-tests-33/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-33/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-34/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-34/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index f4b43a451ac08..86f1ed907a636 100644 --- a/streams/upgrade-system-tests-34/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-34/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-35/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-35/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index 9f3efa0f7d65b..3bb3b86a1afe9 100644 --- a/streams/upgrade-system-tests-35/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-35/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-36/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-36/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index 6e1efc81dd0b6..cc9b0433e1873 100644 --- a/streams/upgrade-system-tests-36/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-36/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/streams/upgrade-system-tests-37/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java b/streams/upgrade-system-tests-37/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java index 7cb34056e0e37..849fce5ec21dd 100644 --- a/streams/upgrade-system-tests-37/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java +++ b/streams/upgrade-system-tests-37/src/test/java/org/apache/kafka/streams/tests/SmokeTestUtil.java @@ -32,7 +32,7 @@ public class SmokeTestUtil { - final static int END = Integer.MAX_VALUE; + static final int END = Integer.MAX_VALUE; static ProcessorSupplier printProcessorSupplier(final String topic) { return printProcessorSupplier(topic, ""); diff --git a/tools/src/main/java/org/apache/kafka/tools/EndToEndLatency.java b/tools/src/main/java/org/apache/kafka/tools/EndToEndLatency.java index cb6af45cabd66..7ceb73801d88a 100644 --- a/tools/src/main/java/org/apache/kafka/tools/EndToEndLatency.java +++ b/tools/src/main/java/org/apache/kafka/tools/EndToEndLatency.java @@ -54,9 +54,9 @@ *

e.g. [localhost:9092 test 10000 1 20]

*/ public class EndToEndLatency { - private final static long POLL_TIMEOUT_MS = 60000; - private final static short DEFAULT_REPLICATION_FACTOR = 1; - private final static int DEFAULT_NUM_PARTITIONS = 1; + private static final long POLL_TIMEOUT_MS = 60000; + private static final short DEFAULT_REPLICATION_FACTOR = 1; + private static final int DEFAULT_NUM_PARTITIONS = 1; public static void main(String... args) { Exit.exit(mainNoExit(args)); diff --git a/tools/src/main/java/org/apache/kafka/tools/ManifestWorkspace.java b/tools/src/main/java/org/apache/kafka/tools/ManifestWorkspace.java index 8710941fc17db..da5818b8818c9 100644 --- a/tools/src/main/java/org/apache/kafka/tools/ManifestWorkspace.java +++ b/tools/src/main/java/org/apache/kafka/tools/ManifestWorkspace.java @@ -122,7 +122,7 @@ public boolean commit(boolean dryRun) throws IOException, TerseException { *

Buffers simulated reads and writes to the plugin path before they can be written to disk. * @param The data structure used by the workspace to store in-memory manifests internally. */ - public static abstract class SourceWorkspace { + public abstract static class SourceWorkspace { private final Path location; private final PluginSource.Type type; protected final T initial; diff --git a/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java b/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java index b562bf1da1572..9eb75d931918d 100644 --- a/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java +++ b/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java @@ -89,7 +89,7 @@ public class StreamsResetter { private static final int EXIT_CODE_SUCCESS = 0; private static final int EXIT_CODE_ERROR = 1; - private final static String USAGE = "This tool helps to quickly reset an application in order to reprocess " + private static final String USAGE = "This tool helps to quickly reset an application in order to reprocess " + "its data from scratch.\n" + "* This tool resets offsets of input topics to the earliest available offset (by default), or to a specific defined position" + " and it skips to the end of intermediate topics (topics that are input and output topics, e.g., used by deprecated through() method).\n" diff --git a/tools/src/main/java/org/apache/kafka/tools/TopicCommand.java b/tools/src/main/java/org/apache/kafka/tools/TopicCommand.java index 93b19adcf3ca9..4cdbdae6d36ab 100644 --- a/tools/src/main/java/org/apache/kafka/tools/TopicCommand.java +++ b/tools/src/main/java/org/apache/kafka/tools/TopicCommand.java @@ -685,7 +685,7 @@ public void close() throws Exception { } } - public final static class TopicCommandOptions extends CommandDefaultOptions { + public static final class TopicCommandOptions extends CommandDefaultOptions { private final ArgumentAcceptingOptionSpec bootstrapServerOpt; private final ArgumentAcceptingOptionSpec commandConfigOpt; diff --git a/tools/src/main/java/org/apache/kafka/tools/VerifiableConsumer.java b/tools/src/main/java/org/apache/kafka/tools/VerifiableConsumer.java index c24681fd1630a..72c0f324ddfda 100644 --- a/tools/src/main/java/org/apache/kafka/tools/VerifiableConsumer.java +++ b/tools/src/main/java/org/apache/kafka/tools/VerifiableConsumer.java @@ -271,7 +271,7 @@ public void close() { } @JsonPropertyOrder({ "timestamp", "name" }) - private static abstract class ConsumerEvent { + private abstract static class ConsumerEvent { private final long timestamp = System.currentTimeMillis(); @JsonProperty diff --git a/tools/src/main/java/org/apache/kafka/tools/VerifiableProducer.java b/tools/src/main/java/org/apache/kafka/tools/VerifiableProducer.java index 34ddfcbd0dcb7..9146ae4753303 100644 --- a/tools/src/main/java/org/apache/kafka/tools/VerifiableProducer.java +++ b/tools/src/main/java/org/apache/kafka/tools/VerifiableProducer.java @@ -316,7 +316,7 @@ public void close() { } @JsonPropertyOrder({ "timestamp", "name" }) - private static abstract class ProducerEvent { + private abstract static class ProducerEvent { private final long timestamp = System.currentTimeMillis(); @JsonProperty diff --git a/tools/src/main/java/org/apache/kafka/tools/consumer/group/CsvUtils.java b/tools/src/main/java/org/apache/kafka/tools/consumer/group/CsvUtils.java index 60a8bb22be950..e2ca0e325a779 100644 --- a/tools/src/main/java/org/apache/kafka/tools/consumer/group/CsvUtils.java +++ b/tools/src/main/java/org/apache/kafka/tools/consumer/group/CsvUtils.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.dataformat.csv.CsvSchema; public class CsvUtils { - private final static CsvMapper MAPPER = new CsvMapper(); + private static final CsvMapper MAPPER = new CsvMapper(); static ObjectReader readerFor(Class clazz) { return MAPPER.readerFor(clazz).with(getSchema(clazz)); diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/common/StringExpander.java b/trogdor/src/main/java/org/apache/kafka/trogdor/common/StringExpander.java index 3082a171a7fc7..8763b4db50a06 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/common/StringExpander.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/common/StringExpander.java @@ -28,7 +28,7 @@ * Strings that have no range expressions will not be expanded. */ public class StringExpander { - private final static Pattern NUMERIC_RANGE_PATTERN = + private static final Pattern NUMERIC_RANGE_PATTERN = Pattern.compile("(.*)\\[([0-9]*)\\-([0-9]*)\\](.*)"); public static HashSet expand(String val) { diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java index 41eca1f38937e..30bdbb7c95390 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java @@ -149,23 +149,23 @@ class ManagedTask { /** * The task id. */ - final private String id; + private final String id; /** * The original task specification as submitted when the task was created. */ - final private TaskSpec originalSpec; + private final TaskSpec originalSpec; /** * The effective task specification. * The start time will be adjusted to reflect the time when the task was submitted. */ - final private TaskSpec spec; + private final TaskSpec spec; /** * The task controller. */ - final private TaskController controller; + private final TaskController controller; /** * The task state. diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/fault/Kibosh.java b/trogdor/src/main/java/org/apache/kafka/trogdor/fault/Kibosh.java index 95356c5209e35..4eabf70714859 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/fault/Kibosh.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/fault/Kibosh.java @@ -36,13 +36,13 @@ public final class Kibosh { public static final Kibosh INSTANCE = new Kibosh(); - public final static String KIBOSH_CONTROL = "kibosh_control"; + public static final String KIBOSH_CONTROL = "kibosh_control"; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonSubTypes({ @JsonSubTypes.Type(value = KiboshFilesUnreadableFaultSpec.class, name = "unreadable"), }) - public static abstract class KiboshFaultSpec { + public abstract static class KiboshFaultSpec { @Override public final boolean equals(Object o) { if (this == o) return true; @@ -121,7 +121,7 @@ synchronized void removeFault(KiboshFaultSpec toRemove) throws IOException { public static class KiboshControlFile { private final List faults; - public final static KiboshControlFile EMPTY = + public static final KiboshControlFile EMPTY = new KiboshControlFile(Collections.emptyList()); public static KiboshControlFile read(Path controlPath) throws IOException { diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/task/TaskSpec.java b/trogdor/src/main/java/org/apache/kafka/trogdor/task/TaskSpec.java index 7b67c4ee78967..6e7ac911ec641 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/task/TaskSpec.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/task/TaskSpec.java @@ -38,7 +38,7 @@ public abstract class TaskSpec { * point rounding. (Objects serialized as JSON canonically contain only floating point numbers, * because JavaScript did not support integers.) */ - public final static long MAX_TASK_DURATION_MS = 1000000000000000L; + public static final long MAX_TASK_DURATION_MS = 1000000000000000L; /** * When the time should start in milliseconds. diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConfigurableProducerWorker.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConfigurableProducerWorker.java index b08ef44d6388e..c66fe2ceb60fa 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConfigurableProducerWorker.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConfigurableProducerWorker.java @@ -265,7 +265,7 @@ public static class StatusData { * The percentiles to use when calculating the histogram data. * These should match up with the p50LatencyMs, p95LatencyMs, etc. fields. */ - final static float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; + static final float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; @JsonCreator StatusData(@JsonProperty("totalSent") long totalSent, diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java index 83e73db1a7b66..42d3d33dd4771 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ConsumeBenchWorker.java @@ -404,7 +404,7 @@ public static class StatusData { * The percentiles to use when calculating the histogram data. * These should match up with the p50LatencyMs, p95LatencyMs, etc. fields. */ - final static float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; + static final float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; @JsonCreator StatusData(@JsonProperty("assignedPartitions") List assignedPartitions, @JsonProperty("totalMessagesReceived") long totalMessagesReceived, diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/PartitionsSpec.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/PartitionsSpec.java index c1dc7c68761e8..858b28db56e5c 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/PartitionsSpec.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/PartitionsSpec.java @@ -33,8 +33,8 @@ * Describes some partitions. */ public class PartitionsSpec extends Message { - private final static short DEFAULT_REPLICATION_FACTOR = 3; - private final static short DEFAULT_NUM_PARTITIONS = 1; + private static final short DEFAULT_REPLICATION_FACTOR = 3; + private static final short DEFAULT_NUM_PARTITIONS = 1; private final int numPartitions; private final short replicationFactor; diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java index d1f6ad75f6533..a2267038847e5 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/ProduceBenchWorker.java @@ -357,7 +357,7 @@ public static class StatusData { * The percentiles to use when calculating the histogram data. * These should match up with the p50LatencyMs, p95LatencyMs, etc. fields. */ - final static float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; + static final float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; @JsonCreator StatusData(@JsonProperty("totalSent") long totalSent, diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/Throttle.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/Throttle.java index 6a99c02a5dc5f..deca5f03b5814 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/Throttle.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/Throttle.java @@ -34,7 +34,7 @@ public class Throttle { this.lastTimeMs = 0; } - synchronized public boolean increment() throws InterruptedException { + public synchronized boolean increment() throws InterruptedException { boolean throttled = false; while (true) { if (count < maxPerPeriod) { diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java index 035d45928398a..0d6a9c0eb61f5 100644 --- a/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java +++ b/trogdor/src/main/java/org/apache/kafka/trogdor/workload/TimestampRecordProcessor.java @@ -56,7 +56,7 @@ public class TimestampRecordProcessor implements RecordProcessor { private final Logger log = LoggerFactory.getLogger(TimestampRecordProcessor.class); - final static float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; + static final float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; @JsonCreator public TimestampRecordProcessor(@JsonProperty("histogramMaxMs") int histogramMaxMs, @@ -126,7 +126,7 @@ private static class StatusData { * The percentiles to use when calculating the histogram data. * These should match up with the p50LatencyMs, p95LatencyMs, etc. fields. */ - final static float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; + static final float[] PERCENTILES = {0.5f, 0.95f, 0.99f}; @JsonCreator StatusData(@JsonProperty("averageLatencyMs") float averageLatencyMs, diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/TopicsSpecTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/TopicsSpecTest.java index f1c50d7a3a5a7..59e976b808bdd 100644 --- a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/TopicsSpecTest.java +++ b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/TopicsSpecTest.java @@ -32,9 +32,9 @@ @Timeout(value = 120) public class TopicsSpecTest { - private final static TopicsSpec FOO; - private final static PartitionsSpec PARTSA; - private final static PartitionsSpec PARTSB; + private static final TopicsSpec FOO; + private static final PartitionsSpec PARTSA; + private static final PartitionsSpec PARTSB; static { FOO = new TopicsSpec(); From 006c3d8d1b122855049e40f2c018917e656d8e37 Mon Sep 17 00:00:00 2001 From: gongxuanzhang Date: Wed, 12 Jun 2024 23:07:22 +0800 Subject: [PATCH 3/4] update modifier order and add checkstyle rule --- .../clients/consumer/KafkaShareConsumer.java | 2 +- .../apache/kafka/common/ShareGroupState.java | 2 +- .../kafka/clients/admin/MockAdminClient.java | 90 +++++++++---------- .../internals/TimedRequestStateTest.java | 2 +- .../field/FieldPathNotationTest.java | 4 +- .../java/kafka/server/SharePartition.java | 4 +- .../kafka/server/SharePartitionManager.java | 2 +- .../group/GroupCoordinatorConfig.java | 64 ++++++------- .../GroupMetadataManagerTestContext.java | 14 +-- .../kafka/image/node/TopicImageNodeTest.java | 2 +- .../bootstrap/BootstrapMetadataTest.java | 4 +- .../org/apache/kafka/raft/ElectionState.java | 2 +- .../apache/kafka/raft/KafkaRaftClient.java | 2 +- .../org/apache/kafka/raft/RaftRequest.java | 4 +- .../org/apache/kafka/raft/RaftResponse.java | 4 +- .../org/apache/kafka/raft/RequestManager.java | 2 +- .../KRaftControlRecordStateMachine.java | 2 +- .../raft/internals/TreeMapLogHistory.java | 2 +- .../apache/kafka/raft/internals/VoterSet.java | 4 +- .../kafka/raft/internals/VoterSetHistory.java | 2 +- .../kafka/snapshot/RecordsSnapshotWriter.java | 10 +-- .../raft/internals/TreeMapLogHistoryTest.java | 2 +- .../raft/internals/VoterSetHistoryTest.java | 2 +- .../kafka/raft/internals/VoterSetTest.java | 2 +- .../processor/internals/TaskManager.java | 4 +- ...SubscriptionSendProcessorSupplierTest.java | 2 +- .../internals/DefaultStateUpdaterTest.java | 38 ++++---- .../processor/internals/TasksTest.java | 16 ++-- .../consumer/group/ListConsumerGroupTest.java | 10 +-- 29 files changed, 150 insertions(+), 150 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaShareConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaShareConsumer.java index 2fc721a84ff7f..411d1954c98f5 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaShareConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaShareConsumer.java @@ -332,7 +332,7 @@ @InterfaceStability.Evolving public class KafkaShareConsumer implements ShareConsumer { - private final static ShareConsumerDelegateCreator CREATOR = new ShareConsumerDelegateCreator(); + private static final ShareConsumerDelegateCreator CREATOR = new ShareConsumerDelegateCreator(); private final ShareConsumerDelegate delegate; diff --git a/clients/src/main/java/org/apache/kafka/common/ShareGroupState.java b/clients/src/main/java/org/apache/kafka/common/ShareGroupState.java index 716421f3dea2a..ad73a6bd09519 100644 --- a/clients/src/main/java/org/apache/kafka/common/ShareGroupState.java +++ b/clients/src/main/java/org/apache/kafka/common/ShareGroupState.java @@ -32,7 +32,7 @@ public enum ShareGroupState { DEAD("Dead"), EMPTY("Empty"); - private final static Map NAME_TO_ENUM = Arrays.stream(values()) + private static final Map NAME_TO_ENUM = Arrays.stream(values()) .collect(Collectors.toMap(state -> state.name.toUpperCase(Locale.ROOT), Function.identity())); private final String name; 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 4f070a3a2eda3..5c8894db5e5d8 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 @@ -270,7 +270,7 @@ public void addTopic(boolean internal, addTopic(internal, name, partitions, configs, true); } - synchronized public void addTopic(boolean internal, + public synchronized void addTopic(boolean internal, String name, List partitions, Map configs, @@ -306,7 +306,7 @@ synchronized public void addTopic(boolean internal, allTopics.put(name, new TopicMetadata(topicId, internal, partitions, logDirs, configs)); } - synchronized public void markTopicForDeletion(final String name) { + public synchronized void markTopicForDeletion(final String name) { if (!allTopics.containsKey(name)) { throw new IllegalArgumentException(String.format("Topic %s did not exist.", name)); } @@ -314,12 +314,12 @@ synchronized public void markTopicForDeletion(final String name) { allTopics.get(name).markedForDeletion = true; } - synchronized public void timeoutNextRequest(int numberOfRequest) { + public synchronized void timeoutNextRequest(int numberOfRequest) { timeoutNextRequests = numberOfRequest; } @Override - synchronized public DescribeClusterResult describeCluster(DescribeClusterOptions options) { + public synchronized DescribeClusterResult describeCluster(DescribeClusterOptions options) { KafkaFutureImpl> nodesFuture = new KafkaFutureImpl<>(); KafkaFutureImpl controllerFuture = new KafkaFutureImpl<>(); KafkaFutureImpl brokerIdFuture = new KafkaFutureImpl<>(); @@ -342,7 +342,7 @@ synchronized public DescribeClusterResult describeCluster(DescribeClusterOptions } @Override - synchronized public CreateTopicsResult createTopics(Collection newTopics, CreateTopicsOptions options) { + public synchronized CreateTopicsResult createTopics(Collection newTopics, CreateTopicsOptions options) { Map> createTopicResult = new HashMap<>(); if (timeoutNextRequests > 0) { @@ -416,7 +416,7 @@ private static Config config(NewTopic newTopic) { } @Override - synchronized public ListTopicsResult listTopics(ListTopicsOptions options) { + public synchronized ListTopicsResult listTopics(ListTopicsOptions options) { Map topicListings = new HashMap<>(); if (timeoutNextRequests > 0) { @@ -442,7 +442,7 @@ synchronized public ListTopicsResult listTopics(ListTopicsOptions options) { } @Override - synchronized public DescribeTopicsResult describeTopics(TopicCollection topics, DescribeTopicsOptions options) { + public synchronized DescribeTopicsResult describeTopics(TopicCollection topics, DescribeTopicsOptions options) { if (topics instanceof TopicIdCollection) return DescribeTopicsResult.ofTopicIds(new HashMap<>(handleDescribeTopicsUsingIds(((TopicIdCollection) topics).topicIds(), options))); else if (topics instanceof TopicNameCollection) @@ -491,7 +491,7 @@ private Map> handleDescribeTopicsByNames(C return topicDescriptions; } - synchronized public Map> handleDescribeTopicsUsingIds(Collection topicIds, DescribeTopicsOptions options) { + public synchronized Map> handleDescribeTopicsUsingIds(Collection topicIds, DescribeTopicsOptions options) { Map> topicDescriptions = new HashMap<>(); @@ -534,7 +534,7 @@ synchronized public Map> handleDescribeTopi } @Override - synchronized public DeleteTopicsResult deleteTopics(TopicCollection topics, DeleteTopicsOptions options) { + public synchronized DeleteTopicsResult deleteTopics(TopicCollection topics, DeleteTopicsOptions options) { DeleteTopicsResult result; if (topics instanceof TopicIdCollection) result = DeleteTopicsResult.ofTopicIds(new HashMap<>(handleDeleteTopicsUsingIds(((TopicIdCollection) topics).topicIds(), options))); @@ -605,12 +605,12 @@ private Map> handleDeleteTopicsUsingIds(Collection } @Override - synchronized public CreatePartitionsResult createPartitions(Map newPartitions, CreatePartitionsOptions options) { + public synchronized CreatePartitionsResult createPartitions(Map newPartitions, CreatePartitionsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DeleteRecordsResult deleteRecords(Map recordsToDelete, DeleteRecordsOptions options) { + public synchronized DeleteRecordsResult deleteRecords(Map recordsToDelete, DeleteRecordsOptions options) { Map> deletedRecordsResult = new HashMap<>(); if (recordsToDelete.isEmpty()) { return new DeleteRecordsResult(deletedRecordsResult); @@ -620,7 +620,7 @@ synchronized public DeleteRecordsResult deleteRecords(Map future = new KafkaFutureImpl<>(); for (KafkaPrincipal renewer : options.renewers()) { @@ -640,7 +640,7 @@ synchronized public CreateDelegationTokenResult createDelegationToken(CreateDele } @Override - synchronized public RenewDelegationTokenResult renewDelegationToken(byte[] hmac, RenewDelegationTokenOptions options) { + public synchronized RenewDelegationTokenResult renewDelegationToken(byte[] hmac, RenewDelegationTokenOptions options) { KafkaFutureImpl future = new KafkaFutureImpl<>(); boolean tokenFound = false; @@ -662,7 +662,7 @@ synchronized public RenewDelegationTokenResult renewDelegationToken(byte[] hmac, } @Override - synchronized public ExpireDelegationTokenResult expireDelegationToken(byte[] hmac, ExpireDelegationTokenOptions options) { + public synchronized ExpireDelegationTokenResult expireDelegationToken(byte[] hmac, ExpireDelegationTokenOptions options) { KafkaFutureImpl future = new KafkaFutureImpl<>(); long expiryTimestamp = options.expiryTimePeriodMs(); @@ -688,7 +688,7 @@ synchronized public ExpireDelegationTokenResult expireDelegationToken(byte[] hma } @Override - synchronized public DescribeDelegationTokenResult describeDelegationToken(DescribeDelegationTokenOptions options) { + public synchronized DescribeDelegationTokenResult describeDelegationToken(DescribeDelegationTokenOptions options) { KafkaFutureImpl> future = new KafkaFutureImpl<>(); if (options.owners().isEmpty()) { @@ -707,17 +707,17 @@ synchronized public DescribeDelegationTokenResult describeDelegationToken(Descri } @Override - synchronized public DescribeConsumerGroupsResult describeConsumerGroups(Collection groupIds, DescribeConsumerGroupsOptions options) { + public synchronized DescribeConsumerGroupsResult describeConsumerGroups(Collection groupIds, DescribeConsumerGroupsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public ListConsumerGroupsResult listConsumerGroups(ListConsumerGroupsOptions options) { + public synchronized ListConsumerGroupsResult listConsumerGroups(ListConsumerGroupsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public ListConsumerGroupOffsetsResult listConsumerGroupOffsets(Map groupSpecs, ListConsumerGroupOffsetsOptions options) { + public synchronized ListConsumerGroupOffsetsResult listConsumerGroupOffsets(Map groupSpecs, ListConsumerGroupOffsetsOptions options) { // ignoring the groups and assume one test would only work on one group only if (groupSpecs.size() != 1) throw new UnsupportedOperationException("Not implemented yet"); @@ -732,17 +732,17 @@ synchronized public ListConsumerGroupOffsetsResult listConsumerGroupOffsets(Map< } @Override - synchronized public DeleteConsumerGroupsResult deleteConsumerGroups(Collection groupIds, DeleteConsumerGroupsOptions options) { + public synchronized DeleteConsumerGroupsResult deleteConsumerGroups(Collection groupIds, DeleteConsumerGroupsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DeleteConsumerGroupOffsetsResult deleteConsumerGroupOffsets(String groupId, Set partitions, DeleteConsumerGroupOffsetsOptions options) { + public synchronized DeleteConsumerGroupOffsetsResult deleteConsumerGroupOffsets(String groupId, Set partitions, DeleteConsumerGroupOffsetsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public ElectLeadersResult electLeaders( + public synchronized ElectLeadersResult electLeaders( ElectionType electionType, Set partitions, ElectLeadersOptions options) { @@ -750,27 +750,27 @@ synchronized public ElectLeadersResult electLeaders( } @Override - synchronized public RemoveMembersFromConsumerGroupResult removeMembersFromConsumerGroup(String groupId, RemoveMembersFromConsumerGroupOptions options) { + public synchronized RemoveMembersFromConsumerGroupResult removeMembersFromConsumerGroup(String groupId, RemoveMembersFromConsumerGroupOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public CreateAclsResult createAcls(Collection acls, CreateAclsOptions options) { + public synchronized CreateAclsResult createAcls(Collection acls, CreateAclsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DescribeAclsResult describeAcls(AclBindingFilter filter, DescribeAclsOptions options) { + public synchronized DescribeAclsResult describeAcls(AclBindingFilter filter, DescribeAclsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DeleteAclsResult deleteAcls(Collection filters, DeleteAclsOptions options) { + public synchronized DeleteAclsResult deleteAcls(Collection filters, DeleteAclsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public DescribeConfigsResult describeConfigs(Collection resources, DescribeConfigsOptions options) { + public synchronized DescribeConfigsResult describeConfigs(Collection resources, DescribeConfigsOptions options) { if (timeoutNextRequests > 0) { Map> configs = new HashMap<>(); @@ -797,7 +797,7 @@ synchronized public DescribeConfigsResult describeConfigs(Collection map) { @Override @Deprecated - synchronized public AlterConfigsResult alterConfigs(Map configs, AlterConfigsOptions options) { + public synchronized AlterConfigsResult alterConfigs(Map configs, AlterConfigsOptions options) { throw new UnsupportedOperationException("Not implemented yet"); } @Override - synchronized public AlterConfigsResult incrementalAlterConfigs( + public synchronized AlterConfigsResult incrementalAlterConfigs( Map> configs, AlterConfigsOptions options) { Map> futures = new HashMap<>(); @@ -864,7 +864,7 @@ synchronized public AlterConfigsResult incrementalAlterConfigs( return new AlterConfigsResult(futures); } - synchronized private Throwable handleIncrementalResourceAlteration( + private synchronized Throwable handleIncrementalResourceAlteration( ConfigResource resource, Collection ops) { switch (resource.type()) { case BROKER: { @@ -951,7 +951,7 @@ synchronized private Throwable handleIncrementalResourceAlteration( } @Override - synchronized public AlterReplicaLogDirsResult alterReplicaLogDirs( + public synchronized AlterReplicaLogDirsResult alterReplicaLogDirs( Map replicaAssignment, AlterReplicaLogDirsOptions options) { Map> results = new HashMap<>(); @@ -984,7 +984,7 @@ synchronized public AlterReplicaLogDirsResult alterReplicaLogDirs( } @Override - synchronized public DescribeLogDirsResult describeLogDirs(Collection brokers, + public synchronized DescribeLogDirsResult describeLogDirs(Collection brokers, DescribeLogDirsOptions options) { Map> unwrappedResults = new HashMap<>(); @@ -1026,7 +1026,7 @@ synchronized public DescribeLogDirsResult describeLogDirs(Collection br } @Override - synchronized public DescribeReplicaLogDirsResult describeReplicaLogDirs( + public synchronized DescribeReplicaLogDirsResult describeReplicaLogDirs( Collection replicas, DescribeReplicaLogDirsOptions options) { Map> results = new HashMap<>(); for (TopicPartitionReplica replica : replicas) { @@ -1065,7 +1065,7 @@ private synchronized String currentLogDir(TopicPartitionReplica replica) { } @Override - synchronized public AlterPartitionReassignmentsResult alterPartitionReassignments( + public synchronized AlterPartitionReassignmentsResult alterPartitionReassignments( Map> newReassignments, AlterPartitionReassignmentsOptions options) { Map> futures = new HashMap<>(); @@ -1092,7 +1092,7 @@ synchronized public AlterPartitionReassignmentsResult alterPartitionReassignment } @Override - synchronized public ListPartitionReassignmentsResult listPartitionReassignments( + public synchronized ListPartitionReassignmentsResult listPartitionReassignments( Optional> partitions, ListPartitionReassignmentsOptions options) { Map map = new HashMap<>(); @@ -1106,7 +1106,7 @@ synchronized public ListPartitionReassignmentsResult listPartitionReassignments( return new ListPartitionReassignmentsResult(KafkaFutureImpl.completedFuture(map)); } - synchronized private PartitionReassignment findPartitionReassignment(TopicPartition partition) { + private synchronized PartitionReassignment findPartitionReassignment(TopicPartition partition) { NewPartitionReassignment reassignment = reassignments.get(partition); if (reassignment == null) { return null; @@ -1135,12 +1135,12 @@ synchronized private PartitionReassignment findPartitionReassignment(TopicPartit } @Override - synchronized public AlterConsumerGroupOffsetsResult alterConsumerGroupOffsets(String groupId, Map offsets, AlterConsumerGroupOffsetsOptions options) { + public synchronized AlterConsumerGroupOffsetsResult alterConsumerGroupOffsets(String groupId, Map offsets, AlterConsumerGroupOffsetsOptions options) { throw new UnsupportedOperationException("Not implement yet"); } @Override - synchronized public ListOffsetsResult listOffsets(Map topicPartitionOffsets, ListOffsetsOptions options) { + public synchronized ListOffsetsResult listOffsets(Map topicPartitionOffsets, ListOffsetsOptions options) { Map> futures = new HashMap<>(); for (Map.Entry entry : topicPartitionOffsets.entrySet()) { @@ -1317,7 +1317,7 @@ public RemoveRaftVoterResult removeRaftVoter(int voterId, Uuid voterDirectoryId, } @Override - synchronized public void close(Duration timeout) {} + public synchronized void close(Duration timeout) {} public synchronized void updateBeginningOffsets(Map newOffsets) { beginningOffsets.putAll(newOffsets); @@ -1331,7 +1331,7 @@ public synchronized void updateConsumerGroupOffsets(final Map partitions; @@ -1356,7 +1356,7 @@ private final static class TopicMetadata { } } - synchronized public void setMockMetrics(MetricName name, Metric metric) { + public synchronized void setMockMetrics(MetricName name, Metric metric) { mockMetrics.put(name, metric); } @@ -1404,11 +1404,11 @@ public Uuid clientInstanceId(Duration timeout) { } @Override - synchronized public Map metrics() { + public synchronized Map metrics() { return mockMetrics; } - synchronized public void setFetchesRemainingUntilVisible(String topicName, int fetchesRemainingUntilVisible) { + public synchronized void setFetchesRemainingUntilVisible(String topicName, int fetchesRemainingUntilVisible) { TopicMetadata metadata = allTopics.get(topicName); if (metadata == null) { throw new RuntimeException("No such topic as " + topicName); @@ -1416,11 +1416,11 @@ synchronized public void setFetchesRemainingUntilVisible(String topicName, int f metadata.fetchesRemainingUntilVisible = fetchesRemainingUntilVisible; } - synchronized public List brokers() { + public synchronized List brokers() { return new ArrayList<>(brokers); } - synchronized public Node broker(int index) { + public synchronized Node broker(int index) { return brokers.get(index); } } 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 ddde3ae84d4b1..e0f4e579be60c 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 @@ -28,7 +28,7 @@ public class TimedRequestStateTest { - private final static long DEFAULT_TIMEOUT_MS = 30000; + private static final long DEFAULT_TIMEOUT_MS = 30000; private final Time time = new MockTime(); @Test diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/field/FieldPathNotationTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/field/FieldPathNotationTest.java index d823bb4524435..e19399e8847ed 100644 --- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/field/FieldPathNotationTest.java +++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/field/FieldPathNotationTest.java @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; class FieldPathNotationTest { - final static String[] EMPTY_PATH = new String[] {}; + static final String[] EMPTY_PATH = new String[] {}; @Test void shouldBuildV1WithDotsAndBacktickPair() { @@ -157,4 +157,4 @@ private void assertParseV2Error(String inputPath, String expectedMessage) { ); assertEquals(expectedMessage, exception.getMessage()); } -} \ No newline at end of file +} diff --git a/core/src/main/java/kafka/server/SharePartition.java b/core/src/main/java/kafka/server/SharePartition.java index ddbdb89930c5c..5d17701019b69 100644 --- a/core/src/main/java/kafka/server/SharePartition.java +++ b/core/src/main/java/kafka/server/SharePartition.java @@ -42,12 +42,12 @@ */ public class SharePartition { - private final static Logger log = LoggerFactory.getLogger(SharePartition.class); + private static final Logger log = LoggerFactory.getLogger(SharePartition.class); /** * empty member id used to indicate when a record is not acquired by any member. */ - final static String EMPTY_MEMBER_ID = Uuid.ZERO_UUID.toString(); + static final String EMPTY_MEMBER_ID = Uuid.ZERO_UUID.toString(); /** * The RecordState is used to track the state of a record that has been fetched from the leader. diff --git a/core/src/main/java/kafka/server/SharePartitionManager.java b/core/src/main/java/kafka/server/SharePartitionManager.java index ec4af0265adb3..e64a86c392f4b 100644 --- a/core/src/main/java/kafka/server/SharePartitionManager.java +++ b/core/src/main/java/kafka/server/SharePartitionManager.java @@ -37,7 +37,7 @@ */ public class SharePartitionManager implements AutoCloseable { - private final static Logger log = LoggerFactory.getLogger(SharePartitionManager.class); + private static final Logger log = LoggerFactory.getLogger(SharePartitionManager.class); /** * The partition cache map is used to store the SharePartition objects for each share group topic-partition. diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java index 84219aa46ffd0..017dbce0de65e 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java @@ -31,76 +31,76 @@ */ public class GroupCoordinatorConfig { /** ********* Group coordinator configuration ***********/ - public final static String GROUP_MIN_SESSION_TIMEOUT_MS_CONFIG = "group.min.session.timeout.ms"; - public final static String GROUP_MIN_SESSION_TIMEOUT_MS_DOC = "The minimum allowed session timeout for registered consumers. Shorter timeouts result in quicker failure detection at the cost of more frequent consumer heartbeating, which can overwhelm broker resources."; + public static final String GROUP_MIN_SESSION_TIMEOUT_MS_CONFIG = "group.min.session.timeout.ms"; + public static final String GROUP_MIN_SESSION_TIMEOUT_MS_DOC = "The minimum allowed session timeout for registered consumers. Shorter timeouts result in quicker failure detection at the cost of more frequent consumer heartbeating, which can overwhelm broker resources."; public static final int GROUP_MIN_SESSION_TIMEOUT_MS_DEFAULT = 6000; - public final static String GROUP_MAX_SESSION_TIMEOUT_MS_CONFIG = "group.max.session.timeout.ms"; - public final static String GROUP_MAX_SESSION_TIMEOUT_MS_DOC = "The maximum allowed session timeout for registered consumers. Longer timeouts give consumers more time to process messages in between heartbeats at the cost of a longer time to detect failures."; + public static final String GROUP_MAX_SESSION_TIMEOUT_MS_CONFIG = "group.max.session.timeout.ms"; + public static final String GROUP_MAX_SESSION_TIMEOUT_MS_DOC = "The maximum allowed session timeout for registered consumers. Longer timeouts give consumers more time to process messages in between heartbeats at the cost of a longer time to detect failures."; public static final int GROUP_MAX_SESSION_TIMEOUT_MS_DEFAULT = 1800000; - public final static String GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG = "group.initial.rebalance.delay.ms"; - public final static String GROUP_INITIAL_REBALANCE_DELAY_MS_DOC = "The amount of time the group coordinator will wait for more consumers to join a new group before performing the first rebalance. A longer delay means potentially fewer rebalances, but increases the time until processing begins."; + public static final String GROUP_INITIAL_REBALANCE_DELAY_MS_CONFIG = "group.initial.rebalance.delay.ms"; + public static final String GROUP_INITIAL_REBALANCE_DELAY_MS_DOC = "The amount of time the group coordinator will wait for more consumers to join a new group before performing the first rebalance. A longer delay means potentially fewer rebalances, but increases the time until processing begins."; public static final int GROUP_INITIAL_REBALANCE_DELAY_MS_DEFAULT = 3000; - public final static String GROUP_MAX_SIZE_CONFIG = "group.max.size"; - public final static String GROUP_MAX_SIZE_DOC = "The maximum number of consumers that a single consumer group can accommodate."; + public static final String GROUP_MAX_SIZE_CONFIG = "group.max.size"; + public static final String GROUP_MAX_SIZE_DOC = "The maximum number of consumers that a single consumer group can accommodate."; public static final int GROUP_MAX_SIZE_DEFAULT = Integer.MAX_VALUE; /** New group coordinator configs */ - public final static String NEW_GROUP_COORDINATOR_ENABLE_CONFIG = "group.coordinator.new.enable"; - public final static String NEW_GROUP_COORDINATOR_ENABLE_DOC = "Enable the new group coordinator."; + public static final String NEW_GROUP_COORDINATOR_ENABLE_CONFIG = "group.coordinator.new.enable"; + public static final String NEW_GROUP_COORDINATOR_ENABLE_DOC = "Enable the new group coordinator."; public static final boolean NEW_GROUP_COORDINATOR_ENABLE_DEFAULT = false; - public final static String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG = "group.coordinator.rebalance.protocols"; - public final static String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC = "The list of enabled rebalance protocols. Supported protocols: " + + public static final String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_CONFIG = "group.coordinator.rebalance.protocols"; + public static final String GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DOC = "The list of enabled rebalance protocols. Supported protocols: " + Arrays.stream(Group.GroupType.values()).map(Group.GroupType::toString).collect(Collectors.joining(",")) + ". " + "The " + Group.GroupType.CONSUMER + " rebalance protocol is in early access and therefore must not be used in production."; public static final List GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DEFAULT = Collections.singletonList(Group.GroupType.CLASSIC.toString()); - public final static String GROUP_COORDINATOR_NUM_THREADS_CONFIG = "group.coordinator.threads"; - public final static String GROUP_COORDINATOR_NUM_THREADS_DOC = "The number of threads used by the group coordinator."; + public static final String GROUP_COORDINATOR_NUM_THREADS_CONFIG = "group.coordinator.threads"; + public static final String GROUP_COORDINATOR_NUM_THREADS_DOC = "The number of threads used by the group coordinator."; public static final int GROUP_COORDINATOR_NUM_THREADS_DEFAULT = 1; /** Consumer group configs */ - public final static String CONSUMER_GROUP_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.session.timeout.ms"; - public final static String CONSUMER_GROUP_SESSION_TIMEOUT_MS_DOC = "The timeout to detect client failures when using the consumer group protocol."; + public static final String CONSUMER_GROUP_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.session.timeout.ms"; + public static final String CONSUMER_GROUP_SESSION_TIMEOUT_MS_DOC = "The timeout to detect client failures when using the consumer group protocol."; public static final int CONSUMER_GROUP_SESSION_TIMEOUT_MS_DEFAULT = 45000; - public final static String CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.min.session.timeout.ms"; - public final static String CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_DOC = "The minimum allowed session timeout for registered consumers."; + public static final String CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.min.session.timeout.ms"; + public static final String CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_DOC = "The minimum allowed session timeout for registered consumers."; public static final int CONSUMER_GROUP_MIN_SESSION_TIMEOUT_MS_DEFAULT = 45000; - public final static String CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.max.session.timeout.ms"; - public final static String CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_DOC = "The maximum allowed session timeout for registered consumers."; + public static final String CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_CONFIG = "group.consumer.max.session.timeout.ms"; + public static final String CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_DOC = "The maximum allowed session timeout for registered consumers."; public static final int CONSUMER_GROUP_MAX_SESSION_TIMEOUT_MS_DEFAULT = 60000; - public final static String CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.heartbeat.interval.ms"; - public final static String CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_DOC = "The heartbeat interval given to the members of a consumer group."; + public static final String CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.heartbeat.interval.ms"; + public static final String CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_DOC = "The heartbeat interval given to the members of a consumer group."; public static final int CONSUMER_GROUP_HEARTBEAT_INTERVAL_MS_DEFAULT = 5000; - public final static String CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.min.heartbeat.interval.ms"; - public final static String CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DOC = "The minimum heartbeat interval for registered consumers."; + public static final String CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.min.heartbeat.interval.ms"; + public static final String CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DOC = "The minimum heartbeat interval for registered consumers."; public static final int CONSUMER_GROUP_MIN_HEARTBEAT_INTERVAL_MS_DEFAULT = 5000; - public final static String CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.max.heartbeat.interval.ms"; - public final static String CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DOC = "The maximum heartbeat interval for registered consumers."; + public static final String CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_CONFIG = "group.consumer.max.heartbeat.interval.ms"; + public static final String CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DOC = "The maximum heartbeat interval for registered consumers."; public static final int CONSUMER_GROUP_MAX_HEARTBEAT_INTERVAL_MS_DEFAULT = 15000; - public final static String CONSUMER_GROUP_MAX_SIZE_CONFIG = "group.consumer.max.size"; - public final static String CONSUMER_GROUP_MAX_SIZE_DOC = "The maximum number of consumers that a single consumer group can accommodate. This value will only impact the new consumer coordinator. To configure the classic consumer coordinator check " + GROUP_MAX_SIZE_CONFIG + " instead."; + public static final String CONSUMER_GROUP_MAX_SIZE_CONFIG = "group.consumer.max.size"; + public static final String CONSUMER_GROUP_MAX_SIZE_DOC = "The maximum number of consumers that a single consumer group can accommodate. This value will only impact the new consumer coordinator. To configure the classic consumer coordinator check " + GROUP_MAX_SIZE_CONFIG + " instead."; public static final int CONSUMER_GROUP_MAX_SIZE_DEFAULT = Integer.MAX_VALUE; - public final static String CONSUMER_GROUP_ASSIGNORS_CONFIG = "group.consumer.assignors"; - public final static String CONSUMER_GROUP_ASSIGNORS_DOC = "The server side assignors as a list of full class names. The first one in the list is considered as the default assignor to be used in the case where the consumer does not specify an assignor."; + public static final String CONSUMER_GROUP_ASSIGNORS_CONFIG = "group.consumer.assignors"; + public static final String CONSUMER_GROUP_ASSIGNORS_DOC = "The server side assignors as a list of full class names. The first one in the list is considered as the default assignor to be used in the case where the consumer does not specify an assignor."; public static final List CONSUMER_GROUP_ASSIGNORS_DEFAULT = Collections.unmodifiableList(Arrays.asList( UniformAssignor.class.getName(), RangeAssignor.class.getName() )); - public final static String CONSUMER_GROUP_MIGRATION_POLICY_CONFIG = "group.consumer.migration.policy"; + public static final String CONSUMER_GROUP_MIGRATION_POLICY_CONFIG = "group.consumer.migration.policy"; public static final String CONSUMER_GROUP_MIGRATION_POLICY_DEFAULT = ConsumerGroupMigrationPolicy.DISABLED.toString(); - public final static String CONSUMER_GROUP_MIGRATION_POLICY_DOC = "The config that enables converting the non-empty classic group using the consumer embedded protocol to the non-empty consumer group using the consumer group protocol and vice versa; " + + public static final String CONSUMER_GROUP_MIGRATION_POLICY_DOC = "The config that enables converting the non-empty classic group using the consumer embedded protocol to the non-empty consumer group using the consumer group protocol and vice versa; " + "conversions of empty groups in both directions are always enabled regardless of this policy. " + ConsumerGroupMigrationPolicy.BIDIRECTIONAL + ": both upgrade from classic group to consumer group and downgrade from consumer group to classic group are enabled, " + ConsumerGroupMigrationPolicy.UPGRADE + ": only upgrade from classic group to consumer group is enabled, " + diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java index d352949346f0a..a9511ae0aa43d 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTestContext.java @@ -372,21 +372,21 @@ SyncGroupRequestData build() { } public static class Builder { - final private MockTime time = new MockTime(); - final private MockCoordinatorTimer timer = new MockCoordinatorTimer<>(time); - final private LogContext logContext = new LogContext(); - final private SnapshotRegistry snapshotRegistry = new SnapshotRegistry(logContext); + private final MockTime time = new MockTime(); + private final MockCoordinatorTimer timer = new MockCoordinatorTimer<>(time); + private final LogContext logContext = new LogContext(); + private final SnapshotRegistry snapshotRegistry = new SnapshotRegistry(logContext); private MetadataImage metadataImage; private List consumerGroupAssignors = Collections.singletonList(new MockPartitionAssignor("range")); - final private List consumerGroupBuilders = new ArrayList<>(); + private final List consumerGroupBuilders = new ArrayList<>(); private int consumerGroupMaxSize = Integer.MAX_VALUE; private int consumerGroupMetadataRefreshIntervalMs = Integer.MAX_VALUE; private int classicGroupMaxSize = Integer.MAX_VALUE; private int classicGroupInitialRebalanceDelayMs = 3000; - final private int classicGroupNewMemberJoinTimeoutMs = 5 * 60 * 1000; + private final int classicGroupNewMemberJoinTimeoutMs = 5 * 60 * 1000; private int classicGroupMinSessionTimeoutMs = 10; private int classicGroupMaxSessionTimeoutMs = 10 * 60 * 1000; - final private GroupCoordinatorMetricsShard metrics = mock(GroupCoordinatorMetricsShard.class); + private final GroupCoordinatorMetricsShard metrics = mock(GroupCoordinatorMetricsShard.class); private ConsumerGroupMigrationPolicy consumerGroupMigrationPolicy = ConsumerGroupMigrationPolicy.DISABLED; public Builder withMetadataImage(MetadataImage metadataImage) { diff --git a/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java index 8ecd4be28c909..8a0b8026a0526 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java @@ -35,7 +35,7 @@ @Timeout(value = 40) public class TopicImageNodeTest { - private final static TopicImageNode NODE = new TopicImageNode(newTopicImage("topic-image-node-test-topic", Uuid.ZERO_UUID, new PartitionRegistration.Builder().setReplicas(new int[] {2, 3, 4}). + private static final TopicImageNode NODE = new TopicImageNode(newTopicImage("topic-image-node-test-topic", Uuid.ZERO_UUID, new PartitionRegistration.Builder().setReplicas(new int[] {2, 3, 4}). setDirectories(DirectoryId.migratingArray(3)). setIsr(new int[] {2, 3}).setLeader(2).setLeaderRecoveryState(LeaderRecoveryState.RECOVERED).setLeaderEpoch(1).setPartitionEpoch(345).build())); diff --git a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java index f001115a2f8c3..363d853f2c7a1 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java @@ -38,7 +38,7 @@ @Timeout(60) public class BootstrapMetadataTest { - final static List SAMPLE_RECORDS1 = unmodifiableList(asList( + static final List SAMPLE_RECORDS1 = unmodifiableList(asList( new ApiMessageAndVersion(new FeatureLevelRecord(). setName(FEATURE_NAME). setFeatureLevel((short) 7), (short) 0), @@ -76,7 +76,7 @@ public void testCopyWithOnlyVersion() { BootstrapMetadata.fromRecords(SAMPLE_RECORDS1, "baz").copyWithOnlyVersion()); } - final static List RECORDS_WITH_OLD_METADATA_VERSION = unmodifiableList(Collections.singletonList( + static final List RECORDS_WITH_OLD_METADATA_VERSION = unmodifiableList(Collections.singletonList( new ApiMessageAndVersion(new FeatureLevelRecord(). setName(FEATURE_NAME). setFeatureLevel(IBP_3_0_IV1.featureLevel()), (short) 0))); diff --git a/raft/src/main/java/org/apache/kafka/raft/ElectionState.java b/raft/src/main/java/org/apache/kafka/raft/ElectionState.java index 825acf7df69fd..5c6dc14671b83 100644 --- a/raft/src/main/java/org/apache/kafka/raft/ElectionState.java +++ b/raft/src/main/java/org/apache/kafka/raft/ElectionState.java @@ -29,7 +29,7 @@ /** * Encapsulate election state stored on disk after every state change. */ -final public class ElectionState { +public final class ElectionState { private static final int UNKNOWN_LEADER_ID = -1; private static final int NOT_VOTED = -1; private static final Uuid NO_VOTED_DIRECTORY_ID = Uuid.ZERO_UUID; diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java index aa07ce89203dc..87257fb1750e5 100644 --- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java +++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java @@ -149,7 +149,7 @@ * as FileRecords, but we use {@link UnalignedRecords} in FetchSnapshotResponse because the records * are not necessarily offset-aligned. */ -final public class KafkaRaftClient implements RaftClient { +public final class KafkaRaftClient implements RaftClient { private static final int RETRY_BACKOFF_BASE_MS = 100; public static final int MAX_FETCH_WAIT_MS = 500; public static final int MAX_BATCH_SIZE_BYTES = 8 * 1024 * 1024; diff --git a/raft/src/main/java/org/apache/kafka/raft/RaftRequest.java b/raft/src/main/java/org/apache/kafka/raft/RaftRequest.java index bf590f56ab175..21566f6c760b4 100644 --- a/raft/src/main/java/org/apache/kafka/raft/RaftRequest.java +++ b/raft/src/main/java/org/apache/kafka/raft/RaftRequest.java @@ -46,7 +46,7 @@ public long createdTimeMs() { return createdTimeMs; } - public final static class Inbound extends RaftRequest { + public static final class Inbound extends RaftRequest { public final CompletableFuture completion = new CompletableFuture<>(); public Inbound(int correlationId, ApiMessage data, long createdTimeMs) { @@ -64,7 +64,7 @@ public String toString() { } } - public final static class Outbound extends RaftRequest { + public static final class Outbound extends RaftRequest { private final Node destination; public final CompletableFuture completion = new CompletableFuture<>(); diff --git a/raft/src/main/java/org/apache/kafka/raft/RaftResponse.java b/raft/src/main/java/org/apache/kafka/raft/RaftResponse.java index 9c5047ca92dfb..591b68f19f570 100644 --- a/raft/src/main/java/org/apache/kafka/raft/RaftResponse.java +++ b/raft/src/main/java/org/apache/kafka/raft/RaftResponse.java @@ -38,7 +38,7 @@ public ApiMessage data() { return data; } - public final static class Inbound extends RaftResponse { + public static final class Inbound extends RaftResponse { private final Node source; public Inbound(int correlationId, ApiMessage data, Node source) { @@ -61,7 +61,7 @@ public String toString() { } } - public final static class Outbound extends RaftResponse { + public static final class Outbound extends RaftResponse { public Outbound(int requestId, ApiMessage data) { super(requestId, data); } diff --git a/raft/src/main/java/org/apache/kafka/raft/RequestManager.java b/raft/src/main/java/org/apache/kafka/raft/RequestManager.java index dfdaf9d19358c..ad331cdde8343 100644 --- a/raft/src/main/java/org/apache/kafka/raft/RequestManager.java +++ b/raft/src/main/java/org/apache/kafka/raft/RequestManager.java @@ -281,7 +281,7 @@ private enum State { READY } - private final static class ConnectionState { + private static final class ConnectionState { private final Node node; private final int retryBackoffMs; private final int requestTimeoutMs; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java index 25ad3d0552d33..6c5321777a0c9 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java @@ -43,7 +43,7 @@ * the public methods. The other actors/threads are the callers of {@code RaftClient.createSnapshot} which * indirectly call {@code voterSetAtOffset} and {@code kraftVersionAtOffset} when freezing a snapshot. */ -final public class KRaftControlRecordStateMachine { +public final class KRaftControlRecordStateMachine { private final ReplicatedLog log; private final RecordSerde serde; private final BufferSupplier bufferSupplier; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/TreeMapLogHistory.java b/raft/src/main/java/org/apache/kafka/raft/internals/TreeMapLogHistory.java index 2a27f96aeecea..fdffc6b0f41b4 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/TreeMapLogHistory.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/TreeMapLogHistory.java @@ -24,7 +24,7 @@ /** * A implementation for {@code LogHistory} which uses a red-black tree to store values sorted by offset. */ -final public class TreeMapLogHistory implements LogHistory { +public final class TreeMapLogHistory implements LogHistory { private final NavigableMap history = new TreeMap<>(); @Override diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/VoterSet.java b/raft/src/main/java/org/apache/kafka/raft/internals/VoterSet.java index 393cb373b316c..dc14e2c01a34b 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/VoterSet.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/VoterSet.java @@ -45,7 +45,7 @@ * It provides functionality for converting to and from {@code VotersRecord} and for converting * from the static configuration. */ -final public class VoterSet { +public final class VoterSet { private final Map voters; VoterSet(Map voters) { @@ -271,7 +271,7 @@ public String toString() { return String.format("VoterSet(voters=%s)", voters); } - public final static class VoterNode { + public static final class VoterNode { private final ReplicaKey voterKey; private final Map listeners; private final SupportedVersionRange supportedKRaftVersion; diff --git a/raft/src/main/java/org/apache/kafka/raft/internals/VoterSetHistory.java b/raft/src/main/java/org/apache/kafka/raft/internals/VoterSetHistory.java index fa44660af671d..26580795b6baa 100644 --- a/raft/src/main/java/org/apache/kafka/raft/internals/VoterSetHistory.java +++ b/raft/src/main/java/org/apache/kafka/raft/internals/VoterSetHistory.java @@ -25,7 +25,7 @@ * and the log segments. This is useful when generating a new snapshot at a given offset or when * evaluating the latest set of voters. */ -final public class VoterSetHistory { +public final class VoterSetHistory { private final Optional staticVoterSet; private final LogHistory votersHistory = new TreeMapLogHistory<>(); diff --git a/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotWriter.java b/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotWriter.java index bc98fcb4b2711..51839fe192a20 100644 --- a/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotWriter.java +++ b/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotWriter.java @@ -37,10 +37,10 @@ import java.util.Optional; import java.util.OptionalLong; -final public class RecordsSnapshotWriter implements SnapshotWriter { - final private RawSnapshotWriter snapshot; - final private BatchAccumulator accumulator; - final private Time time; +public final class RecordsSnapshotWriter implements SnapshotWriter { + private final RawSnapshotWriter snapshot; + private final BatchAccumulator accumulator; + private final Time time; private RecordsSnapshotWriter( RawSnapshotWriter snapshot, @@ -140,7 +140,7 @@ private void appendBatches(List> batches) { } } - final public static class Builder { + public static final class Builder { private long lastContainedLogTimestamp = 0; private Compression compression = Compression.NONE; private Time time = Time.SYSTEM; diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/TreeMapLogHistoryTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/TreeMapLogHistoryTest.java index 596d89f337c2c..852e935103aec 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/TreeMapLogHistoryTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/TreeMapLogHistoryTest.java @@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -final public class TreeMapLogHistoryTest { +public final class TreeMapLogHistoryTest { @Test void testEmpty() { TreeMapLogHistory history = new TreeMapLogHistory<>(); diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetHistoryTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetHistoryTest.java index ac5c3b39c9c3c..d0ca014d77456 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetHistoryTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetHistoryTest.java @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -final public class VoterSetHistoryTest { +public final class VoterSetHistoryTest { @Test void testStaticVoterSet() { VoterSet staticVoterSet = new VoterSet(VoterSetTest.voterMap(IntStream.of(1, 2, 3), true)); diff --git a/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetTest.java b/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetTest.java index 9f879db10ee6f..2934d2f7efc8b 100644 --- a/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetTest.java +++ b/raft/src/test/java/org/apache/kafka/raft/internals/VoterSetTest.java @@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -final public class VoterSetTest { +public final class VoterSetTest { @Test void testEmptyVoterSet() { assertThrows(IllegalArgumentException.class, () -> new VoterSet(Collections.emptyMap())); diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java index 628608176482e..e3b451914a843 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java @@ -74,9 +74,9 @@ public class TaskManager { - private final static String BUG_ERROR_MESSAGE = "This indicates a bug. " + + private static final String BUG_ERROR_MESSAGE = "This indicates a bug. " + "Please report at https://issues.apache.org/jira/projects/KAFKA/issues or to the dev-mailing list (https://kafka.apache.org/contact)."; - private final static String INTERRUPTED_ERROR_MESSAGE = "Thread got interrupted. " + BUG_ERROR_MESSAGE; + private static final String INTERRUPTED_ERROR_MESSAGE = "Thread got interrupted. " + BUG_ERROR_MESSAGE; // initialize the task list // activeTasks needs to be concurrent as it can be accessed diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionSendProcessorSupplierTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionSendProcessorSupplierTest.java index 3a3e3a2685581..2f366768cc8a1 100644 --- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionSendProcessorSupplierTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/foreignkeyjoin/SubscriptionSendProcessorSupplierTest.java @@ -335,7 +335,7 @@ public byte[] serialize(final String topic, final LeftValue data) { } } - private final static class LeftValue { + private static final class LeftValue { private final String foreignKey; public LeftValue(final String value) { diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java index 7054724087f33..5feee0c0e6fd3 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/DefaultStateUpdaterTest.java @@ -84,24 +84,24 @@ class DefaultStateUpdaterTest { - private final static int COMMIT_INTERVAL = 100; - private final static long CALL_TIMEOUT = 1000; - private final static long VERIFICATION_TIMEOUT = 30000; - private final static TopicPartition TOPIC_PARTITION_A_0 = new TopicPartition("topicA", 0); - private final static TopicPartition TOPIC_PARTITION_A_1 = new TopicPartition("topicA", 1); - private final static TopicPartition TOPIC_PARTITION_B_0 = new TopicPartition("topicB", 0); - private final static TopicPartition TOPIC_PARTITION_B_1 = new TopicPartition("topicB", 1); - private final static TopicPartition TOPIC_PARTITION_C_0 = new TopicPartition("topicC", 0); - private final static TopicPartition TOPIC_PARTITION_D_0 = new TopicPartition("topicD", 0); - private final static TaskId TASK_0_0 = new TaskId(0, 0); - private final static TaskId TASK_0_1 = new TaskId(0, 1); - private final static TaskId TASK_0_2 = new TaskId(0, 2); - private final static TaskId TASK_1_0 = new TaskId(1, 0); - private final static TaskId TASK_1_1 = new TaskId(1, 1); - private final static TaskId TASK_A_0_0 = new TaskId(0, 0, "A"); - private final static TaskId TASK_A_0_1 = new TaskId(0, 1, "A"); - private final static TaskId TASK_B_0_0 = new TaskId(0, 0, "B"); - private final static TaskId TASK_B_0_1 = new TaskId(0, 1, "B"); + private static final int COMMIT_INTERVAL = 100; + private static final long CALL_TIMEOUT = 1000; + private static final long VERIFICATION_TIMEOUT = 30000; + private static final TopicPartition TOPIC_PARTITION_A_0 = new TopicPartition("topicA", 0); + private static final TopicPartition TOPIC_PARTITION_A_1 = new TopicPartition("topicA", 1); + private static final TopicPartition TOPIC_PARTITION_B_0 = new TopicPartition("topicB", 0); + private static final TopicPartition TOPIC_PARTITION_B_1 = new TopicPartition("topicB", 1); + private static final TopicPartition TOPIC_PARTITION_C_0 = new TopicPartition("topicC", 0); + private static final TopicPartition TOPIC_PARTITION_D_0 = new TopicPartition("topicD", 0); + private static final TaskId TASK_0_0 = new TaskId(0, 0); + private static final TaskId TASK_0_1 = new TaskId(0, 1); + private static final TaskId TASK_0_2 = new TaskId(0, 2); + private static final TaskId TASK_1_0 = new TaskId(1, 0); + private static final TaskId TASK_1_1 = new TaskId(1, 1); + private static final TaskId TASK_A_0_0 = new TaskId(0, 0, "A"); + private static final TaskId TASK_A_0_1 = new TaskId(0, 1, "A"); + private static final TaskId TASK_B_0_0 = new TaskId(0, 0, "B"); + private static final TaskId TASK_B_0_1 = new TaskId(0, 1, "B"); // need an auto-tick timer to work for draining with timeout private final Time time = new MockTime(1L); @@ -1877,4 +1877,4 @@ private void verifyRemovedTasks(final Task... tasks) throws Exception { ); } } -} \ No newline at end of file +} diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java index 2892c40be92cf..5bbb93f159323 100644 --- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/TasksTest.java @@ -39,13 +39,13 @@ public class TasksTest { - private final static TopicPartition TOPIC_PARTITION_A_0 = new TopicPartition("topicA", 0); - private final static TopicPartition TOPIC_PARTITION_A_1 = new TopicPartition("topicA", 1); - private final static TopicPartition TOPIC_PARTITION_B_0 = new TopicPartition("topicB", 0); - private final static TopicPartition TOPIC_PARTITION_B_1 = new TopicPartition("topicB", 1); - private final static TaskId TASK_0_0 = new TaskId(0, 0); - private final static TaskId TASK_0_1 = new TaskId(0, 1); - private final static TaskId TASK_1_0 = new TaskId(1, 0); + private static final TopicPartition TOPIC_PARTITION_A_0 = new TopicPartition("topicA", 0); + private static final TopicPartition TOPIC_PARTITION_A_1 = new TopicPartition("topicA", 1); + private static final TopicPartition TOPIC_PARTITION_B_0 = new TopicPartition("topicB", 0); + private static final TopicPartition TOPIC_PARTITION_B_1 = new TopicPartition("topicB", 1); + private static final TaskId TASK_0_0 = new TaskId(0, 0); + private static final TaskId TASK_0_1 = new TaskId(0, 1); + private static final TaskId TASK_1_0 = new TaskId(1, 0); private final Tasks tasks = new Tasks(new LogContext()); @@ -141,4 +141,4 @@ public void shouldVerifyIfPendingTaskToInitExist() { tasks.drainPendingTasksToInit(); assertFalse(tasks.hasPendingTasksToInit()); } -} \ No newline at end of file +} diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java index 45cec5822cf7e..d7e6c87431aca 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java @@ -70,10 +70,10 @@ @Tag("integration") @ExtendWith(ClusterTestExtensions.class) public class ListConsumerGroupTest { - private final static String TOPIC_PREFIX = "test.topic."; - private final static String TOPIC_PARTITIONS_GROUP_PREFIX = "test.topic.partitions.group."; - private final static String TOPIC_GROUP_PREFIX = "test.topic.group."; - private final static String PROTOCOL_GROUP_PREFIX = "test.protocol.group."; + private static final String TOPIC_PREFIX = "test.topic."; + private static final String TOPIC_PARTITIONS_GROUP_PREFIX = "test.topic.partitions.group."; + private static final String TOPIC_GROUP_PREFIX = "test.topic.group."; + private static final String PROTOCOL_GROUP_PREFIX = "test.protocol.group."; private final ClusterInstance clusterInstance; ListConsumerGroupTest(ClusterInstance clusterInstance) { @@ -663,4 +663,4 @@ public void testConsumerGroupTypesFromString() { Assertions.assertThrows(IllegalArgumentException.class, () -> ConsumerGroupCommand.consumerGroupTypesFromString(" , ,")); } -} \ No newline at end of file +} From 2a4076fe8fd67eadc8c1c0be89249c97f9dcc7a8 Mon Sep 17 00:00:00 2001 From: gongxuanzhang Date: Thu, 13 Jun 2024 09:37:59 +0800 Subject: [PATCH 4/4] update increment modifier order error --- .../kafka/coordinator/group/GroupCoordinatorConfig.java | 6 +++--- .../server/log/remote/storage/RemoteStorageMetrics.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java index daca53aa82ef8..fd11df4bb931a 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorConfig.java @@ -57,10 +57,10 @@ public class GroupCoordinatorConfig { Arrays.stream(Group.GroupType.values()).map(Group.GroupType::toString).collect(Collectors.joining(",")) + ". " + "The " + Group.GroupType.CONSUMER + " rebalance protocol is in early access and therefore must not be used in production."; public static final List GROUP_COORDINATOR_REBALANCE_PROTOCOLS_DEFAULT = Collections.singletonList(Group.GroupType.CLASSIC.toString()); - public final static String GROUP_COORDINATOR_APPEND_LINGER_MS_CONFIG = "group.coordinator.append.linger.ms"; - public final static String GROUP_COORDINATOR_APPEND_LINGER_MS_DOC = "The duration in milliseconds that the coordinator will " + + public static final String GROUP_COORDINATOR_APPEND_LINGER_MS_CONFIG = "group.coordinator.append.linger.ms"; + public static final String GROUP_COORDINATOR_APPEND_LINGER_MS_DOC = "The duration in milliseconds that the coordinator will " + "wait for writes to accumulate before flushing them to disk. Transactional writes are not accumulated."; - public final static int GROUP_COORDINATOR_APPEND_LINGER_MS_DEFAULT = 10; + public static final int GROUP_COORDINATOR_APPEND_LINGER_MS_DEFAULT = 10; public static final String GROUP_COORDINATOR_NUM_THREADS_CONFIG = "group.coordinator.threads"; public static final String GROUP_COORDINATOR_NUM_THREADS_DOC = "The number of threads used by the group coordinator."; diff --git a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java index 83a5b894b8a05..019b68828fecf 100644 --- a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java +++ b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java @@ -96,7 +96,7 @@ public class RemoteStorageMetrics { "org.apache.kafka.storage.internals.log", "RemoteStorageThreadPool", REMOTE_LOG_READER_TASK_QUEUE_SIZE); public static final MetricName REMOTE_LOG_READER_AVG_IDLE_PERCENT_METRIC = getMetricName( "org.apache.kafka.storage.internals.log", "RemoteStorageThreadPool", REMOTE_LOG_READER_AVG_IDLE_PERCENT); - public final static MetricName REMOTE_LOG_READER_FETCH_RATE_AND_TIME_METRIC = getMetricName( + public static final MetricName REMOTE_LOG_READER_FETCH_RATE_AND_TIME_METRIC = getMetricName( "kafka.log.remote", "RemoteLogManager", REMOTE_LOG_READER_FETCH_RATE_AND_TIME_MS); public static Set allMetrics() {