You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by mm...@apache.org on 2022/05/05 00:26:50 UTC

[bookkeeper] branch master updated: [minor] [optimize] Remove redundant toString call (#3254)

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 90d55017d [minor] [optimize] Remove redundant toString call (#3254)
90d55017d is described below

commit 90d55017da68111ffc578b611de998269f701f82
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Thu May 5 08:26:43 2022 +0800

    [minor] [optimize] Remove redundant toString call (#3254)
---
 .../benchmark/BenchThroughputLatency.java          |  2 +-
 .../common/conf/ComponentConfiguration.java        |  2 +-
 .../java/org/apache/bookkeeper/bookie/Cookie.java  |  2 +-
 .../java/org/apache/bookkeeper/bookie/Journal.java |  3 +--
 .../apache/bookkeeper/bookie/JournalChannel.java   | 15 ++------------
 .../bookkeeper/conf/AbstractConfiguration.java     |  2 +-
 .../bookkeeper/net/AbstractDNSToSwitchMapping.java |  2 +-
 .../apache/bookkeeper/net/NetworkTopologyImpl.java |  6 +++---
 .../apache/bookkeeper/net/ScriptBasedMapping.java  |  8 ++++----
 .../apache/bookkeeper/sasl/SaslServerState.java    |  3 +--
 .../apache/bookkeeper/sasl/TGTRefreshThread.java   |  2 +-
 .../server/http/service/DecommissionService.java   |  2 +-
 .../server/http/service/ListBookiesService.java    |  2 +-
 .../LostBookieRecoveryDelayCommand.java            |  4 ++--
 .../org/apache/bookkeeper/util/DiskChecker.java    |  8 ++++----
 .../org/apache/bookkeeper/util/StringUtils.java    | 16 +++++++--------
 .../bookkeeper/verifier/BookkeeperVerifier.java    |  6 +++---
 .../bookkeeper/bookie/SkipListArenaTest.java       |  2 +-
 .../ldb/PersistentEntryLogMetadataMapTest.java     |  4 ++--
 ...KeeperDiskSpaceWeightedLedgerPlacementTest.java |  2 +-
 .../discover/AbstractTestZkRegistrationClient.java |  4 ++--
 .../java/org/apache/bookkeeper/tls/TestTLS.java    | 24 +++++++++++-----------
 .../apache/bookkeeper/slogger/ConsoleSlogger.java  |  2 +-
 .../apache/bookkeeper/metadata/etcd/EtcdUtils.java |  2 +-
 .../distributedlog/admin/DistributedLogAdmin.java  | 16 +++++++--------
 .../distributedlog/tools/DistributedLogTool.java   | 10 ++++-----
 .../java/org/apache/distributedlog/tools/Tool.java |  4 ++--
 .../distributedlog/TestAppendOnlyStreamReader.java |  4 ++--
 .../tests/containers/wait/HttpWaitStrategy.java    |  2 +-
 .../QueryAutoRecoveryStatusCommandTest.java        |  1 -
 .../autorecovery/WhoIsAuditorCommandTest.java      |  1 -
 .../cli/commands/bookie/FormatCommandTest.java     |  2 --
 .../cli/commands/bookie/LedgerCommandTest.java     |  2 --
 .../cli/commands/bookie/SanityTestCommandTest.java |  1 -
 .../cli/commands/bookies/InitCommandTest.java      |  1 -
 .../cli/commands/cookie/GetCookieCommandTest.java  |  2 +-
 .../cli/commands/cluster/InitClusterCommand.java   |  4 ++--
 37 files changed, 77 insertions(+), 98 deletions(-)

diff --git a/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java b/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
index 08c08e57c..23cac6449 100644
--- a/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
+++ b/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
@@ -404,7 +404,7 @@ public class BenchThroughputLatency implements AddCallback, Runnable {
         OutputStream fos = new BufferedOutputStream(new FileOutputStream(latencyFile));
 
         for (Long l: latency) {
-            fos.write((Long.toString(l) + "\t" + (l / 1000000) + "ms\n").getBytes(UTF_8));
+            fos.write((l + "\t" + (l / 1000000) + "ms\n").getBytes(UTF_8));
         }
         fos.flush();
         fos.close();
diff --git a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/conf/ComponentConfiguration.java b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/conf/ComponentConfiguration.java
index 8b2759709..64e4a9356 100644
--- a/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/conf/ComponentConfiguration.java
+++ b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/conf/ComponentConfiguration.java
@@ -310,7 +310,7 @@ public abstract class ComponentConfiguration implements Configuration {
         Map<String, Object> configMap = new HashMap<>();
         Iterator<String> iterator = this.getKeys();
         while (iterator.hasNext()) {
-            String key = iterator.next().toString();
+            String key = iterator.next();
             Object property = this.getProperty(key);
             if (property != null) {
                 configMap.put(key, property.toString());
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java
index d285a8920..1889cd302 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java
@@ -167,7 +167,7 @@ public class Cookie {
         }
         StringBuilder b = new StringBuilder();
         b.append(CURRENT_COOKIE_LAYOUT_VERSION).append("\n");
-        b.append(builder.build().toString());
+        b.append(builder.build());
         return b.toString();
     }
 
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
index a4c91e948..447f2409b 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
@@ -1222,7 +1222,7 @@ public class Journal extends BookieCriticalThread implements CheckpointSource {
             LOG.info("Journal exits when shutting down");
         } finally {
             // There could be packets queued for forceWrite on this logFile
-            // That is fine as this exception is going to anyway take down the
+            // That is fine as this exception is going to anyway take down
             // the bookie. If we execute this as a part of graceful shutdown,
             // close will flush the file system cache making any previous
             // cached writes durable so this is fine as well.
@@ -1277,7 +1277,6 @@ public class Journal extends BookieCriticalThread implements CheckpointSource {
         return total;
     }
 
-    //
     /**
      * Wait for the Journal thread to exit.
      * This is method is needed in order to mock the journal, we can't mock final method of java.lang.Thread class
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java
index 58be40371..6e956f3cf 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java
@@ -23,12 +23,9 @@ package org.apache.bookkeeper.bookie;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.common.annotations.VisibleForTesting;
-
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.Arrays;
@@ -58,7 +55,7 @@ class JournalChannel implements Closeable {
 
     static final int SECTOR_SIZE = 512;
     private static final int START_OF_FILE = -12345;
-    private static long cacheDropLagBytes = 8 * MB;
+    private static final long cacheDropLagBytes = 8 * MB;
 
     // No header
     static final int V1 = 1;
@@ -71,7 +68,7 @@ class JournalChannel implements Closeable {
     // 1) expanding header to 512
     // 2) Padding writes to align sector size
     static final int V5 = 5;
-    // Adding explicitlac entry
+    // Adding explicit lac entry
     public static final int V6 = 6;
 
     static final int HEADER_SIZE = SECTOR_SIZE; // align header to sector size
@@ -309,12 +306,4 @@ class JournalChannel implements Closeable {
         }
     }
 
-    @VisibleForTesting
-    public static FileChannel openFileChannel(RandomAccessFile randomAccessFile) {
-        if (randomAccessFile == null) {
-            throw new IllegalArgumentException("Input cannot be null");
-        }
-
-        return randomAccessFile.getChannel();
-    }
 }
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
index 25d41cbb7..ade630813 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
@@ -1248,7 +1248,7 @@ public abstract class AbstractConfiguration<T extends AbstractConfiguration>
         Map<String, Object> configMap = new HashMap<>();
         Iterator<String> iterator = this.getKeys();
         while (iterator.hasNext()) {
-            String key = iterator.next().toString();
+            String key = iterator.next();
             Object property = this.getProperty(key);
             if (property != null) {
                 configMap.put(key, property.toString());
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
index d658d8efb..da5dac8c1 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
@@ -115,7 +115,7 @@ public abstract class AbstractDNSToSwitchMapping implements DNSToSwitchMapping,
     public String dumpTopology() {
         Map<String, String> rack = getSwitchMap();
         StringBuilder builder = new StringBuilder();
-        builder.append("Mapping: ").append(toString()).append("\n");
+        builder.append("Mapping: ").append(this).append("\n");
         if (rack != null) {
             builder.append("Map:\n");
             Set<String> switches = new HashSet<String>();
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java
index 19b2c0497..b85621e17 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java
@@ -421,7 +421,7 @@ public class NetworkTopologyImpl implements NetworkTopology {
             Node rack = getNodeForNetworkLocation(node);
             if (rack != null && !(rack instanceof InnerNode)) {
                 LOG.error("Unexpected data node {} at an illegal network location", node);
-                throw new IllegalArgumentException("Unexpected data node " + node.toString()
+                throw new IllegalArgumentException("Unexpected data node " + node
                         + " at an illegal network location");
             }
             if (clusterMap.add(node)) {
@@ -436,7 +436,7 @@ public class NetworkTopologyImpl implements NetworkTopology {
                 }
             }
             if (LOG.isDebugEnabled()) {
-                LOG.debug("NetworkTopology became:\n" + this.toString());
+                LOG.debug("NetworkTopology became:\n" + this);
             }
         } finally {
             netlock.writeLock().unlock();
@@ -507,7 +507,7 @@ public class NetworkTopologyImpl implements NetworkTopology {
                 }
             }
             if (LOG.isDebugEnabled()) {
-                LOG.debug("NetworkTopology became:\n" + this.toString());
+                LOG.debug("NetworkTopology became:\n" + this);
             }
         } finally {
             netlock.writeLock().unlock();
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java
index 467bacaf3..5a0f8827e 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/ScriptBasedMapping.java
@@ -210,8 +210,8 @@ public final class ScriptBasedMapping extends CachedDNSToSwitchMapping {
 
                 if (m.size() != names.size()) {
                     // invalid number of entries returned by the script
-                    LOG.error("Script " + scriptName + " returned " + Integer.toString(m.size()) + " values when "
-                            + Integer.toString(names.size()) + " were expected.");
+                    LOG.error("Script " + scriptName + " returned " + m.size() + " values when "
+                            + names.size() + " were expected.");
                     return null;
                 }
             } else {
@@ -239,8 +239,8 @@ public final class ScriptBasedMapping extends CachedDNSToSwitchMapping {
             StringBuilder allOutput = new StringBuilder();
             int numProcessed = 0;
             if (maxArgs < MIN_ALLOWABLE_ARGS) {
-                LOG.warn("Invalid value " + Integer.toString(maxArgs) + " for " + SCRIPT_ARG_COUNT_KEY
-                        + "; must be >= " + Integer.toString(MIN_ALLOWABLE_ARGS));
+                LOG.warn("Invalid value " + maxArgs + " for " + SCRIPT_ARG_COUNT_KEY
+                        + "; must be >= " + MIN_ALLOWABLE_ARGS);
                 return null;
             }
 
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/sasl/SaslServerState.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/sasl/SaslServerState.java
index c297d0d85..44528a035 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/sasl/SaslServerState.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/sasl/SaslServerState.java
@@ -78,8 +78,7 @@ public class SaslServerState {
 
                 final String servicePrincipalNameAndHostname = servicePrincipal.getName();
                 int indexOf = servicePrincipalNameAndHostname.indexOf("/");
-                final String serviceHostnameAndKerbDomain = servicePrincipalNameAndHostname.substring(indexOf + 1,
-                    servicePrincipalNameAndHostname.length());
+                final String serviceHostnameAndKerbDomain = servicePrincipalNameAndHostname.substring(indexOf + 1);
                 int indexOfAt = serviceHostnameAndKerbDomain.indexOf("@");
 
                 final String servicePrincipalName, serviceHostname;
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/sasl/TGTRefreshThread.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/sasl/TGTRefreshThread.java
index f4a2508f7..84f9442bd 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/sasl/TGTRefreshThread.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/sasl/TGTRefreshThread.java
@@ -162,7 +162,7 @@ class TGTRefreshThread extends Thread {
                 LOG.info("refreshing now because expiry is before next scheduled refresh time.");
             } else if (now < nextRefresh) {
                 Date until = new Date(nextRefresh);
-                LOG.info("TGT refresh sleeping until: {}", until.toString());
+                LOG.info("TGT refresh sleeping until: {}", until);
                 try {
                     Thread.sleep(nextRefresh - now);
                 } catch (InterruptedException ie) {
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DecommissionService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DecommissionService.java
index 19cd99254..a6191761a 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DecommissionService.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/DecommissionService.java
@@ -87,7 +87,7 @@ public class DecommissionService implements HttpEndpointService {
                     });
 
                     response.setCode(HttpServer.StatusCode.OK);
-                    response.setBody("Success send decommission Bookie command " + bookieSrc.toString());
+                    response.setBody("Success send decommission Bookie command " + bookieSrc);
                     return response;
                 } catch (Exception e) {
                     LOG.error("Exception occurred while decommissioning bookie: ", e);
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListBookiesService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListBookiesService.java
index 7269b2efc..328105f85 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListBookiesService.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListBookiesService.java
@@ -87,7 +87,7 @@ public class ListBookiesService implements HttpEndpointService {
                     hostname = resolved.getHostName();
                 }
                 output.putIfAbsent(b.toString(), hostname);
-                LOG.debug("bookie: " + b.toString() + " hostname:" + hostname);
+                LOG.debug("bookie: " + b + " hostname:" + hostname);
             }
             String jsonResponse = JsonUtil.toJson(output);
 
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/LostBookieRecoveryDelayCommand.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/LostBookieRecoveryDelayCommand.java
index 12a4564a7..defab6895 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/LostBookieRecoveryDelayCommand.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/LostBookieRecoveryDelayCommand.java
@@ -102,12 +102,12 @@ public class LostBookieRecoveryDelayCommand extends BookieCommand<LostBookieReco
         try {
             if (getter) {
                 int lostBookieRecoveryDelay = admin.getLostBookieRecoveryDelay();
-                LOG.info("LostBookieRecoveryDelay value in ZK: {}", String.valueOf(lostBookieRecoveryDelay));
+                LOG.info("LostBookieRecoveryDelay value in ZK: {}", lostBookieRecoveryDelay);
             } else {
                 int lostBookieRecoveryDelay = flags.set;
                 admin.setLostBookieRecoveryDelay(lostBookieRecoveryDelay);
                 LOG.info("Successfully set LostBookieRecoveryDelay value in ZK: {}",
-                         String.valueOf(lostBookieRecoveryDelay));
+                        lostBookieRecoveryDelay);
             }
         } finally {
             if (admin != null) {
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DiskChecker.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DiskChecker.java
index 283af7ef6..fb5766adc 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DiskChecker.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DiskChecker.java
@@ -246,21 +246,21 @@ public class DiskChecker {
         float usage = checkDiskFull(dir);
         if (!mkdirsWithExistsCheck(dir)) {
             throw new DiskErrorException("can not create directory: "
-                    + dir.toString());
+                    + dir);
         }
 
         if (!dir.isDirectory()) {
-            throw new DiskErrorException("not a directory: " + dir.toString());
+            throw new DiskErrorException("not a directory: " + dir);
         }
 
         if (!dir.canRead()) {
             throw new DiskErrorException("directory is not readable: "
-                    + dir.toString());
+                    + dir);
         }
 
         if (!dir.canWrite()) {
             throw new DiskErrorException("directory is not writable: "
-                    + dir.toString());
+                    + dir);
         }
         return usage;
     }
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/StringUtils.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/StringUtils.java
index 73bf0187c..9b2822c6f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/StringUtils.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/StringUtils.java
@@ -72,10 +72,10 @@ public class StringUtils {
         // do 2-4-4 split
         StringBuilder sb = new StringBuilder();
         sb.append("/")
-          .append(ledgerIdStr.substring(0, 2)).append("/")
-          .append(ledgerIdStr.substring(2, 6)).append("/")
+          .append(ledgerIdStr, 0, 2).append("/")
+          .append(ledgerIdStr, 2, 6).append("/")
           .append(LEDGER_NODE_PREFIX)
-          .append(ledgerIdStr.substring(6, 10));
+          .append(ledgerIdStr, 6, 10);
         return sb.toString();
     }
 
@@ -91,12 +91,12 @@ public class StringUtils {
         // do 3-4-4-4-4 split
         StringBuilder sb = new StringBuilder();
         sb.append("/")
-          .append(ledgerIdStr.substring(0, 3)).append("/")
-          .append(ledgerIdStr.substring(3, 7)).append("/")
-          .append(ledgerIdStr.substring(7, 11)).append("/")
-          .append(ledgerIdStr.substring(11, 15)).append("/")
+          .append(ledgerIdStr, 0, 3).append("/")
+          .append(ledgerIdStr, 3, 7).append("/")
+          .append(ledgerIdStr, 7, 11).append("/")
+          .append(ledgerIdStr, 11, 15).append("/")
           .append(LEDGER_NODE_PREFIX)
-          .append(ledgerIdStr.substring(15, 19));
+          .append(ledgerIdStr, 15, 19);
         return sb.toString();
     }
 
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/verifier/BookkeeperVerifier.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/verifier/BookkeeperVerifier.java
index 5715bbf40..2000b815a 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/verifier/BookkeeperVerifier.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/verifier/BookkeeperVerifier.java
@@ -301,7 +301,7 @@ public class BookkeeperVerifier {
 
         void openWrite(long entryID) {
             writesInProgress.add(entryID);
-            System.out.format("Open writes, %s%n", writesInProgress.toString());
+            System.out.format("Open writes, %s%n", writesInProgress);
         }
 
         void incReads() {
@@ -382,7 +382,7 @@ public class BookkeeperVerifier {
                 System.out.format(
                         "checkWriteComplete: ledger %d, writesInProgress %s%n",
                         ledgerID,
-                        writesInProgress.toString());
+                        writesInProgress);
                 cb.accept(0);
             }
         }
@@ -396,7 +396,7 @@ public class BookkeeperVerifier {
                 System.out.format(
                         "checkOpComplete: ledger %d, writesInProgress %s, readsInProgress %d%n",
                         ledgerID,
-                        writesInProgress.toString(), readsInProgress);
+                        writesInProgress, readsInProgress);
                 cb.accept(0);
             }
         }
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SkipListArenaTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SkipListArenaTest.java
index 873e23766..f2bdb870e 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SkipListArenaTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SkipListArenaTest.java
@@ -190,7 +190,7 @@ public class SkipListArenaTest {
                 }
                 AllocBuffer other = treeMap.put(buf.alloc.getOffset(), buf);
                 if (other != null) {
-                    fail("Buffer " + other.toString() + " overlapped with " + buf.toString());
+                    fail("Buffer " + other + " overlapped with " + buf);
                 }
             }
         }
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/PersistentEntryLogMetadataMapTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/PersistentEntryLogMetadataMapTest.java
index 243fe692e..bc18c3df2 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/PersistentEntryLogMetadataMapTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/PersistentEntryLogMetadataMapTest.java
@@ -56,7 +56,7 @@ public class PersistentEntryLogMetadataMapTest {
     @Test
     public void simple() throws Exception {
         File tmpDir = tempFolder.newFolder("metadata-cache");
-        String path = tmpDir.getAbsolutePath().toString();
+        String path = tmpDir.getAbsolutePath();
         PersistentEntryLogMetadataMap entryMetadataMap = new PersistentEntryLogMetadataMap(path, configuration);
 
         List<EntryLogMetadata> metadatas = Lists.newArrayList();
@@ -104,7 +104,7 @@ public class PersistentEntryLogMetadataMapTest {
     @Test
     public void closeAndOpen() throws Exception {
         File tmpDir = tempFolder.newFolder();
-        String path = tmpDir.getAbsolutePath().toString();
+        String path = tmpDir.getAbsolutePath();
         PersistentEntryLogMetadataMap entryMetadataMap = new PersistentEntryLogMetadataMap(path, configuration);
 
         List<EntryLogMetadata> metadatas = Lists.newArrayList();
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperDiskSpaceWeightedLedgerPlacementTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperDiskSpaceWeightedLedgerPlacementTest.java
index f8c5ec4b6..fc250348f 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperDiskSpaceWeightedLedgerPlacementTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperDiskSpaceWeightedLedgerPlacementTest.java
@@ -70,7 +70,7 @@ public class BookKeeperDiskSpaceWeightedLedgerPlacementTest extends BookKeeperCl
             }
             fail(String.format(
                     "Server %s still has weight %s rather than %s",
-                    bookie.toString(), freeDiskSpace.toString(), target.toString()));
+                    bookie.toString(), freeDiskSpace, target.toString()));
         }
     }
 
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/AbstractTestZkRegistrationClient.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/AbstractTestZkRegistrationClient.java
index e09a6350b..6f8c6b146 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/AbstractTestZkRegistrationClient.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/AbstractTestZkRegistrationClient.java
@@ -151,7 +151,7 @@ public abstract class AbstractTestZkRegistrationClient extends MockZooKeeperTest
                         Code.NONODE.intValue(),
                         new byte[] {},
                         new Stat());
-            mockZkGetData(regReadonlyPath + "/" + address.toString(),
+            mockZkGetData(regReadonlyPath + "/" + address,
                         zkRegistrationClient.isBookieAddressTracking(),
                         Code.OK.intValue(),
                         new byte[] {},
@@ -162,7 +162,7 @@ public abstract class AbstractTestZkRegistrationClient extends MockZooKeeperTest
                         Code.OK.intValue(),
                         new byte[] {},
                         new Stat());
-            mockZkGetData(regReadonlyPath + "/" + address.toString(),
+            mockZkGetData(regReadonlyPath + "/" + address,
                         zkRegistrationClient.isBookieAddressTracking(),
                         Code.NONODE.intValue(),
                         new byte[] {},
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
index fe57f387c..74cf21e8e 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
@@ -904,42 +904,42 @@ public class TestTLS extends BookKeeperClusterTestCase {
                     .append(TestUtils.buildStatsCounterPathFromBookieID(bookie.getBookieId()))
                     .append(".");
             // check stats on TLS enabled client
-           TestStatsProvider.TestCounter cntr =  tlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+           TestStatsProvider.TestCounter cntr =  tlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.ACTIVE_TLS_CHANNEL_COUNTER);
 
             assertEquals("Mismatch TLS channel count", 1,
-                    tlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    tlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.ACTIVE_TLS_CHANNEL_COUNTER).get().longValue());
             assertEquals("TLS handshake failure unexpected", 0,
-                    tlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    tlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.FAILED_TLS_HANDSHAKE_COUNTER).get().longValue());
             assertEquals("Mismatch non-TLS channel count", 0,
-                    tlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    tlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.ACTIVE_NON_TLS_CHANNEL_COUNTER).get().longValue());
             assertEquals("Connection failures unexpected", 0,
-                    tlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    tlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.FAILED_CONNECTION_COUNTER).get().longValue());
 
             // check stats on non-TLS enabled client
             assertEquals("Mismatch TLS channel count", 0,
-                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.ACTIVE_TLS_CHANNEL_COUNTER).get().longValue());
             assertEquals("TLS handshake failure unexpected", 0,
-                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.FAILED_TLS_HANDSHAKE_COUNTER).get().longValue());
             assertEquals("Mismatch non-TLS channel count", 1,
-                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.ACTIVE_NON_TLS_CHANNEL_COUNTER).get().longValue());
             assertEquals("Connection failures unexpected", 0,
-                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.FAILED_CONNECTION_COUNTER).get().longValue());
 
             bookie.shutdown();
             assertEquals("Mismatch TLS channel count", 0,
-                    tlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    tlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.ACTIVE_TLS_CHANNEL_COUNTER).get().longValue());
             assertEquals("Mismatch non-TLS channel count", 0,
-                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder.toString()
+                    nonTlsClient.getTestStatsProvider().getCounter(nameBuilder
                     + BookKeeperClientStats.ACTIVE_NON_TLS_CHANNEL_COUNTER).get().longValue());
 
         }
@@ -1002,7 +1002,7 @@ public class TestTLS extends BookKeeperClusterTestCase {
                 .append(TestUtils.buildStatsCounterPathFromBookieID(bookie.getBookieId()))
                 .append(".");
         assertEquals("TLS handshake failure expected", 1,
-                client.getTestStatsProvider().getCounter(nameBuilder.toString()
+                client.getTestStatsProvider().getCounter(nameBuilder
                 + BookKeeperClientStats.FAILED_TLS_HANDSHAKE_COUNTER).get().longValue());
     }
 
diff --git a/bookkeeper-slogger/api/src/main/java/org/apache/bookkeeper/slogger/ConsoleSlogger.java b/bookkeeper-slogger/api/src/main/java/org/apache/bookkeeper/slogger/ConsoleSlogger.java
index 31d647816..87f59b545 100644
--- a/bookkeeper-slogger/api/src/main/java/org/apache/bookkeeper/slogger/ConsoleSlogger.java
+++ b/bookkeeper-slogger/api/src/main/java/org/apache/bookkeeper/slogger/ConsoleSlogger.java
@@ -102,7 +102,7 @@ public class ConsoleSlogger extends AbstractSlogger {
         }
         builder.append("}");
 
-        System.out.println(builder.toString());
+        System.out.println(builder);
     }
 
     private static void keyValue(StringBuilder sb, String key, String value) {
diff --git a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdUtils.java b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdUtils.java
index e8cf87a68..431034128 100644
--- a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdUtils.java
+++ b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdUtils.java
@@ -76,7 +76,7 @@ final class EtcdUtils {
 
     static String getLedgerKey(String scope, long scopeId, long ledgerId) {
         UUID uuid = new UUID(scopeId, ledgerId);
-        return String.format("%s/ledgers/%s", scope, uuid.toString());
+        return String.format("%s/ledgers/%s", scope, uuid);
     }
 
     static UUID parseLedgerKey(String ledgerKey) {
diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/admin/DistributedLogAdmin.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/admin/DistributedLogAdmin.java
index 02bd41ab7..4632efa13 100644
--- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/admin/DistributedLogAdmin.java
+++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/admin/DistributedLogAdmin.java
@@ -472,9 +472,9 @@ public class DistributedLogAdmin extends DistributedLogTool {
                 return 0;
             } else {
                 System.out.println("There is bookkeeper bound to " + uri + " : ");
-                System.out.println("");
-                System.out.println(bkdlConfig.toString());
-                System.out.println("");
+                System.out.println();
+                System.out.println(bkdlConfig);
+                System.out.println();
                 if (!force && !IOUtils.confirmPrompt("Do you want to unbind " + uri + " :\n")) {
                     return 0;
                 }
@@ -597,9 +597,9 @@ public class DistributedLogAdmin extends DistributedLogTool {
                     System.out.println("No bookkeeper is bound to " + uri);
                 } else {
                     System.out.println("There is bookkeeper bound to " + uri + " : ");
-                    System.out.println("");
-                    System.out.println(bkdlConfig.toString());
-                    System.out.println("");
+                    System.out.println();
+                    System.out.println(bkdlConfig);
+                    System.out.println();
                     if (!isQuery) {
                         if (newBKDLConfig.equals(bkdlConfig)) {
                             System.out.println("No bookkeeper binding needs to be updated. Quit.");
@@ -631,9 +631,9 @@ public class DistributedLogAdmin extends DistributedLogTool {
                     try {
                         dlMetadata.update(uri);
                         System.out.println("Updated binding on " + uri + " : ");
-                        System.out.println("");
+                        System.out.println();
                         System.out.println(newBKDLConfig.toString());
-                        System.out.println("");
+                        System.out.println();
                     } catch (IOException ie) {
                         System.err.println("Failed to update binding on " + uri + " : " + ie.getMessage());
                     }
diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/DistributedLogTool.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/DistributedLogTool.java
index 5268f9537..41bb8abb9 100644
--- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/DistributedLogTool.java
+++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/DistributedLogTool.java
@@ -489,7 +489,7 @@ import org.slf4j.LoggerFactory;
                 } else {
                     System.out.println(new String(metadata, UTF_8));
                 }
-                System.out.println("");
+                System.out.println();
             }
             System.out.println("--------------------------------");
         }
@@ -539,7 +539,7 @@ import org.slf4j.LoggerFactory;
                 System.out.println(stream);
             }
 
-            System.out.println("");
+            System.out.println();
         }
 
         protected void watchAndReportChanges(Namespace namespace) throws Exception {
@@ -1535,7 +1535,7 @@ import org.slf4j.LoggerFactory;
                 System.out.println("Record (txn = " + record.getTransactionId() + ", bytes = "
                         + record.getPayload().length + ")");
             }
-            System.out.println("");
+            System.out.println();
 
             if (skipPayload) {
                 return;
@@ -2112,7 +2112,7 @@ import org.slf4j.LoggerFactory;
                         System.out.println(new String(record.getPayload(), UTF_8));
                     }
                 }
-                System.out.println("");
+                System.out.println();
                 record = reader.nextRecord();
             }
         }
@@ -2453,7 +2453,7 @@ import org.slf4j.LoggerFactory;
 
         @Override
         protected int runSimpleCmd() throws Exception {
-            System.out.println(DLSN.deserialize(base64Dlsn).toString());
+            System.out.println(DLSN.deserialize(base64Dlsn));
             return 0;
         }
     }
diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/Tool.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/Tool.java
index cfcc8a192..77a6406ef 100644
--- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/Tool.java
+++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/Tool.java
@@ -200,7 +200,7 @@ public abstract class Tool {
             for (int i = 0; i < numSpaces; i++) {
                 spacesBuilder.append(" ");
             }
-            println("\t"  + entry.getKey() + spacesBuilder.toString() + ": " + entry.getValue().getDescription());
+            println("\t"  + entry.getKey() + spacesBuilder + ": " + entry.getValue().getDescription());
         }
         println("");
     }
@@ -227,7 +227,7 @@ public abstract class Tool {
         int rc = -1;
         if (args.length <= 0) {
             System.err.println("No tool to run.");
-            System.err.println("");
+            System.err.println();
             System.err.println("Usage : Tool <tool_class_name> <options>");
             System.exit(-1);
         }
diff --git a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestAppendOnlyStreamReader.java b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestAppendOnlyStreamReader.java
index 69e57fb53..e8f897ce5 100644
--- a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestAppendOnlyStreamReader.java
+++ b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/TestAppendOnlyStreamReader.java
@@ -195,7 +195,7 @@ public class TestAppendOnlyStreamReader extends TestDistributedLogBase {
         byte[] bytesIn = new byte[4];
         int read = reader.read(bytesIn, 0, 4);
         assertEquals(4, read);
-        assertEquals(new String("abca"), new String(bytesIn));
+        assertEquals("abca", new String(bytesIn));
 
         assertTrue(reader.skipTo(reader.position()));
 
@@ -203,6 +203,6 @@ public class TestAppendOnlyStreamReader extends TestDistributedLogBase {
 
         read = reader.read(bytesIn, 0, 4);
         assertEquals(4, read);
-        assertEquals(new String("bcab"), new String(bytesIn));
+        assertEquals("bcab", new String(bytesIn));
     }
 }
diff --git a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/wait/HttpWaitStrategy.java b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/wait/HttpWaitStrategy.java
index 0304c2047..f41fb3870 100644
--- a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/wait/HttpWaitStrategy.java
+++ b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/wait/HttpWaitStrategy.java
@@ -179,7 +179,7 @@ public class HttpWaitStrategy extends AbstractWaitStrategy {
         if ((tlsEnabled && 443 == livenessCheckPort) || (!tlsEnabled && 80 == livenessCheckPort)) {
             portSuffix = "";
         } else {
-            portSuffix = ":" + String.valueOf(livenessCheckPort);
+            portSuffix = ":" + livenessCheckPort;
         }
         return URI.create(scheme + host + portSuffix + path);
     }
diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/QueryAutoRecoveryStatusCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/QueryAutoRecoveryStatusCommandTest.java
index 8ca2349e7..e08adc0cf 100644
--- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/QueryAutoRecoveryStatusCommandTest.java
+++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/QueryAutoRecoveryStatusCommandTest.java
@@ -22,7 +22,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.CALLS_REAL_METHODS;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.Lists;
diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/WhoIsAuditorCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/WhoIsAuditorCommandTest.java
index aab03b068..14a1c6154 100644
--- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/WhoIsAuditorCommandTest.java
+++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/autorecovery/WhoIsAuditorCommandTest.java
@@ -24,7 +24,6 @@ import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.CALLS_REAL_METHODS;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
 
 import java.util.UUID;
diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/FormatCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/FormatCommandTest.java
index e50362a57..9cd1a9408 100644
--- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/FormatCommandTest.java
+++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/FormatCommandTest.java
@@ -24,8 +24,6 @@ import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockConstruction;
-import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
 
 import org.apache.bookkeeper.bookie.Cookie;
diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/LedgerCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/LedgerCommandTest.java
index 4b229f118..edee29959 100644
--- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/LedgerCommandTest.java
+++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/LedgerCommandTest.java
@@ -21,8 +21,6 @@ package org.apache.bookkeeper.tools.cli.commands.bookie;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockConstruction;
-import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.internal.verification.VerificationModeFactory.times;
diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/SanityTestCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/SanityTestCommandTest.java
index 330e88f4c..e8b011e38 100644
--- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/SanityTestCommandTest.java
+++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/SanityTestCommandTest.java
@@ -25,7 +25,6 @@ import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockConstruction;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookies/InitCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookies/InitCommandTest.java
index 3a4edd83b..75caf11c7 100644
--- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookies/InitCommandTest.java
+++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/bookies/InitCommandTest.java
@@ -19,7 +19,6 @@
 package org.apache.bookkeeper.tools.cli.commands.bookies;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mockStatic;
 
 import org.apache.bookkeeper.client.BookKeeperAdmin;
 import org.apache.bookkeeper.conf.ServerConfiguration;
diff --git a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/cookie/GetCookieCommandTest.java b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/cookie/GetCookieCommandTest.java
index 499f7453e..d91f49ebb 100644
--- a/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/cookie/GetCookieCommandTest.java
+++ b/tools/ledger/src/test/java/org/apache/bookkeeper/tools/cli/commands/cookie/GetCookieCommandTest.java
@@ -97,7 +97,7 @@ public class GetCookieCommandTest extends CookieCommandTestBase {
             .build();
         when(rm.readCookie(eq(BookieId.parse(BOOKIE_ID))))
             .thenReturn(new Versioned<>(cookie.toString().getBytes(UTF_8), new LongVersion(-1L)));
-        assertTrue(runCommand(new String[] { BOOKIE_ID.toString() }));
+        assertTrue(runCommand(new String[] {BOOKIE_ID}));
         String consoleOutput = getConsoleOutput();
         assertTrue(consoleOutput, consoleOutput.contains(cookie.toString()));
         verify(rm, times(1)).readCookie(eq(BookieId.parse(BOOKIE_ID)));
diff --git a/tools/stream/src/main/java/org/apache/bookkeeper/stream/cli/commands/cluster/InitClusterCommand.java b/tools/stream/src/main/java/org/apache/bookkeeper/stream/cli/commands/cluster/InitClusterCommand.java
index 8903ca75f..9d93943d2 100644
--- a/tools/stream/src/main/java/org/apache/bookkeeper/stream/cli/commands/cluster/InitClusterCommand.java
+++ b/tools/stream/src/main/java/org/apache/bookkeeper/stream/cli/commands/cluster/InitClusterCommand.java
@@ -159,8 +159,8 @@ public class InitClusterCommand extends BKCommand<Flags> {
                 null,
                 null);
 
-            String ledgersUri = rootUri.toString() + ledgersPath;
-            String dlogUri = rootUri.toString() + dlogPath;
+            String ledgersUri = rootUri + ledgersPath;
+            String dlogUri = rootUri + dlogPath;
 
             log.info("Initializing cluster {} : \n"
                 + "\tledgers : path = {}, uri = {}\n"