Skip to content

Commit a332a84

Browse files
authored
MINOR: Various code cleanups in server (#22021)
Small Java cleanups fixing logging and types Reviewers: Andrew Schofield <aschofield@confluent.io>
1 parent 1980f38 commit a332a84

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

server/src/main/java/org/apache/kafka/server/BrokerLifecycleManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,10 +570,10 @@ public void run() {
570570
return;
571571
}
572572
if (response.authenticationException() != null) {
573-
logger.error("Unable to register broker $nodeId because of an authentication exception.", response.authenticationException());
573+
logger.error("Unable to register broker {} because of an authentication exception.", nodeId, response.authenticationException());
574574
scheduleNextCommunicationAfterFailure();
575575
} else if (response.versionMismatch() != null) {
576-
logger.error("Unable to register broker $nodeId because of an API version problem.", response.versionMismatch());
576+
logger.error("Unable to register broker {} because of an API version problem.", nodeId, response.versionMismatch());
577577
scheduleNextCommunicationAfterFailure();
578578
} else if (response.responseBody() == null) {
579579
logger.warn("Unable to register broker {}.", nodeId);

server/src/main/java/org/apache/kafka/server/DelayedActionQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void tryCompleteActions() {
4343
Runnable action = queue.poll();
4444
if (action == null) return;
4545
action.run();
46-
} catch (Throwable e) {
46+
} catch (Exception e) {
4747
LOGGER.error("failed to complete delayed actions", e);
4848
}
4949
}

server/src/main/java/org/apache/kafka/server/share/session/ShareSession.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public synchronized int size() {
8989
return partitionMap.size();
9090
}
9191

92-
public synchronized Boolean isEmpty() {
92+
public synchronized boolean isEmpty() {
9393
return partitionMap.isEmpty();
9494
}
9595

@@ -137,11 +137,11 @@ public synchronized int updateCachedSize() {
137137
return previousSize != -1 ? cachedSize - previousSize : cachedSize;
138138
}
139139

140-
public static String partitionsToLogString(Collection<TopicIdPartition> partitions, Boolean traceEnabled) {
140+
public static String partitionsToLogString(Collection<TopicIdPartition> partitions, boolean traceEnabled) {
141141
if (traceEnabled) {
142-
return String.format("( %s )", String.join(", ", partitions.toString()));
142+
return partitions.toString();
143143
}
144-
return String.format("%s partition(s)", partitions.size());
144+
return partitions.size() + " partition(s)";
145145
}
146146

147147
public String toString() {

server/src/main/java/org/apache/kafka/server/share/session/ShareSessionCache.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ public ShareSessionCache(int maxEntries) {
9393
* Get a session by session key.
9494
*
9595
* @param key The share session key.
96-
* @return The session, or None if no such session was found.
96+
* @return The session, or null if no such session was found.
9797
*/
9898
public synchronized ShareSession get(ShareSessionKey key) {
99-
return sessions.getOrDefault(key, null);
99+
return sessions.get(key);
100100
}
101101

102102
/**

server/src/test/java/org/apache/kafka/server/share/session/ShareSessionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void testPartitionsToLogString() {
3939
assertEquals("2 partition(s)", response);
4040

4141
response = ShareSession.partitionsToLogString(partitions, true);
42-
assertEquals(String.format("( [%s:foo-0, %s:bar-1] )", uuid1, uuid2), response);
42+
assertEquals(String.format("[%s:foo-0, %s:bar-1]", uuid1, uuid2), response);
4343
}
4444

4545
@Test
@@ -48,6 +48,6 @@ public void testPartitionsToLogStringEmpty() {
4848
assertEquals("0 partition(s)", response);
4949

5050
response = ShareSession.partitionsToLogString(List.of(), true);
51-
assertEquals("( [] )", response);
51+
assertEquals("[]", response);
5252
}
5353
}

0 commit comments

Comments
 (0)