You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by mi...@apache.org on 2023/02/07 16:38:13 UTC
[kafka] branch trunk updated: MINOR: Remove unnecessary code (#13210)
This is an automated email from the ASF dual-hosted git repository.
mimaison pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new a0a9b6ffeaa MINOR: Remove unnecessary code (#13210)
a0a9b6ffeaa is described below
commit a0a9b6ffeaa61511f79e17fad8430d9114d472ef
Author: Christo Lolov <lo...@amazon.com>
AuthorDate: Tue Feb 7 16:37:45 2023 +0000
MINOR: Remove unnecessary code (#13210)
Reviewers: Mickael Maison <mi...@gmail.com>, Divij Vaidya <di...@amazon.com>
---
.../apache/kafka/clients/admin/AlterConfigOp.java | 4 ++--
.../apache/kafka/common/ConsumerGroupState.java | 2 +-
.../security/authenticator/CredentialCache.java | 2 +-
.../apache/kafka/common/utils/MappedIterator.java | 4 ++--
.../kafka/connect/runtime/distributed/Crypto.java | 2 +-
.../org/apache/kafka/message/MessageSpecType.java | 2 +-
.../apache/kafka/message/RequestListenerType.java | 2 +-
.../apache/kafka/metadata/KafkaConfigSchema.java | 16 ++++++-------
.../kafka/controller/QuorumControllerTest.java | 28 +++++++++++-----------
.../apache/kafka/metalog/LocalLogManagerTest.java | 8 +++----
.../org/apache/kafka/timeline/TimelineHashMap.java | 28 +++++++++++-----------
.../kafka/timeline/SnapshottableHashTableTest.java | 2 +-
.../kafka/server/log/internals/AppendOrigin.java | 2 +-
.../server/log/internals/IndexSearchType.java | 2 +-
.../kafka/server/log/internals/LazyIndex.java | 2 +-
.../storage/RemoteLogSegmentLifecycleTest.java | 7 +++---
.../storage/InmemoryRemoteLogMetadataManager.java | 6 ++---
.../storage/InmemoryRemoteStorageManager.java | 2 +-
.../apache/kafka/streams/query/FailureReason.java | 2 +-
.../integration/KTableEfficientRangeQueryTest.java | 2 +-
.../internals/ProcessorStateManagerTest.java | 2 +-
.../state/internals/SessionStoreFetchTest.java | 2 +-
.../state/internals/WindowStoreFetchTest.java | 2 +-
.../kafka/trogdor/coordinator/Coordinator.java | 2 +-
.../kafka/trogdor/coordinator/NodeManager.java | 2 +-
.../kafka/trogdor/coordinator/TaskManager.java | 2 +-
.../org/apache/kafka/trogdor/agent/AgentTest.java | 2 +-
.../kafka/trogdor/basic/BasicPlatformTest.java | 2 +-
.../trogdor/common/CapturingCommandRunner.java | 2 +-
.../apache/kafka/trogdor/common/ExpectedTasks.java | 2 +-
.../trogdor/common/JsonSerializationTest.java | 2 +-
.../apache/kafka/trogdor/common/JsonUtilTest.java | 2 +-
.../kafka/trogdor/common/MiniTrogdorCluster.java | 2 +-
.../kafka/trogdor/common/StringFormatterTest.java | 2 +-
.../trogdor/coordinator/CoordinatorClientTest.java | 2 +-
.../kafka/trogdor/coordinator/CoordinatorTest.java | 2 +-
.../kafka/trogdor/task/SampleTaskController.java | 2 +-
.../apache/kafka/trogdor/task/SampleTaskSpec.java | 2 +-
.../kafka/trogdor/task/SampleTaskWorker.java | 2 +-
.../apache/kafka/trogdor/task/TaskSpecTest.java | 2 +-
.../kafka/trogdor/workload/HistogramTest.java | 2 +-
.../kafka/trogdor/workload/ThrottleTest.java | 2 +-
42 files changed, 83 insertions(+), 86 deletions(-)
diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigOp.java b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigOp.java
index 1131e12dd5c..d2d2889a24b 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigOp.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigOp.java
@@ -86,11 +86,11 @@ public class AlterConfigOp {
public ConfigEntry configEntry() {
return configEntry;
- };
+ }
public OpType opType() {
return opType;
- };
+ }
@Override
public boolean equals(final Object o) {
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 ebd2b539342..7fce78b9a6e 100644
--- a/clients/src/main/java/org/apache/kafka/common/ConsumerGroupState.java
+++ b/clients/src/main/java/org/apache/kafka/common/ConsumerGroupState.java
@@ -34,7 +34,7 @@ public enum ConsumerGroupState {
EMPTY("Empty");
private final static Map<String, ConsumerGroupState> NAME_TO_ENUM = Arrays.stream(values())
- .collect(Collectors.toMap(state -> state.name, Function.identity()));;
+ .collect(Collectors.toMap(state -> state.name, Function.identity()));
private final String name;
diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/CredentialCache.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/CredentialCache.java
index ecf3ea9d4a6..b1513deb540 100644
--- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/CredentialCache.java
+++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/CredentialCache.java
@@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class CredentialCache {
- private final ConcurrentHashMap<String, Cache<? extends Object>> cacheMap = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<String, Cache<?>> cacheMap = new ConcurrentHashMap<>();
public <C> Cache<C> createCache(String mechanism, Class<C> credentialClass) {
Cache<C> cache = new Cache<>(credentialClass);
diff --git a/clients/src/main/java/org/apache/kafka/common/utils/MappedIterator.java b/clients/src/main/java/org/apache/kafka/common/utils/MappedIterator.java
index f6eb270c56a..b03610d128e 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/MappedIterator.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/MappedIterator.java
@@ -32,12 +32,12 @@ public final class MappedIterator<F, T> implements Iterator<T> {
}
@Override
- public final boolean hasNext() {
+ public boolean hasNext() {
return underlyingIterator.hasNext();
}
@Override
- public final T next() {
+ public T next() {
return mapper.apply(underlyingIterator.next());
}
diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/Crypto.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/Crypto.java
index a29bfd6619b..226348ac3b8 100644
--- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/Crypto.java
+++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/Crypto.java
@@ -64,6 +64,6 @@ public interface Crypto {
public KeyGenerator keyGenerator(String algorithm) throws NoSuchAlgorithmException {
return KeyGenerator.getInstance(algorithm);
}
- };
+ }
}
diff --git a/generator/src/main/java/org/apache/kafka/message/MessageSpecType.java b/generator/src/main/java/org/apache/kafka/message/MessageSpecType.java
index d1110d9e07e..a7e7b5e7bd4 100644
--- a/generator/src/main/java/org/apache/kafka/message/MessageSpecType.java
+++ b/generator/src/main/java/org/apache/kafka/message/MessageSpecType.java
@@ -48,5 +48,5 @@ public enum MessageSpecType {
* Other message spec types.
*/
@JsonProperty("data")
- DATA;
+ DATA
}
diff --git a/generator/src/main/java/org/apache/kafka/message/RequestListenerType.java b/generator/src/main/java/org/apache/kafka/message/RequestListenerType.java
index cefd40db6ec..729da21f4c4 100644
--- a/generator/src/main/java/org/apache/kafka/message/RequestListenerType.java
+++ b/generator/src/main/java/org/apache/kafka/message/RequestListenerType.java
@@ -26,5 +26,5 @@ public enum RequestListenerType {
BROKER,
@JsonProperty("controller")
- CONTROLLER;
+ CONTROLLER
}
diff --git a/metadata/src/main/java/org/apache/kafka/metadata/KafkaConfigSchema.java b/metadata/src/main/java/org/apache/kafka/metadata/KafkaConfigSchema.java
index 8b770ff66c5..f7b7b0ed375 100644
--- a/metadata/src/main/java/org/apache/kafka/metadata/KafkaConfigSchema.java
+++ b/metadata/src/main/java/org/apache/kafka/metadata/KafkaConfigSchema.java
@@ -159,10 +159,10 @@ public class KafkaConfigSchema {
}
public Map<String, ConfigEntry> resolveEffectiveTopicConfigs(
- Map<String, ? extends Object> staticNodeConfig,
- Map<String, ? extends Object> dynamicClusterConfigs,
- Map<String, ? extends Object> dynamicNodeConfigs,
- Map<String, ? extends Object> dynamicTopicConfigs) {
+ Map<String, ?> staticNodeConfig,
+ Map<String, ?> dynamicClusterConfigs,
+ Map<String, ?> dynamicNodeConfigs,
+ Map<String, ?> dynamicTopicConfigs) {
ConfigDef configDef = configDefs.getOrDefault(ConfigResource.Type.TOPIC, EMPTY_CONFIG_DEF);
HashMap<String, ConfigEntry> effectiveConfigs = new HashMap<>();
for (ConfigDef.ConfigKey configKey : configDef.configKeys().values()) {
@@ -174,10 +174,10 @@ public class KafkaConfigSchema {
}
private ConfigEntry resolveEffectiveTopicConfig(ConfigDef.ConfigKey configKey,
- Map<String, ? extends Object> staticNodeConfig,
- Map<String, ? extends Object> dynamicClusterConfigs,
- Map<String, ? extends Object> dynamicNodeConfigs,
- Map<String, ? extends Object> dynamicTopicConfigs) {
+ Map<String, ?> staticNodeConfig,
+ Map<String, ?> dynamicClusterConfigs,
+ Map<String, ?> dynamicNodeConfigs,
+ Map<String, ?> dynamicTopicConfigs) {
if (dynamicTopicConfigs.containsKey(configKey.name)) {
return toConfigEntry(configKey,
dynamicTopicConfigs.get(configKey.name),
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 277cb46ed7d..db423340967 100644
--- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
+++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
@@ -160,7 +160,7 @@ public class QuorumControllerTest {
setControllerBuilderInitializer(controllerBuilder -> {
controllerBuilder.setConfigSchema(SCHEMA);
}).
- build();
+ build()
) {
controlEnv.activeController().registerBroker(ANONYMOUS_CONTEXT,
new BrokerRegistrationRequestData().
@@ -201,7 +201,7 @@ public class QuorumControllerTest {
setControllerBuilderInitializer(controllerBuilder -> {
controllerBuilder.setConfigSchema(SCHEMA);
}).
- build();
+ build()
) {
controlEnv.activeController().registerBroker(ANONYMOUS_CONTEXT,
new BrokerRegistrationRequestData().
@@ -247,7 +247,7 @@ public class QuorumControllerTest {
}).
setSessionTimeoutMillis(OptionalLong.of(sessionTimeoutMillis)).
setBootstrapMetadata(SIMPLE_BOOTSTRAP).
- build();
+ build()
) {
ListenerCollection listeners = new ListenerCollection();
listeners.add(new Listener().setName("PLAINTEXT").setHost("localhost").setPort(9092));
@@ -346,7 +346,7 @@ public class QuorumControllerTest {
setSessionTimeoutMillis(OptionalLong.of(sessionTimeoutMillis)).
setLeaderImbalanceCheckIntervalNs(OptionalLong.of(leaderImbalanceCheckIntervalNs)).
setBootstrapMetadata(SIMPLE_BOOTSTRAP).
- build();
+ build()
) {
ListenerCollection listeners = new ListenerCollection();
listeners.add(new Listener().setName("PLAINTEXT").setHost("localhost").setPort(9092));
@@ -479,7 +479,7 @@ public class QuorumControllerTest {
controllerBuilder.setConfigSchema(SCHEMA);
controllerBuilder.setMaxIdleIntervalNs(OptionalLong.of(maxIdleIntervalNs));
}).
- build();
+ build()
) {
ListenerCollection listeners = new ListenerCollection();
listeners.add(new Listener().setName("PLAINTEXT").setHost("localhost").setPort(9092));
@@ -524,7 +524,7 @@ public class QuorumControllerTest {
setControllerBuilderInitializer(controllerBuilder -> {
controllerBuilder.setConfigSchema(SCHEMA);
}).
- build();
+ build()
) {
ListenerCollection listeners = new ListenerCollection();
listeners.add(new Listener().setName("PLAINTEXT").
@@ -621,7 +621,7 @@ public class QuorumControllerTest {
controllerBuilder.setConfigSchema(SCHEMA);
}).
setBootstrapMetadata(SIMPLE_BOOTSTRAP).
- build();
+ build()
) {
QuorumController active = controlEnv.activeController();
for (int i = 0; i < numBrokers; i++) {
@@ -748,7 +748,7 @@ public class QuorumControllerTest {
setControllerBuilderInitializer(controllerBuilder -> {
controllerBuilder.setConfigSchema(SCHEMA);
}).
- build();
+ build()
) {
QuorumController controller = controlEnv.activeController();
CountDownLatch countDownLatch = controller.pause();
@@ -812,7 +812,7 @@ public class QuorumControllerTest {
setControllerBuilderInitializer(controllerBuilder -> {
controllerBuilder.setConfigSchema(SCHEMA);
}).
- build();
+ build()
) {
QuorumController controller = controlEnv.activeController();
CountDownLatch countDownLatch = controller.pause();
@@ -857,7 +857,7 @@ public class QuorumControllerTest {
setControllerBuilderInitializer(controllerBuilder -> {
controllerBuilder.setConfigSchema(SCHEMA);
}).
- build();
+ build()
) {
QuorumController controller = controlEnv.activeController();
@@ -1014,7 +1014,7 @@ public class QuorumControllerTest {
setControllerBuilderInitializer(controllerBuilder -> {
controllerBuilder.setConfigSchema(SCHEMA);
}).
- build();
+ build()
) {
QuorumController active = controlEnv.activeController();
registerBrokers(active, 5);
@@ -1095,7 +1095,7 @@ public class QuorumControllerTest {
LocalLogManagerTestEnv logEnv = new LocalLogManagerTestEnv.Builder(3).
build();
QuorumControllerTestEnv controlEnv = new QuorumControllerTestEnv.Builder(logEnv).
- build();
+ build()
) {
QuorumController active = controlEnv.activeController();
CompletableFuture<Void> future = active.appendWriteEvent("errorEvent",
@@ -1227,7 +1227,7 @@ public class QuorumControllerTest {
controllerBuilder.setConfigSchema(SCHEMA);
}).
setBootstrapMetadata(COMPLEX_BOOTSTRAP).
- build();
+ build()
) {
QuorumController active = controlEnv.activeController();
TestUtils.waitForCondition(() ->
@@ -1250,7 +1250,7 @@ public class QuorumControllerTest {
controllerBuilder.setConfigSchema(SCHEMA);
}).
setBootstrapMetadata(COMPLEX_BOOTSTRAP).
- build();
+ build()
) {
QuorumController active = controlEnv.activeController();
diff --git a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTest.java b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTest.java
index 066ca4e000d..4e6b29fd6de 100644
--- a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTest.java
+++ b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTest.java
@@ -45,7 +45,7 @@ public class LocalLogManagerTest {
public void testCreateAndClose() throws Exception {
try (
LocalLogManagerTestEnv env = new LocalLogManagerTestEnv.Builder(1).
- buildWithMockListeners();
+ buildWithMockListeners()
) {
env.close();
assertEquals(null, env.firstError.get());
@@ -59,7 +59,7 @@ public class LocalLogManagerTest {
public void testClaimsLeadership() throws Exception {
try (
LocalLogManagerTestEnv env = new LocalLogManagerTestEnv.Builder(1).
- buildWithMockListeners();
+ buildWithMockListeners()
) {
assertEquals(new LeaderAndEpoch(OptionalInt.of(0), 1), env.waitForLeader());
env.close();
@@ -74,7 +74,7 @@ public class LocalLogManagerTest {
public void testPassLeadership() throws Exception {
try (
LocalLogManagerTestEnv env = new LocalLogManagerTestEnv.Builder(3).
- buildWithMockListeners();
+ buildWithMockListeners()
) {
LeaderAndEpoch first = env.waitForLeader();
LeaderAndEpoch cur = first;
@@ -130,7 +130,7 @@ public class LocalLogManagerTest {
public void testCommits() throws Exception {
try (
LocalLogManagerTestEnv env = new LocalLogManagerTestEnv.Builder(3).
- buildWithMockListeners();
+ buildWithMockListeners()
) {
LeaderAndEpoch leaderInfo = env.waitForLeader();
int leaderId = leaderInfo.leaderId().orElseThrow(() ->
diff --git a/server-common/src/main/java/org/apache/kafka/timeline/TimelineHashMap.java b/server-common/src/main/java/org/apache/kafka/timeline/TimelineHashMap.java
index 855e7ed71d3..857ff87cdce 100644
--- a/server-common/src/main/java/org/apache/kafka/timeline/TimelineHashMap.java
+++ b/server-common/src/main/java/org/apache/kafka/timeline/TimelineHashMap.java
@@ -189,26 +189,26 @@ public class TimelineHashMap<K, V>
this.epoch = epoch;
}
- public final int size() {
+ public int size() {
return TimelineHashMap.this.size(epoch);
}
- public final void clear() {
+ public void clear() {
if (epoch != SnapshottableHashTable.LATEST_EPOCH) {
throw new RuntimeException("can't modify snapshot");
}
TimelineHashMap.this.clear();
}
- public final Iterator<K> iterator() {
+ public Iterator<K> iterator() {
return new KeyIterator(epoch);
}
- public final boolean contains(Object o) {
+ public boolean contains(Object o) {
return TimelineHashMap.this.containsKey(o, epoch);
}
- public final boolean remove(Object o) {
+ public boolean remove(Object o) {
if (epoch != SnapshottableHashTable.LATEST_EPOCH) {
throw new RuntimeException("can't modify snapshot");
}
@@ -256,22 +256,22 @@ public class TimelineHashMap<K, V>
this.epoch = epoch;
}
- public final int size() {
+ public int size() {
return TimelineHashMap.this.size(epoch);
}
- public final void clear() {
+ public void clear() {
if (epoch != SnapshottableHashTable.LATEST_EPOCH) {
throw new RuntimeException("can't modify snapshot");
}
TimelineHashMap.this.clear();
}
- public final Iterator<V> iterator() {
+ public Iterator<V> iterator() {
return new ValueIterator(epoch);
}
- public final boolean contains(Object o) {
+ public boolean contains(Object o) {
return TimelineHashMap.this.containsKey(o, epoch);
}
}
@@ -316,26 +316,26 @@ public class TimelineHashMap<K, V>
this.epoch = epoch;
}
- public final int size() {
+ public int size() {
return TimelineHashMap.this.size(epoch);
}
- public final void clear() {
+ public void clear() {
if (epoch != SnapshottableHashTable.LATEST_EPOCH) {
throw new RuntimeException("can't modify snapshot");
}
TimelineHashMap.this.clear();
}
- public final Iterator<Map.Entry<K, V>> iterator() {
+ public Iterator<Map.Entry<K, V>> iterator() {
return new EntryIterator(epoch);
}
- public final boolean contains(Object o) {
+ public boolean contains(Object o) {
return snapshottableGet(o, epoch) != null;
}
- public final boolean remove(Object o) {
+ public boolean remove(Object o) {
if (epoch != SnapshottableHashTable.LATEST_EPOCH) {
throw new RuntimeException("can't modify snapshot");
}
diff --git a/server-common/src/test/java/org/apache/kafka/timeline/SnapshottableHashTableTest.java b/server-common/src/test/java/org/apache/kafka/timeline/SnapshottableHashTableTest.java
index 93e6b127ab3..cbe413d6b54 100644
--- a/server-common/src/test/java/org/apache/kafka/timeline/SnapshottableHashTableTest.java
+++ b/server-common/src/test/java/org/apache/kafka/timeline/SnapshottableHashTableTest.java
@@ -251,7 +251,7 @@ public class SnapshottableHashTableTest {
* Assert that the given iterator contains the given elements, in any order.
* We compare using reference equality here, rather than object equality.
*/
- private static void assertIteratorYields(Iterator<? extends Object> iter,
+ private static void assertIteratorYields(Iterator<?> iter,
Object... expected) {
IdentityHashMap<Object, Boolean> remaining = new IdentityHashMap<>();
for (Object object : expected) {
diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/AppendOrigin.java b/storage/src/main/java/org/apache/kafka/server/log/internals/AppendOrigin.java
index aba8faa89fd..e03a74ee994 100644
--- a/storage/src/main/java/org/apache/kafka/server/log/internals/AppendOrigin.java
+++ b/storage/src/main/java/org/apache/kafka/server/log/internals/AppendOrigin.java
@@ -41,5 +41,5 @@ public enum AppendOrigin {
/**
* The log append come from the raft leader, which implies the offsets has been assigned
*/
- RAFT_LEADER;
+ RAFT_LEADER
}
diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/IndexSearchType.java b/storage/src/main/java/org/apache/kafka/server/log/internals/IndexSearchType.java
index 2a6536466de..67c20c8f15a 100644
--- a/storage/src/main/java/org/apache/kafka/server/log/internals/IndexSearchType.java
+++ b/storage/src/main/java/org/apache/kafka/server/log/internals/IndexSearchType.java
@@ -17,5 +17,5 @@
package org.apache.kafka.server.log.internals;
public enum IndexSearchType {
- KEY, VALUE;
+ KEY, VALUE
}
diff --git a/storage/src/main/java/org/apache/kafka/server/log/internals/LazyIndex.java b/storage/src/main/java/org/apache/kafka/server/log/internals/LazyIndex.java
index 220ab6464dc..9b3db1d863d 100644
--- a/storage/src/main/java/org/apache/kafka/server/log/internals/LazyIndex.java
+++ b/storage/src/main/java/org/apache/kafka/server/log/internals/LazyIndex.java
@@ -44,7 +44,7 @@ import org.apache.kafka.common.utils.Utils;
public class LazyIndex<T extends AbstractIndex> {
private enum IndexType {
- OFFSET, TIME;
+ OFFSET, TIME
}
private interface IndexWrapper extends Closeable {
diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java
index 8272b8deee2..cecf23c9f8d 100644
--- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java
+++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java
@@ -498,13 +498,12 @@ public class RemoteLogSegmentLifecycleTest {
}
@Override
- public Optional<Long> highestOffsetForEpoch(int epoch) throws RemoteStorageException {
+ public Optional<Long> highestOffsetForEpoch(int epoch) {
return metadataCache.highestOffsetForEpoch(epoch);
}
@Override
- public Optional<RemoteLogSegmentMetadata> remoteLogSegmentMetadata(int leaderEpoch,
- long offset) throws RemoteStorageException {
+ public Optional<RemoteLogSegmentMetadata> remoteLogSegmentMetadata(int leaderEpoch, long offset) {
return metadataCache.remoteLogSegmentMetadata(leaderEpoch, offset);
}
@@ -519,7 +518,7 @@ public class RemoteLogSegmentLifecycleTest {
}
@Override
- public void addRemoteLogSegmentMetadata(RemoteLogSegmentMetadata segmentMetadata) throws RemoteStorageException {
+ public void addRemoteLogSegmentMetadata(RemoteLogSegmentMetadata segmentMetadata) {
metadataCache.addCopyInProgressSegment(segmentMetadata);
}
}
diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/InmemoryRemoteLogMetadataManager.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/InmemoryRemoteLogMetadataManager.java
index cac37ae2caa..a970de509ad 100644
--- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/InmemoryRemoteLogMetadataManager.java
+++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/InmemoryRemoteLogMetadataManager.java
@@ -49,8 +49,7 @@ public class InmemoryRemoteLogMetadataManager implements RemoteLogMetadataManage
}
@Override
- public CompletableFuture<Void> addRemoteLogSegmentMetadata(RemoteLogSegmentMetadata remoteLogSegmentMetadata)
- throws RemoteStorageException {
+ public CompletableFuture<Void> addRemoteLogSegmentMetadata(RemoteLogSegmentMetadata remoteLogSegmentMetadata) {
log.debug("Adding remote log segment : [{}]", remoteLogSegmentMetadata);
Objects.requireNonNull(remoteLogSegmentMetadata, "remoteLogSegmentMetadata can not be null");
@@ -104,8 +103,7 @@ public class InmemoryRemoteLogMetadataManager implements RemoteLogMetadataManage
}
@Override
- public CompletableFuture<Void> putRemotePartitionDeleteMetadata(RemotePartitionDeleteMetadata remotePartitionDeleteMetadata)
- throws RemoteStorageException {
+ public CompletableFuture<Void> putRemotePartitionDeleteMetadata(RemotePartitionDeleteMetadata remotePartitionDeleteMetadata) {
log.debug("Adding delete state with: [{}]", remotePartitionDeleteMetadata);
Objects.requireNonNull(remotePartitionDeleteMetadata, "remotePartitionDeleteMetadata can not be null");
diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/InmemoryRemoteStorageManager.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/InmemoryRemoteStorageManager.java
index 9e5c3bea25a..c9541f66fec 100644
--- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/InmemoryRemoteStorageManager.java
+++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/InmemoryRemoteStorageManager.java
@@ -153,7 +153,7 @@ public class InmemoryRemoteStorageManager implements RemoteStorageManager {
}
@Override
- public void deleteLogSegmentData(RemoteLogSegmentMetadata remoteLogSegmentMetadata) throws RemoteStorageException {
+ public void deleteLogSegmentData(RemoteLogSegmentMetadata remoteLogSegmentMetadata) {
log.info("Deleting log segment for: [{}]", remoteLogSegmentMetadata);
Objects.requireNonNull(remoteLogSegmentMetadata, "remoteLogSegmentMetadata can not be null");
String segmentKey = generateKeyForSegment(remoteLogSegmentMetadata);
diff --git a/streams/src/main/java/org/apache/kafka/streams/query/FailureReason.java b/streams/src/main/java/org/apache/kafka/streams/query/FailureReason.java
index 6f4dc67c85b..4e72edefd4a 100644
--- a/streams/src/main/java/org/apache/kafka/streams/query/FailureReason.java
+++ b/streams/src/main/java/org/apache/kafka/streams/query/FailureReason.java
@@ -66,5 +66,5 @@ public enum FailureReason {
* will contain the exception details. Depending on the nature of the exception, the caller
* may be able to retry this instance or may need to try a different instance.
*/
- STORE_EXCEPTION;
+ STORE_EXCEPTION
}
\ No newline at end of file
diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java
index 746de14f217..581baa59482 100644
--- a/streams/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/integration/KTableEfficientRangeQueryTest.java
@@ -64,7 +64,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
public class KTableEfficientRangeQueryTest {
@Rule
public Timeout globalTimeout = Timeout.seconds(600);
- private enum StoreType { InMemory, RocksDB, Timed };
+ private enum StoreType { InMemory, RocksDB, Timed }
private static final String TABLE_NAME = "mytable";
private static final int DATA_SIZE = 5;
diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java
index acb7f0da073..33ca736cc90 100644
--- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorStateManagerTest.java
@@ -1163,7 +1163,7 @@ public class ProcessorStateManagerTest {
public void onCommit() throws IOException {
StoreQueryUtils.checkpointPosition(checkpointFile, position);
}
- };
+ }
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java
index fbb6e00040f..e4c63f06acd 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreFetchTest.java
@@ -67,7 +67,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
@RunWith(Parameterized.class)
public class SessionStoreFetchTest {
- private enum StoreType { InMemory, RocksDB };
+ private enum StoreType { InMemory, RocksDB }
private static final String STORE_NAME = "store";
private static final int DATA_SIZE = 5;
private static final long WINDOW_SIZE = 500L;
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java
index a429256ad9f..e4e4a82ba7c 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/WindowStoreFetchTest.java
@@ -68,7 +68,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
@RunWith(Parameterized.class)
public class WindowStoreFetchTest {
- private enum StoreType { InMemory, RocksDB, Timed };
+ private enum StoreType { InMemory, RocksDB, Timed }
private static final String STORE_NAME = "store";
private static final int DATA_SIZE = 5;
private static final long WINDOW_SIZE = 500L;
diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/Coordinator.java b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/Coordinator.java
index 47f80e5c7a1..dcb838b4e0a 100644
--- a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/Coordinator.java
+++ b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/Coordinator.java
@@ -182,4 +182,4 @@ public final class Coordinator {
});
coordinator.waitForShutdown();
}
-};
+}
diff --git a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java
index 9dc379cde00..df6273919a3 100644
--- a/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java
+++ b/trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/NodeManager.java
@@ -384,4 +384,4 @@ public final class NodeManager {
public void waitForShutdown() throws InterruptedException {
executor.awaitTermination(1, TimeUnit.DAYS);
}
-};
+}
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 a307e595a87..9ee8a6ad7a0 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
@@ -704,4 +704,4 @@ public final class TaskManager {
return null;
}
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java
index 76c39b463ba..3b96b9917a2 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java
@@ -487,4 +487,4 @@ public class AgentTest {
agent.waitForShutdown();
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java
index 3ed413dc873..89ac1f3aa0c 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/basic/BasicPlatformTest.java
@@ -63,4 +63,4 @@ public class BasicPlatformTest {
Files.delete(configFile.toPath());
}
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/CapturingCommandRunner.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/CapturingCommandRunner.java
index 2e5a6605729..2f5294c6cc4 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/CapturingCommandRunner.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/CapturingCommandRunner.java
@@ -57,4 +57,4 @@ public class CapturingCommandRunner implements BasicPlatform.CommandRunner {
public synchronized List<String> lines(String nodeName) {
return new ArrayList<String>(getOrCreate(nodeName));
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java
index 3eb781c4f7f..db468f0eae8 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/ExpectedTasks.java
@@ -203,4 +203,4 @@ public class ExpectedTasks {
}, "Timed out waiting for expected workers " + JsonUtil.toJsonString(expected));
return this;
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonSerializationTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonSerializationTest.java
index 8e53516a119..2361e404c5b 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonSerializationTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonSerializationTest.java
@@ -79,4 +79,4 @@ public class JsonSerializationTest {
field.setAccessible(wasAccessible);
}
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java
index 9e5c44a3c59..138f71b1e9f 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/JsonUtilTest.java
@@ -67,4 +67,4 @@ public class JsonUtilTest {
Files.delete(tempFile.toPath());
}
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java
index 51eb8cb37ed..59caa08066d 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java
@@ -289,4 +289,4 @@ public class MiniTrogdorCluster implements AutoCloseable {
coordinator.waitForShutdown();
}
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/common/StringFormatterTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/common/StringFormatterTest.java
index 98add187ab5..16364244459 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/common/StringFormatterTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/common/StringFormatterTest.java
@@ -61,4 +61,4 @@ public class StringFormatterTest {
Arrays.asList("lion", "1", "12345"),
Arrays.asList("manatee", "50", "1"))));
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorClientTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorClientTest.java
index 30bdb4fe906..f3be050d963 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorClientTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorClientTest.java
@@ -75,4 +75,4 @@ public class CoordinatorClientTest {
true,
JsonNodeFactory.instance.objectNode()), ZoneOffset.UTC));
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java
index b77b2b00074..2ccad989aad 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java
@@ -716,4 +716,4 @@ public class CoordinatorTest {
waitFor(coordinatorClient);
}
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskController.java b/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskController.java
index 2640c3925a7..24c6facd5c9 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskController.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskController.java
@@ -26,4 +26,4 @@ public class SampleTaskController implements TaskController {
public Set<String> targetNodes(Topology topology) {
return Topology.Util.agentNodeNames(topology);
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskSpec.java b/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskSpec.java
index 38a160fba21..10776707e5e 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskSpec.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskSpec.java
@@ -58,4 +58,4 @@ public class SampleTaskSpec extends TaskSpec {
public TaskWorker newTaskWorker(String id) {
return new SampleTaskWorker(this);
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskWorker.java b/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskWorker.java
index 06339d2ae4e..0b2713a2229 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskWorker.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/task/SampleTaskWorker.java
@@ -65,4 +65,4 @@ public class SampleTaskWorker implements TaskWorker {
this.executor.awaitTermination(1, TimeUnit.DAYS);
this.status.update(new TextNode("halted"));
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/task/TaskSpecTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/task/TaskSpecTest.java
index f49c50a84d8..a98b8478534 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/task/TaskSpecTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/task/TaskSpecTest.java
@@ -45,4 +45,4 @@ public class TaskSpecTest {
String outputJson = JsonUtil.toJsonString(spec);
assertEquals(inputJson, outputJson);
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/HistogramTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/HistogramTest.java
index 47d37746687..1afaf7587d0 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/HistogramTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/HistogramTest.java
@@ -82,5 +82,5 @@ public class HistogramTest {
assertEquals(100, summary.percentiles().get(1).value());
assertEquals(200, summary.percentiles().get(2).value());
}
-};
+}
diff --git a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ThrottleTest.java b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ThrottleTest.java
index 4eb5322196a..05a65423399 100644
--- a/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ThrottleTest.java
+++ b/trogdor/src/test/java/org/apache/kafka/trogdor/workload/ThrottleTest.java
@@ -69,5 +69,5 @@ public class ThrottleTest {
assertTrue(throttle.increment());
assertEquals(200, time.milliseconds());
}
-};
+}