Skip to content

Commit e974914

Browse files
sjhajhariasjhajharia
authored
MINOR: Code Cleanup - Connect Module (apache#16066)
Reviewers: Chia-Ping Tsai <[email protected]>
1 parent 33a292e commit e974914

32 files changed

+187
-191
lines changed

‎connect/api/src/main/java/org/apache/kafka/connect/data/SchemaBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public SchemaBuilder(Type type) {
8888

8989
@Override
9090
public boolean isOptional() {
91-
return optional == null ? false : optional;
91+
return optional != null && optional;
9292
}
9393

9494
/**

‎connect/api/src/test/java/org/apache/kafka/connect/connector/ConnectorReconfigurationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void testReconfigureStopException() {
4646

4747
private static class TestConnector extends Connector {
4848

49-
private boolean stopException;
49+
private final boolean stopException;
5050
private int order = 0;
5151
public int stopOrder = -1;
5252
public int configureOrder = -1;

‎connect/api/src/test/java/org/apache/kafka/connect/data/SchemaProjectorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void testNumericTypeProjection() {
8282
expectedProjected.put(values[2], Arrays.asList(32767, 32767L, 32767.F, 32767.));
8383
expectedProjected.put(values[3], Arrays.asList(327890L, 327890.F, 327890.));
8484
expectedProjected.put(values[4], Arrays.asList(1.2F, 1.2));
85-
expectedProjected.put(values[5], Arrays.asList(1.2345));
85+
expectedProjected.put(values[5], Collections.singletonList(1.2345));
8686

8787
Object promoted;
8888
for (int i = 0; i < promotableSchemas.length; ++i) {

‎connect/api/src/test/java/org/apache/kafka/connect/util/ConnectorUtilsTest.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,29 @@ public class ConnectorUtilsTest {
3333
public void testGroupPartitions() {
3434

3535
List<List<Integer>> grouped = ConnectorUtils.groupPartitions(FIVE_ELEMENTS, 1);
36-
assertEquals(Arrays.asList(FIVE_ELEMENTS), grouped);
36+
assertEquals(Collections.singletonList(FIVE_ELEMENTS), grouped);
3737

3838
grouped = ConnectorUtils.groupPartitions(FIVE_ELEMENTS, 2);
3939
assertEquals(Arrays.asList(Arrays.asList(1, 2, 3), Arrays.asList(4, 5)), grouped);
4040

4141
grouped = ConnectorUtils.groupPartitions(FIVE_ELEMENTS, 3);
4242
assertEquals(Arrays.asList(Arrays.asList(1, 2),
4343
Arrays.asList(3, 4),
44-
Arrays.asList(5)), grouped);
44+
Collections.singletonList(5)), grouped);
4545

4646
grouped = ConnectorUtils.groupPartitions(FIVE_ELEMENTS, 5);
47-
assertEquals(Arrays.asList(Arrays.asList(1),
48-
Arrays.asList(2),
49-
Arrays.asList(3),
50-
Arrays.asList(4),
51-
Arrays.asList(5)), grouped);
47+
assertEquals(Arrays.asList(Collections.singletonList(1),
48+
Collections.singletonList(2),
49+
Collections.singletonList(3),
50+
Collections.singletonList(4),
51+
Collections.singletonList(5)), grouped);
5252

5353
grouped = ConnectorUtils.groupPartitions(FIVE_ELEMENTS, 7);
54-
assertEquals(Arrays.asList(Arrays.asList(1),
55-
Arrays.asList(2),
56-
Arrays.asList(3),
57-
Arrays.asList(4),
58-
Arrays.asList(5),
54+
assertEquals(Arrays.asList(Collections.singletonList(1),
55+
Collections.singletonList(2),
56+
Collections.singletonList(3),
57+
Collections.singletonList(4),
58+
Collections.singletonList(5),
5959
Collections.emptyList(),
6060
Collections.emptyList()), grouped);
6161
}

‎connect/file/src/test/java/org/apache/kafka/connect/file/FileStreamSinkTaskTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.nio.file.Path;
3333
import java.nio.file.Paths;
3434
import java.util.Arrays;
35+
import java.util.Collections;
3536
import java.util.HashMap;
3637
import java.util.Map;
3738
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -60,7 +61,7 @@ public void testPutFlush() {
6061

6162
// We do not call task.start() since it would override the output stream
6263

63-
task.put(Arrays.asList(
64+
task.put(Collections.singletonList(
6465
new SinkRecord("topic1", 0, null, null, Schema.STRING_SCHEMA, "line1", 1)
6566
));
6667
offsets.put(new TopicPartition("topic1", 0), new OffsetAndMetadata(1L));
@@ -85,7 +86,7 @@ public void testStart() throws IOException {
8586
task.start(props);
8687

8788
HashMap<TopicPartition, OffsetAndMetadata> offsets = new HashMap<>();
88-
task.put(Arrays.asList(
89+
task.put(Collections.singletonList(
8990
new SinkRecord("topic1", 0, null, null, Schema.STRING_SCHEMA, "line0", 1)
9091
));
9192
offsets.put(new TopicPartition("topic1", 0), new OffsetAndMetadata(1L));

‎connect/file/src/test/java/org/apache/kafka/connect/file/integration/FileStreamSourceConnectorIntegrationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void testStopResumeSavedOffset() throws Exception {
9494
// Append NUM_LINES more lines to the file
9595
try (PrintStream printStream = new PrintStream(Files.newOutputStream(sourceFile.toPath(), StandardOpenOption.APPEND))) {
9696
for (int i = NUM_LINES; i < 2 * NUM_LINES; i++) {
97-
printStream.println(String.format(LINE_FORMAT, i));
97+
printStream.printf(LINE_FORMAT + "%n", i);
9898
}
9999
}
100100

@@ -197,7 +197,7 @@ private File createTempFile(int numLines) throws Exception {
197197

198198
try (PrintStream printStream = new PrintStream(Files.newOutputStream(sourceFile.toPath()))) {
199199
for (int i = 0; i < numLines; i++) {
200-
printStream.println(String.format(LINE_FORMAT, i));
200+
printStream.printf(LINE_FORMAT + "%n", i);
201201
}
202202
}
203203

‎connect/mirror/src/main/java/org/apache/kafka/connect/mirror/rest/MirrorRestServer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.glassfish.hk2.utilities.binding.AbstractBinder;
2727
import org.glassfish.jersey.server.ResourceConfig;
2828

29-
import java.util.Arrays;
3029
import java.util.Collection;
3130
import java.util.Collections;
3231
import java.util.Map;
@@ -48,7 +47,7 @@ public void initializeInternalResources(Map<SourceAndTarget, Herder> herders) {
4847

4948
@Override
5049
protected Collection<Class<?>> regularResources() {
51-
return Arrays.asList(
50+
return Collections.singletonList(
5251
InternalMirrorResource.class
5352
);
5453
}

‎connect/mirror/src/test/java/org/apache/kafka/connect/mirror/clients/admin/FakeLocalMetadataStore.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
public class FakeLocalMetadataStore {
3535
private static final Logger log = LoggerFactory.getLogger(FakeLocalMetadataStore.class);
3636

37-
private static ConcurrentHashMap<String, ConcurrentHashMap<String, String>> allTopics = new ConcurrentHashMap<>();
38-
private static ConcurrentHashMap<String, Vector<AclBinding>> allAcls = new ConcurrentHashMap<>();
37+
private static final ConcurrentHashMap<String, ConcurrentHashMap<String, String>> ALL_TOPICS = new ConcurrentHashMap<>();
38+
private static final ConcurrentHashMap<String, Vector<AclBinding>> ALL_ACLS = new ConcurrentHashMap<>();
3939

4040
/**
4141
* Add topic to allTopics.
@@ -44,7 +44,7 @@ public class FakeLocalMetadataStore {
4444
public static void addTopicToLocalMetadataStore(NewTopic newTopic) {
4545
ConcurrentHashMap<String, String> configs = new ConcurrentHashMap<>(newTopic.configs());
4646
configs.putIfAbsent("partitions", String.valueOf(newTopic.numPartitions()));
47-
allTopics.putIfAbsent(newTopic.name(), configs);
47+
ALL_TOPICS.putIfAbsent(newTopic.name(), configs);
4848
}
4949

5050
/**
@@ -53,9 +53,9 @@ public static void addTopicToLocalMetadataStore(NewTopic newTopic) {
5353
* @param newPartitionCount new partition count.
5454
*/
5555
public static void updatePartitionCount(String topic, int newPartitionCount) {
56-
ConcurrentHashMap<String, String> configs = FakeLocalMetadataStore.allTopics.getOrDefault(topic, new ConcurrentHashMap<>());
56+
ConcurrentHashMap<String, String> configs = FakeLocalMetadataStore.ALL_TOPICS.getOrDefault(topic, new ConcurrentHashMap<>());
5757
configs.compute("partitions", (key, value) -> String.valueOf(newPartitionCount));
58-
FakeLocalMetadataStore.allTopics.putIfAbsent(topic, configs);
58+
FakeLocalMetadataStore.ALL_TOPICS.putIfAbsent(topic, configs);
5959
}
6060

6161
/**
@@ -64,7 +64,7 @@ public static void updatePartitionCount(String topic, int newPartitionCount) {
6464
* @param newConfig topic config
6565
*/
6666
public static void updateTopicConfig(String topic, Config newConfig) {
67-
ConcurrentHashMap<String, String> topicConfigs = FakeLocalMetadataStore.allTopics.getOrDefault(topic, new ConcurrentHashMap<>());
67+
ConcurrentHashMap<String, String> topicConfigs = FakeLocalMetadataStore.ALL_TOPICS.getOrDefault(topic, new ConcurrentHashMap<>());
6868
newConfig.entries().stream().forEach(configEntry -> {
6969
if (configEntry.name() != null) {
7070
if (configEntry.value() != null) {
@@ -75,7 +75,7 @@ public static void updateTopicConfig(String topic, Config newConfig) {
7575
}
7676
}
7777
});
78-
FakeLocalMetadataStore.allTopics.putIfAbsent(topic, topicConfigs);
78+
FakeLocalMetadataStore.ALL_TOPICS.putIfAbsent(topic, topicConfigs);
7979
}
8080

8181
/**
@@ -84,7 +84,7 @@ public static void updateTopicConfig(String topic, Config newConfig) {
8484
* @return true if topic name is a key in allTopics
8585
*/
8686
public static Boolean containsTopic(String topic) {
87-
return allTopics.containsKey(topic);
87+
return ALL_TOPICS.containsKey(topic);
8888
}
8989

9090
/**
@@ -93,7 +93,7 @@ public static Boolean containsTopic(String topic) {
9393
* @return topic configurations.
9494
*/
9595
public static Map<String, String> topicConfig(String topic) {
96-
return allTopics.getOrDefault(topic, new ConcurrentHashMap<>());
96+
return ALL_TOPICS.getOrDefault(topic, new ConcurrentHashMap<>());
9797
}
9898

9999
/**
@@ -102,7 +102,7 @@ public static Map<String, String> topicConfig(String topic) {
102102
* @return {@link List<AclBinding>}
103103
*/
104104
public static List<AclBinding> aclBindings(String aclPrinciple) {
105-
return FakeLocalMetadataStore.allAcls.getOrDefault("User:" + aclPrinciple, new Vector<>());
105+
return FakeLocalMetadataStore.ALL_ACLS.getOrDefault("User:" + aclPrinciple, new Vector<>());
106106
}
107107

108108
/**
@@ -111,16 +111,16 @@ public static List<AclBinding> aclBindings(String aclPrinciple) {
111111
* @param aclBinding {@link AclBinding}
112112
*/
113113
public static void addACLs(String principal, AclBinding aclBinding) {
114-
Vector<AclBinding> aclBindings = FakeLocalMetadataStore.allAcls.getOrDefault(principal, new Vector<>());
114+
Vector<AclBinding> aclBindings = FakeLocalMetadataStore.ALL_ACLS.getOrDefault(principal, new Vector<>());
115115
aclBindings.add(aclBinding);
116-
FakeLocalMetadataStore.allAcls.putIfAbsent(principal, aclBindings);
116+
FakeLocalMetadataStore.ALL_ACLS.putIfAbsent(principal, aclBindings);
117117
}
118118

119119
/**
120120
* clear allTopics and allAcls.
121121
*/
122122
public static void clear() {
123-
allTopics.clear();
124-
allAcls.clear();
123+
ALL_TOPICS.clear();
124+
ALL_ACLS.clear();
125125
}
126126
}

‎connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/MirrorConnectorsWithCustomForwardingAdminIntegrationTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ public void startClusters() throws Exception {
164164
startClusters(additionalConfig);
165165

166166
try (Admin adminClient = primary.kafka().createAdminClient()) {
167-
adminClient.createAcls(Arrays.asList(
167+
adminClient.createAcls(Collections.singletonList(
168168
new AclBinding(
169169
new ResourcePattern(ResourceType.TOPIC, "*", PatternType.LITERAL),
170170
new AccessControlEntry("User:connector", "*", AclOperation.ALL, AclPermissionType.ALLOW)
171171
)
172172
)).all().get();
173173
}
174174
try (Admin adminClient = backup.kafka().createAdminClient()) {
175-
adminClient.createAcls(Arrays.asList(
175+
adminClient.createAcls(Collections.singletonList(
176176
new AclBinding(
177177
new ResourcePattern(ResourceType.TOPIC, "*", PatternType.LITERAL),
178178
new AccessControlEntry("User:connector", "*", AclOperation.ALL, AclPermissionType.ALLOW)
@@ -293,7 +293,7 @@ public void testSyncTopicConfigUseProvidedForwardingAdmin() throws Exception {
293293
public void testSyncTopicACLsUseProvidedForwardingAdmin() throws Exception {
294294
mm2Props.put("sync.topic.acls.enabled", "true");
295295
mm2Config = new MirrorMakerConfig(mm2Props);
296-
List<AclBinding> aclBindings = Arrays.asList(
296+
List<AclBinding> aclBindings = Collections.singletonList(
297297
new AclBinding(
298298
new ResourcePattern(ResourceType.TOPIC, "test-topic-1", PatternType.LITERAL),
299299
new AccessControlEntry("User:dummy", "*", AclOperation.DESCRIBE, AclPermissionType.ALLOW)

‎connect/runtime/src/main/java/org/apache/kafka/connect/runtime/ConnectorConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public <R extends ConnectRecord<R>> List<TransformationStage<R>> transformationS
324324
@SuppressWarnings("unchecked")
325325
Predicate<R> predicate = Utils.newInstance(getClass(predicatePrefix + "type"), Predicate.class);
326326
predicate.configure(originalsWithPrefix(predicatePrefix));
327-
transformations.add(new TransformationStage<>(predicate, negate == null ? false : Boolean.parseBoolean(negate.toString()), transformation));
327+
transformations.add(new TransformationStage<>(predicate, negate != null && Boolean.parseBoolean(negate.toString()), transformation));
328328
} else {
329329
transformations.add(new TransformationStage<>(transformation));
330330
}

‎connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/ConnectRestServer.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import java.util.Arrays;
2929
import java.util.Collection;
30+
import java.util.Collections;
3031
import java.util.Map;
3132

3233
public class ConnectRestServer extends RestServer {
@@ -56,7 +57,7 @@ protected Collection<Class<?>> regularResources() {
5657

5758
@Override
5859
protected Collection<Class<?>> adminResources() {
59-
return Arrays.asList(
60+
return Collections.singletonList(
6061
LoggingResource.class
6162
);
6263
}

‎connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/entities/ConfigInfos.java

+9-11
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,15 @@ public int hashCode() {
8585

8686
@Override
8787
public String toString() {
88-
StringBuilder sb = new StringBuilder();
89-
sb.append("[")
90-
.append(name)
91-
.append(",")
92-
.append(errorCount)
93-
.append(",")
94-
.append(groups)
95-
.append(",")
96-
.append(configs)
97-
.append("]");
98-
return sb.toString();
88+
return "[" +
89+
name +
90+
"," +
91+
errorCount +
92+
"," +
93+
groups +
94+
"," +
95+
configs +
96+
"]";
9997
}
10098

10199
}

‎connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/entities/ConfigKeyInfo.java

+23-25
Original file line numberDiff line numberDiff line change
@@ -141,30 +141,28 @@ public int hashCode() {
141141

142142
@Override
143143
public String toString() {
144-
StringBuilder sb = new StringBuilder();
145-
sb.append("[")
146-
.append(name)
147-
.append(",")
148-
.append(type)
149-
.append(",")
150-
.append(required)
151-
.append(",")
152-
.append(defaultValue)
153-
.append(",")
154-
.append(importance)
155-
.append(",")
156-
.append(documentation)
157-
.append(",")
158-
.append(group)
159-
.append(",")
160-
.append(orderInGroup)
161-
.append(",")
162-
.append(width)
163-
.append(",")
164-
.append(displayName)
165-
.append(",")
166-
.append(dependents)
167-
.append("]");
168-
return sb.toString();
144+
return "[" +
145+
name +
146+
"," +
147+
type +
148+
"," +
149+
required +
150+
"," +
151+
defaultValue +
152+
"," +
153+
importance +
154+
"," +
155+
documentation +
156+
"," +
157+
group +
158+
"," +
159+
orderInGroup +
160+
"," +
161+
width +
162+
"," +
163+
displayName +
164+
"," +
165+
dependents +
166+
"]";
169167
}
170168
}

‎connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/entities/ConfigValueInfo.java

+11-13
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,17 @@ public int hashCode() {
8787

8888
@Override
8989
public String toString() {
90-
StringBuilder sb = new StringBuilder();
91-
sb.append("[")
92-
.append(name)
93-
.append(",")
94-
.append(value)
95-
.append(",")
96-
.append(recommendedValues)
97-
.append(",")
98-
.append(errors)
99-
.append(",")
100-
.append(visible)
101-
.append("]");
102-
return sb.toString();
90+
return "[" +
91+
name +
92+
"," +
93+
value +
94+
"," +
95+
recommendedValues +
96+
"," +
97+
errors +
98+
"," +
99+
visible +
100+
"]";
103101
}
104102

105103
}

0 commit comments

Comments
 (0)