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 2024/04/17 19:56:05 UTC
(kafka) branch trunk updated: MINOR: Remove unneeded explicit type arguments (#15736)
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 aee9724ee15 MINOR: Remove unneeded explicit type arguments (#15736)
aee9724ee15 is described below
commit aee9724ee15ed539ae73c09cc2c2eda83ae3c864
Author: Mickael Maison <mi...@users.noreply.github.com>
AuthorDate: Wed Apr 17 21:55:58 2024 +0200
MINOR: Remove unneeded explicit type arguments (#15736)
Reviewers: Chia-Ping Tsai <ch...@gmail.com>
---
.../org/apache/kafka/common/network/Selector.java | 6 +++---
.../admin/internals/AdminMetadataManagerTest.java | 5 ++---
.../clients/consumer/RoundRobinAssignorTest.java | 2 +-
.../connect/runtime/isolation/PluginUtilsTest.java | 4 ++--
.../kafka/connect/transforms/FlattenTest.java | 22 +++++++++++-----------
.../connect/transforms/TimestampConverterTest.java | 2 +-
.../RelaxedNullKeyRequirementJoinTest.java | 2 +-
.../internals/WindowedStreamPartitionerTest.java | 2 +-
.../processor/internals/PartitionGrouperTest.java | 4 ++--
.../processor/internals/RecordCollectorTest.java | 2 +-
.../state/internals/OffsetCheckpointTest.java | 4 ++--
.../state/internals/SessionStoreBuilderTest.java | 10 +++++-----
.../org/apache/kafka/test/MockProcessorNode.java | 2 +-
.../kafka/test/ReadOnlySessionStoreStub.java | 4 ++--
14 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/clients/src/main/java/org/apache/kafka/common/network/Selector.java b/clients/src/main/java/org/apache/kafka/common/network/Selector.java
index 0109c807784..fbf6e13803c 100644
--- a/clients/src/main/java/org/apache/kafka/common/network/Selector.java
+++ b/clients/src/main/java/org/apache/kafka/common/network/Selector.java
@@ -181,7 +181,7 @@ public class Selector implements Selectable, AutoCloseable {
this.memoryPool = memoryPool;
this.lowMemThreshold = (long) (0.1 * this.memoryPool.size());
this.failedAuthenticationDelayMs = failedAuthenticationDelayMs;
- this.delayedClosingChannels = (failedAuthenticationDelayMs > NO_FAILED_AUTHENTICATION_DELAY) ? new LinkedHashMap<String, DelayedAuthenticationFailureClose>() : null;
+ this.delayedClosingChannels = (failedAuthenticationDelayMs > NO_FAILED_AUTHENTICATION_DELAY) ? new LinkedHashMap<>() : null;
}
public Selector(int maxReceiveSize,
@@ -229,7 +229,7 @@ public class Selector implements Selectable, AutoCloseable {
}
public Selector(long connectionMaxIdleMS, int failedAuthenticationDelayMs, Metrics metrics, Time time, String metricGrpPrefix, ChannelBuilder channelBuilder, LogContext logContext) {
- this(NetworkReceive.UNLIMITED, connectionMaxIdleMS, failedAuthenticationDelayMs, metrics, time, metricGrpPrefix, Collections.<String, String>emptyMap(), true, channelBuilder, logContext);
+ this(NetworkReceive.UNLIMITED, connectionMaxIdleMS, failedAuthenticationDelayMs, metrics, time, metricGrpPrefix, Collections.emptyMap(), true, channelBuilder, logContext);
}
/**
@@ -1281,7 +1281,7 @@ public class Selector implements Selectable, AutoCloseable {
/**
* This method generates `time-total` metrics but has a couple of deficiencies: no `-ns` suffix and no dash between basename
- * and `time-toal` suffix.
+ * and `time-total` suffix.
* @deprecated use {{@link #createIOThreadRatioMeter(Metrics, String, Map, String, String)}} for new metrics instead
*/
@Deprecated
diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java
index d5711df1c71..1e23e0148ad 100644
--- a/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/admin/internals/AdminMetadataManagerTest.java
@@ -19,7 +19,6 @@ package org.apache.kafka.clients.admin.internals;
import org.apache.kafka.common.Cluster;
import org.apache.kafka.common.Node;
-import org.apache.kafka.common.PartitionInfo;
import org.apache.kafka.common.errors.AuthenticationException;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
@@ -104,8 +103,8 @@ public class AdminMetadataManagerTest {
nodes.put(1, new Node(1, "localhost", 8122));
nodes.put(2, new Node(2, "localhost", 8123));
return new Cluster("mockClusterId", nodes.values(),
- Collections.<PartitionInfo>emptySet(), Collections.<String>emptySet(),
- Collections.<String>emptySet(), nodes.get(0));
+ Collections.emptySet(), Collections.emptySet(),
+ Collections.emptySet(), nodes.get(0));
}
}
diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/RoundRobinAssignorTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/RoundRobinAssignorTest.java
index 256491b9d7a..97cd2862e23 100644
--- a/clients/src/test/java/org/apache/kafka/clients/consumer/RoundRobinAssignorTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/consumer/RoundRobinAssignorTest.java
@@ -109,7 +109,7 @@ public class RoundRobinAssignorTest {
Map<String, List<TopicPartition>> assignment = assignor.assign(partitionsPerTopic, consumers);
assertEquals(partitions(tp(topic, 0)), assignment.get(consumer1));
- assertEquals(Collections.<TopicPartition>emptyList(), assignment.get(consumer2));
+ assertEquals(Collections.emptyList(), assignment.get(consumer2));
}
@Test
diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/PluginUtilsTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/PluginUtilsTest.java
index 524c419f5c5..f5dc83e6a89 100644
--- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/PluginUtilsTest.java
+++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/PluginUtilsTest.java
@@ -388,13 +388,13 @@ public class PluginUtilsTest {
@Test
public void testEmptyPluginUrls() throws Exception {
- assertEquals(Collections.<Path>emptyList(), PluginUtils.pluginUrls(pluginPath));
+ assertEquals(Collections.emptyList(), PluginUtils.pluginUrls(pluginPath));
}
@Test
public void testEmptyStructurePluginUrls() throws Exception {
createBasicDirectoryLayout();
- assertEquals(Collections.<Path>emptyList(), PluginUtils.pluginUrls(pluginPath));
+ assertEquals(Collections.emptyList(), PluginUtils.pluginUrls(pluginPath));
}
@Test
diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/FlattenTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/FlattenTest.java
index 1017518efab..c418ba427c9 100644
--- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/FlattenTest.java
+++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/FlattenTest.java
@@ -51,21 +51,21 @@ public class FlattenTest {
@Test
public void topLevelStructRequired() {
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
assertThrows(DataException.class, () -> xformValue.apply(new SourceRecord(null, null,
"topic", 0, Schema.INT32_SCHEMA, 42)));
}
@Test
public void topLevelMapRequired() {
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
assertThrows(DataException.class, () -> xformValue.apply(new SourceRecord(null, null,
"topic", 0, null, 42)));
}
@Test
public void testNestedStruct() {
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
SchemaBuilder builder = SchemaBuilder.struct();
builder.field("int8", Schema.INT8_SCHEMA);
@@ -162,7 +162,7 @@ public class FlattenTest {
@Test
public void testOptionalFieldStruct() {
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
SchemaBuilder builder = SchemaBuilder.struct();
builder.field("opt_int32", Schema.OPTIONAL_INT32_SCHEMA);
@@ -189,7 +189,7 @@ public class FlattenTest {
@Test
public void testOptionalStruct() {
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
SchemaBuilder builder = SchemaBuilder.struct().optional();
builder.field("opt_int32", Schema.OPTIONAL_INT32_SCHEMA);
@@ -205,7 +205,7 @@ public class FlattenTest {
@Test
public void testOptionalNestedStruct() {
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
SchemaBuilder builder = SchemaBuilder.struct().optional();
builder.field("opt_int32", Schema.OPTIONAL_INT32_SCHEMA);
@@ -229,7 +229,7 @@ public class FlattenTest {
@Test
public void testOptionalFieldMap() {
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
Map<String, Object> supportedTypes = new HashMap<>();
supportedTypes.put("opt_int32", null);
@@ -250,7 +250,7 @@ public class FlattenTest {
@Test
public void testKey() {
- xformKey.configure(Collections.<String, String>emptyMap());
+ xformKey.configure(Collections.emptyMap());
Map<String, Map<String, Integer>> key = Collections.singletonMap("A", Collections.singletonMap("B", 12));
SourceRecord src = new SourceRecord(null, null, "topic", null, key, null, null);
@@ -295,7 +295,7 @@ public class FlattenTest {
// children should also be optional. Similarly, if the parent Struct has a default value, the default value for
// the flattened field
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
SchemaBuilder builder = SchemaBuilder.struct().optional();
builder.field("req_field", Schema.STRING_SCHEMA);
@@ -324,7 +324,7 @@ public class FlattenTest {
@Test
public void tombstoneEventWithoutSchemaShouldPassThrough() {
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
final SourceRecord record = new SourceRecord(null, null, "test", 0,
null, null);
@@ -336,7 +336,7 @@ public class FlattenTest {
@Test
public void tombstoneEventWithSchemaShouldPassThrough() {
- xformValue.configure(Collections.<String, String>emptyMap());
+ xformValue.configure(Collections.emptyMap());
final Schema simpleStructSchema = SchemaBuilder.struct().name("name").version(1).doc("doc").field("magic", Schema.OPTIONAL_INT64_SCHEMA).build();
final SourceRecord record = new SourceRecord(null, null, "test", 0,
diff --git a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampConverterTest.java b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampConverterTest.java
index 3b47b8ba169..8b5611e9fbc 100644
--- a/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampConverterTest.java
+++ b/connect/transforms/src/test/java/org/apache/kafka/connect/transforms/TimestampConverterTest.java
@@ -97,7 +97,7 @@ public class TimestampConverterTest {
@Test
public void testConfigNoTargetType() {
- assertThrows(ConfigException.class, () -> xformValue.configure(Collections.<String, String>emptyMap()));
+ assertThrows(ConfigException.class, () -> xformValue.configure(Collections.emptyMap()));
}
@Test
diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/RelaxedNullKeyRequirementJoinTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/RelaxedNullKeyRequirementJoinTest.java
index 54da72208a4..a6ea2fba689 100644
--- a/streams/src/test/java/org/apache/kafka/streams/integration/RelaxedNullKeyRequirementJoinTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/integration/RelaxedNullKeyRequirementJoinTest.java
@@ -120,7 +120,7 @@ public class RelaxedNullKeyRequirementJoinTest {
.to(OUT);
initTopology();
left.pipeInput(null, "leftValue", 1);
- assertEquals(Collections.<KeyValue<String, String>>emptyList(), out.readKeyValuesToList());
+ assertEquals(Collections.emptyList(), out.readKeyValuesToList());
}
private void initTopology() {
diff --git a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/WindowedStreamPartitionerTest.java b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/WindowedStreamPartitionerTest.java
index 17ed8eac97a..dc87c1eacc0 100644
--- a/streams/src/test/java/org/apache/kafka/streams/kstream/internals/WindowedStreamPartitionerTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/kstream/internals/WindowedStreamPartitionerTest.java
@@ -49,7 +49,7 @@ public class WindowedStreamPartitionerTest {
);
private Cluster cluster = new Cluster("cluster", Collections.singletonList(Node.noNode()), infos,
- Collections.<String>emptySet(), Collections.<String>emptySet());
+ Collections.emptySet(), Collections.emptySet());
@Test
public void testCopartitioning() {
diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/PartitionGrouperTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/PartitionGrouperTest.java
index 93d2dced7b2..bb29f3347f7 100644
--- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/PartitionGrouperTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/PartitionGrouperTest.java
@@ -53,8 +53,8 @@ public class PartitionGrouperTest {
"cluster",
Collections.singletonList(Node.noNode()),
infos,
- Collections.<String>emptySet(),
- Collections.<String>emptySet());
+ Collections.emptySet(),
+ Collections.emptySet());
@Test
public void shouldComputeGroupingForTwoGroups() {
diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordCollectorTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordCollectorTest.java
index 60503c46895..e1c73d579ec 100644
--- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordCollectorTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/RecordCollectorTest.java
@@ -721,7 +721,7 @@ public class RecordCollectorTest {
collector.send(topic, "999", "0", null, 1, null, stringSerializer, stringSerializer, null, context);
collector.send(topic, "999", "0", null, 2, null, stringSerializer, stringSerializer, null, context);
- assertEquals(Collections.<TopicPartition, Long>emptyMap(), offsets);
+ assertEquals(Collections.emptyMap(), offsets);
collector.flush();
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java
index 9970a1bc8a7..090b091f21d 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/OffsetCheckpointTest.java
@@ -80,7 +80,7 @@ public class OffsetCheckpointTest {
assertFalse(f.exists());
- assertEquals(Collections.<TopicPartition, Long>emptyMap(), checkpoint.read());
+ assertEquals(Collections.emptyMap(), checkpoint.read());
// deleting a non-exist checkpoint file should be fine
checkpoint.delete();
@@ -101,7 +101,7 @@ public class OffsetCheckpointTest {
checkpoint.write(Collections.emptyMap());
assertThat(file.exists(), is(false));
- assertThat(Collections.<TopicPartition, Long>emptyMap(), is(checkpoint.read()));
+ assertThat(Collections.emptyMap(), is(checkpoint.read()));
}
@Test
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreBuilderTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreBuilderTest.java
index 543c8346202..fbeb7a78349 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreBuilderTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/SessionStoreBuilderTest.java
@@ -77,7 +77,7 @@ public class SessionStoreBuilderTest {
public void shouldNotHaveChangeLoggingStoreWhenDisabled() {
final SessionStore<String, String> store = builder.withLoggingDisabled().build();
final StateStore next = ((WrappedStateStore) store).wrapped();
- assertThat(next, CoreMatchers.<StateStore>equalTo(inner));
+ assertThat(next, CoreMatchers.equalTo(inner));
}
@Test
@@ -91,18 +91,18 @@ public class SessionStoreBuilderTest {
@Test
public void shouldHaveChangeLoggingStoreWhenLoggingEnabled() {
final SessionStore<String, String> store = builder
- .withLoggingEnabled(Collections.<String, String>emptyMap())
+ .withLoggingEnabled(Collections.emptyMap())
.build();
final StateStore wrapped = ((WrappedStateStore) store).wrapped();
assertThat(store, instanceOf(MeteredSessionStore.class));
assertThat(wrapped, instanceOf(ChangeLoggingSessionBytesStore.class));
- assertThat(((WrappedStateStore) wrapped).wrapped(), CoreMatchers.<StateStore>equalTo(inner));
+ assertThat(((WrappedStateStore) wrapped).wrapped(), CoreMatchers.equalTo(inner));
}
@Test
public void shouldHaveCachingAndChangeLoggingWhenBothEnabled() {
final SessionStore<String, String> store = builder
- .withLoggingEnabled(Collections.<String, String>emptyMap())
+ .withLoggingEnabled(Collections.emptyMap())
.withCachingEnabled()
.build();
final WrappedStateStore caching = (WrappedStateStore) ((WrappedStateStore) store).wrapped();
@@ -110,7 +110,7 @@ public class SessionStoreBuilderTest {
assertThat(store, instanceOf(MeteredSessionStore.class));
assertThat(caching, instanceOf(CachingSessionStore.class));
assertThat(changeLogging, instanceOf(ChangeLoggingSessionBytesStore.class));
- assertThat(changeLogging.wrapped(), CoreMatchers.<StateStore>equalTo(inner));
+ assertThat(changeLogging.wrapped(), CoreMatchers.equalTo(inner));
}
@Test
diff --git a/streams/src/test/java/org/apache/kafka/test/MockProcessorNode.java b/streams/src/test/java/org/apache/kafka/test/MockProcessorNode.java
index 908641a0e64..28b8f26bc93 100644
--- a/streams/src/test/java/org/apache/kafka/test/MockProcessorNode.java
+++ b/streams/src/test/java/org/apache/kafka/test/MockProcessorNode.java
@@ -47,7 +47,7 @@ public class MockProcessorNode<KIn, VIn, KOut, VOut> extends ProcessorNode<KIn,
}
private MockProcessorNode(final MockProcessor<KIn, VIn, KOut, VOut> mockProcessor) {
- super(NAME + INDEX.getAndIncrement(), mockProcessor, Collections.<String>emptySet());
+ super(NAME + INDEX.getAndIncrement(), mockProcessor, Collections.emptySet());
this.mockProcessor = mockProcessor;
}
diff --git a/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java b/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java
index dff3534fb7f..3bbefd898c7 100644
--- a/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java
+++ b/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java
@@ -74,7 +74,7 @@ public class ReadOnlySessionStoreStub<K, V> implements ReadOnlySessionStore<K, V
throw new InvalidStateStoreException("not open");
}
if (!sessions.containsKey(key)) {
- return new KeyValueIteratorStub<>(Collections.<KeyValue<Windowed<K>, V>>emptyIterator());
+ return new KeyValueIteratorStub<>(Collections.emptyIterator());
}
return new KeyValueIteratorStub<>(sessions.get(key).iterator());
}
@@ -99,7 +99,7 @@ public class ReadOnlySessionStoreStub<K, V> implements ReadOnlySessionStore<K, V
NavigableMap<K, List<KeyValue<Windowed<K>, V>>> subSessionsMap = getSubSessionsMap(keyFrom, keyTo);
if (subSessionsMap.isEmpty()) {
- return new KeyValueIteratorStub<>(Collections.<KeyValue<Windowed<K>, V>>emptyIterator());
+ return new KeyValueIteratorStub<>(Collections.emptyIterator());
}
final Iterator<List<KeyValue<Windowed<K>, V>>> keysIterator = subSessionsMap.values().iterator();
return new KeyValueIteratorStub<>(