This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push: new 6ab8d07 Fix IDE suggested string usage issues. (#2384) 6ab8d07 is described below commit 6ab8d076c5a98e956864df13ff09709c3bf7663c Author: EdColeman <d...@etcoleman.com> AuthorDate: Wed Dec 15 13:20:06 2021 -0500 Fix IDE suggested string usage issues. (#2384) * Fix IDE suggested string usage issues. Grouping and limiting changes by code inspection type for easier review. All changes made by accepting IDE suggestion. Corrects the following: - replaced redundant call of String.format with out.printf - removed redundant toString calls - removed unnecessary conversion to String - remove unnecessary parens, remove Text, fix format stmts - addressed pr comments --- .../org/apache/accumulo/core/cli/ClientOpts.java | 2 +- .../accumulo/core/client/IteratorSetting.java | 2 +- .../core/client/mapred/AccumuloOutputFormat.java | 2 +- .../client/mapreduce/AccumuloOutputFormat.java | 2 +- .../core/clientImpl/ThriftTransportKey.java | 2 +- .../core/conf/cluster/ClusterConfigParser.java | 15 ++++++-------- .../java/org/apache/accumulo/core/data/Key.java | 4 ++-- .../apache/accumulo/core/file/rfile/PrintInfo.java | 4 ++-- .../accumulo/core/file/rfile/bcfile/BCFile.java | 2 +- .../core/iterators/user/SummingArrayCombiner.java | 2 +- .../core/iterators/user/TimestampFilter.java | 4 ++-- .../accumulo/core/util/format/FormatterConfig.java | 2 +- .../accumulo/core/util/format/HexFormatter.java | 2 +- .../accumulo/minicluster/MiniAccumuloRunner.java | 23 ++++++++++------------ .../accumulo/miniclusterImpl/ProcessReference.java | 3 +-- .../apache/accumulo/server/util/DumpZookeeper.java | 2 +- .../apache/accumulo/server/util/LocalityCheck.java | 4 ++-- .../org/apache/accumulo/server/util/AdminTest.java | 2 +- .../accumulo/server/util/TServerUtilsTest.java | 4 ++-- .../apache/accumulo/manager/state/MergeStats.java | 4 ++-- .../org/apache/accumulo/monitor/view/WebViews.java | 5 ++--- .../accumulo/tserver/ThriftClientHandler.java | 2 +- .../tserver/compactions/PrintableTable.java | 2 +- .../main/java/org/apache/accumulo/shell/Shell.java | 2 +- .../accumulo/shell/commands/ListIterCommand.java | 2 +- .../shell/commands/ListShellIterCommand.java | 2 +- .../accumulo/shell/commands/MaxRowCommand.java | 2 +- .../accumulo/harness/SharedMiniClusterBase.java | 2 +- .../org/apache/accumulo/test/AuditMessageIT.java | 6 ++---- .../org/apache/accumulo/test/GetManagerStats.java | 4 ++-- .../java/org/apache/accumulo/test/ShellIT.java | 4 ++-- .../apache/accumulo/test/TestMultiTableIngest.java | 3 +-- .../org/apache/accumulo/test/TotalQueuedIT.java | 10 ++++------ .../org/apache/accumulo/test/YieldScannersIT.java | 6 ++---- .../test/fate/zookeeper/ServiceLockIT.java | 2 +- .../accumulo/test/fate/zookeeper/ZooMutatorIT.java | 2 +- .../apache/accumulo/test/functional/TabletIT.java | 3 +-- .../accumulo/test/functional/YieldingIterator.java | 3 +-- 38 files changed, 66 insertions(+), 83 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java index 37ae416..296728d 100644 --- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java +++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java @@ -187,7 +187,7 @@ public class ClientOpts extends Help { if (legacyClientOpts.contains(arg)) badOptions.append(arg).append(" "); } - throw new IllegalArgumentException("The Client options: " + badOptions.toString() + throw new IllegalArgumentException("The Client options: " + badOptions + "have been dropped. Use accumulo-client.properties for any connection or token " + "options. See '-c, --config-file' option."); } diff --git a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java index b90f691..6077218 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java +++ b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java @@ -340,7 +340,7 @@ public class IteratorSetting implements Writable { sb.append("name:"); sb.append(name); sb.append(", priority:"); - sb.append(Integer.toString(priority)); + sb.append(priority); sb.append(", class:"); sb.append(iteratorClass); sb.append(", properties:"); diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java index ec49c81..ff89a4f 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java @@ -521,7 +521,7 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> { log.trace(String.format("Table %s column: %s:%s", table, hexDump(cu.getColumnFamily()), hexDump(cu.getColumnQualifier()))); log.trace(String.format("Table %s security: %s", table, - new ColumnVisibility(cu.getColumnVisibility()).toString())); + new ColumnVisibility(cu.getColumnVisibility()))); log.trace(String.format("Table %s value: %s", table, hexDump(cu.getValue()))); } } diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java index 4444b28..018d7e4 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java @@ -522,7 +522,7 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> { log.trace(String.format("Table %s column: %s:%s", table, hexDump(cu.getColumnFamily()), hexDump(cu.getColumnQualifier()))); log.trace(String.format("Table %s security: %s", table, - new ColumnVisibility(cu.getColumnVisibility()).toString())); + new ColumnVisibility(cu.getColumnVisibility()))); log.trace(String.format("Table %s value: %s", table, hexDump(cu.getValue()))); } } diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportKey.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportKey.java index a7bf5b6..2f56a6f 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportKey.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportKey.java @@ -109,7 +109,7 @@ public class ThriftTransportKey { } else if (isSasl()) { prefix = saslParams + ":"; } - return prefix + server + " (" + Long.toString(timeout) + ")"; + return prefix + server + " (" + timeout + ")"; } public SslConnectionParams getSslParams() { diff --git a/core/src/main/java/org/apache/accumulo/core/conf/cluster/ClusterConfigParser.java b/core/src/main/java/org/apache/accumulo/core/conf/cluster/ClusterConfigParser.java index 2f66b37..ad275f0 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/cluster/ClusterConfigParser.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/cluster/ClusterConfigParser.java @@ -35,7 +35,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; public class ClusterConfigParser { - private static final String PROPERTY_FORMAT = "%s=\"%s\""; + private static final String PROPERTY_FORMAT = "%s=\"%s\"%n"; private static final String[] SECTIONS = new String[] {"manager", "monitor", "gc", "tserver"}; @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "paths not set by user input") @@ -83,8 +83,7 @@ public class ClusterConfigParser { public static void outputShellVariables(Map<String,String> config, PrintStream out) { for (String section : SECTIONS) { if (config.containsKey(section)) { - out.println( - String.format(PROPERTY_FORMAT, section.toUpperCase() + "_HOSTS", config.get(section))); + out.printf(PROPERTY_FORMAT, section.toUpperCase() + "_HOSTS", config.get(section)); } else { if (section.equals("manager") || section.equals("tserver")) { throw new RuntimeException("Required configuration section is missing: " + section); @@ -94,20 +93,18 @@ public class ClusterConfigParser { } if (config.containsKey("compaction.coordinator")) { - out.println(String.format(PROPERTY_FORMAT, "COORDINATOR_HOSTS", - config.get("compaction.coordinator"))); + out.printf(PROPERTY_FORMAT, "COORDINATOR_HOSTS", config.get("compaction.coordinator")); } if (config.containsKey("compaction.compactor.queue")) { - out.println(String.format(PROPERTY_FORMAT, "COMPACTION_QUEUES", - config.get("compaction.compactor.queue"))); + out.printf(PROPERTY_FORMAT, "COMPACTION_QUEUES", config.get("compaction.compactor.queue")); } String queues = config.get("compaction.compactor.queue"); if (StringUtils.isNotEmpty(queues)) { String[] q = queues.split(" "); for (int i = 0; i < q.length; i++) { if (config.containsKey("compaction.compactor." + q[i])) { - out.println(String.format(PROPERTY_FORMAT, "COMPACTOR_HOSTS_" + q[i], - config.get("compaction.compactor." + q[i]))); + out.printf(PROPERTY_FORMAT, "COMPACTOR_HOSTS_" + q[i], + config.get("compaction.compactor." + q[i])); } } } diff --git a/core/src/main/java/org/apache/accumulo/core/data/Key.java b/core/src/main/java/org/apache/accumulo/core/data/Key.java index c0246d7..ab8c7b1 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/Key.java +++ b/core/src/main/java/org/apache/accumulo/core/data/Key.java @@ -1153,7 +1153,7 @@ public class Key implements WritableComparable<Key>, Cloneable { public String toString() { StringBuilder sb = rowColumnStringBuilder(); sb.append(" "); - sb.append(Long.toString(timestamp)); + sb.append(timestamp); sb.append(" "); sb.append(deleted); return sb.toString(); @@ -1168,7 +1168,7 @@ public class Key implements WritableComparable<Key>, Cloneable { public String toStringNoTruncate() { StringBuilder sb = rowColumnStringBuilder(Integer.MAX_VALUE); sb.append(" "); - sb.append(Long.toString(timestamp)); + sb.append(timestamp); sb.append(" "); sb.append(deleted); return sb.toString(); diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java index 3728dd3..87f09a4 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java @@ -109,9 +109,9 @@ public class PrintInfo implements KeywordExecutable { public void print(String indent) { System.out.println(indent + "Up to size Count %-age"); for (int i = 1; i < countBuckets.length; i++) { - System.out.println(String.format("%s%11s : %10d %6.2f%%", indent, + System.out.printf("%s%11s : %10d %6.2f%%%n", indent, NumUtil.bigNumberForQuantity((long) Math.pow(10, i)), countBuckets[i], - sizeBuckets[i] * 100. / totalSize)); + sizeBuckets[i] * 100. / totalSize); } } } diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java index eddf315..c1e3b23 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java @@ -610,7 +610,7 @@ public final class BCFile { // Do a version check - API_VERSION_2 used experimental crypto parameters, no longer supported if (!version.compatibleWith(BCFile.API_VERSION_3) && !version.compatibleWith(BCFile.API_VERSION_1)) { - throw new IOException("Unsupported BCFile Version found: " + version.toString() + ". " + throw new IOException("Unsupported BCFile Version found: " + version + ". " + "Only support " + API_VERSION_1 + " or " + API_VERSION_3); } diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java index facfc17..80f72f2 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java @@ -225,7 +225,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> { StringBuilder sb = new StringBuilder(Long.toString(la.get(0))); for (int i = 1; i < la.size(); i++) { sb.append(","); - sb.append(Long.toString(la.get(i))); + sb.append(la.get(i)); } return sb.toString().getBytes(UTF_8); } diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java index 5c67581..efeee4b 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java @@ -289,7 +289,7 @@ public class TimestampFilter extends Filter { * boolean indicating whether the start is inclusive */ public static void setStart(IteratorSetting is, long start, boolean startInclusive) { - is.addOption(START, LONG_PREFIX + Long.toString(start)); + is.addOption(START, LONG_PREFIX + start); is.addOption(START_INCL, Boolean.toString(startInclusive)); } @@ -304,7 +304,7 @@ public class TimestampFilter extends Filter { * boolean indicating whether the end is inclusive */ public static void setEnd(IteratorSetting is, long end, boolean endInclusive) { - is.addOption(END, LONG_PREFIX + Long.toString(end)); + is.addOption(END, LONG_PREFIX + end); is.addOption(END_INCL, Boolean.toString(endInclusive)); } } diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/FormatterConfig.java b/core/src/main/java/org/apache/accumulo/core/util/format/FormatterConfig.java index ef3164a..868ad8b 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/format/FormatterConfig.java +++ b/core/src/main/java/org/apache/accumulo/core/util/format/FormatterConfig.java @@ -42,7 +42,7 @@ public class FormatterConfig { @Override public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { - toAppendTo.append(Long.toString(date.getTime())); + toAppendTo.append(date.getTime()); return toAppendTo; } diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java index 5bb4095..01eca4e 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java +++ b/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java @@ -92,7 +92,7 @@ public class HexFormatter implements Formatter, ScanInterpreter { sb.append(entry.getKey().getColumnVisibilityData()); sb.append("] "); if (config.willPrintTimestamps()) { - sb.append(Long.toString(entry.getKey().getTimestamp())); + sb.append(entry.getKey().getTimestamp()); sb.append(" "); } toHex(sb, entry.getValue().get()); diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java index 7eccfed..014e4c3 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java @@ -134,7 +134,7 @@ public class MiniAccumuloRunner { } } - private static final String FORMAT_STRING = " %-21s %s"; + private static final String FORMAT_STRING = " %-21s %s%n"; public static class Opts extends Help { @Parameter(names = "-p", required = false, description = "properties file name", @@ -288,22 +288,19 @@ public class MiniAccumuloRunner { private static void printInfo(MiniAccumuloCluster accumulo, int shutdownPort) { System.out.println("Mini Accumulo Cluster\n"); - System.out.println(String.format(FORMAT_STRING, "Directory:", - accumulo.getConfig().getDir().getAbsoluteFile())); - System.out.println(String.format(FORMAT_STRING, "Logs:", - accumulo.getConfig().getImpl().getLogDir().getAbsoluteFile())); - System.out.println( - String.format(FORMAT_STRING, "Instance Name:", accumulo.getConfig().getInstanceName())); - System.out.println( - String.format(FORMAT_STRING, "Root Password:", accumulo.getConfig().getRootPassword())); - System.out.println(String.format(FORMAT_STRING, "ZooKeeper:", accumulo.getZooKeepers())); + System.out.printf(FORMAT_STRING, "Directory:", accumulo.getConfig().getDir().getAbsoluteFile()); + System.out.printf(FORMAT_STRING, "Logs:", + accumulo.getConfig().getImpl().getLogDir().getAbsoluteFile()); + System.out.printf(FORMAT_STRING, "Instance Name:", accumulo.getConfig().getInstanceName()); + System.out.printf(FORMAT_STRING, "Root Password:", accumulo.getConfig().getRootPassword()); + System.out.printf(FORMAT_STRING, "ZooKeeper:", accumulo.getZooKeepers()); for (Pair<ServerType,Integer> pair : accumulo.getDebugPorts()) { - System.out.println(String.format(FORMAT_STRING, pair.getFirst().prettyPrint() + " JDWP Host:", - "localhost:" + pair.getSecond())); + System.out.printf(FORMAT_STRING, pair.getFirst().prettyPrint() + " JDWP Host:", + "localhost:" + pair.getSecond()); } - System.out.println(String.format(FORMAT_STRING, "Shutdown Port:", shutdownPort)); + System.out.printf(FORMAT_STRING, "Shutdown Port:", shutdownPort); System.out.println(); System.out.println(" To connect with shell, use the following command : "); diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/ProcessReference.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/ProcessReference.java index feeb426..9a624fc 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/ProcessReference.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/ProcessReference.java @@ -52,7 +52,6 @@ public class ProcessReference { if (obj instanceof ProcessReference) { return getProcess().equals(((ProcessReference) obj).getProcess()); } - throw new IllegalArgumentException( - String.valueOf(obj) + " is not of type " + this.getClass().getName()); + throw new IllegalArgumentException(obj + " is not of type " + this.getClass().getName()); } } diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java index abb24eb..c315765 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java @@ -129,7 +129,7 @@ public class DumpZookeeper { for (int i = 0; i < indent; i++) { out.print(" "); } - out.println(String.format(fmt, args)); + out.printf(fmt + "%n", args); } private static void writeHumanReadable(PrintStream out, String root) diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java index 096ce1c..a1ff119 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java @@ -83,8 +83,8 @@ public class LocalityCheck { for (Entry<String,Long> entry : totalBlocks.entrySet()) { final String host = entry.getKey(); final Long blocksForHost = entry.getValue(); - System.out.println(String.format("%15s %5.1f %8d", host, - (localBlocks.get(host) * 100.) / blocksForHost, blocksForHost)); + System.out.printf("%15s %5.1f %8d%n", host, localBlocks.get(host) * 100.0 / blocksForHost, + blocksForHost); } } return 0; diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java index 7574bb4..1197788 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java @@ -56,7 +56,7 @@ public class AdminTest { final long session = 123456789L; String serverPath = root + "/" + server; - String validZLockEphemeralNode = "zlock#" + UUID.randomUUID().toString() + "#0000000000"; + String validZLockEphemeralNode = "zlock#" + UUID.randomUUID() + "#0000000000"; EasyMock.expect(zc.getChildren(serverPath)) .andReturn(Collections.singletonList(validZLockEphemeralNode)); EasyMock.expect(zc.get(EasyMock.eq(serverPath + "/" + validZLockEphemeralNode), diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java index ba084a1..2dda0c3 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java @@ -276,7 +276,7 @@ public class TServerUtilsTest { public void testStartServerPortRange() throws Exception { TServer server = null; int[] port = findTwoFreeSequentialPorts(1024); - String portRange = Integer.toString(port[0]) + "-" + Integer.toString(port[1]); + String portRange = port[0] + "-" + port[1]; conf.set(Property.TSERV_CLIENTPORT, portRange); try { ServerAddress address = startServer(); @@ -298,7 +298,7 @@ public class TServerUtilsTest { TServer server = null; InetAddress addr = InetAddress.getByName("localhost"); int[] port = findTwoFreeSequentialPorts(1024); - String portRange = Integer.toString(port[0]) + "-" + Integer.toString(port[1]); + String portRange = port[0] + "-" + port[1]; // Bind to the port conf.set(Property.TSERV_CLIENTPORT, portRange); try (ServerSocket s = new ServerSocket(port[0], 50, addr)) { diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/state/MergeStats.java b/server/manager/src/main/java/org/apache/accumulo/manager/state/MergeStats.java index b667b6a..12ecbb3 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/state/MergeStats.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/state/MergeStats.java @@ -281,8 +281,8 @@ public class MergeStats { in.reset(data, data.length); info.readFields(in); } - System.out.println(String.format("%25s %10s %10s %s", table, info.getState(), - info.getOperation(), info.getExtent())); + System.out.printf("%25s %10s %10s %s%n", table, info.getState(), info.getOperation(), + info.getExtent()); } } } finally { diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java index c545da2..9fa330d 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java @@ -328,7 +328,7 @@ public class WebViews { public Map<String,Object> getTracesSummary( @QueryParam("minutes") @DefaultValue("10") @Min(0) @Max(2592000) int minutes) { Map<String,Object> model = getModel(); - model.put("title", "Traces for the last " + String.valueOf(minutes) + " minute(s)"); + model.put("title", "Traces for the last " + minutes + " minute(s)"); model.put("template", "summary.ftl"); model.put("js", "summary.js"); @@ -353,8 +353,7 @@ public class WebViews { @QueryParam("type") @NotNull @Pattern(regexp = RESOURCE_REGEX) String type, @QueryParam("minutes") @DefaultValue("10") @Min(0) @Max(2592000) int minutes) { Map<String,Object> model = getModel(); - model.put("title", - "Traces for " + type + " for the last " + String.valueOf(minutes) + " minute(s)"); + model.put("title", "Traces for " + type + " for the last " + minutes + " minute(s)"); model.put("template", "listType.ftl"); model.put("js", "listType.js"); diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java index dd97375..f67881b 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java @@ -912,7 +912,7 @@ public class ThriftClientHandler extends ClientServiceHandler implements TabletC log.trace( String.format("UpSess %s %,d in %.3fs, at=[%s] ft=%.3fs(pt=%.3fs lt=%.3fs ct=%.3fs)", TServerUtils.clientAddress.get(), us.totalUpdates, - (System.currentTimeMillis() - us.startTime) / 1000.0, us.authTimes.toString(), + (System.currentTimeMillis() - us.startTime) / 1000.0, us.authTimes, us.flushTime / 1000.0, us.prepareTimes.sum() / 1000.0, us.walogTimes.sum() / 1000.0, us.commitTimes.sum() / 1000.0)); } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/PrintableTable.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/PrintableTable.java index 74c522a..19de547 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/PrintableTable.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/PrintableTable.java @@ -92,6 +92,6 @@ public class PrintableTable { int[][] data = {{0, 3, 1, 0, 0, 0}, {2, 0, 0, 0, 0, 0}, {2, 0, 4, 0, 0, 0}}; - System.out.println(new PrintableTable(columns, rows, data).toString()); + System.out.println(new PrintableTable(columns, rows, data)); } } diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java index 8c595be..058e09e 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java +++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java @@ -662,7 +662,7 @@ public class Shell extends ShellOptions implements KeywordExecutable { } } sb.append("-\n"); - writer.print(sb.toString()); + writer.print(sb); } public String getDefaultPrompt() { diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java index 617fbe0..e7942cd 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListIterCommand.java @@ -107,7 +107,7 @@ public class ListIterCommand extends Command { } } sb.append("-"); - shellState.getWriter().println(sb.toString()); + shellState.getWriter().println(sb); return 0; } diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java index 29b3d76..31f5822 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java @@ -76,7 +76,7 @@ public class ListShellIterCommand extends Command { sb.append("-\n"); } - shellState.getWriter().print(sb.toString()); + shellState.getWriter().print(sb); return 0; } diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java index c6a11ee..070fa62 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java @@ -47,7 +47,7 @@ public class MaxRowCommand extends ScanCommand { final Text max = shellState.getAccumuloClient().tableOperations().getMaxRow(tableName, auths, startRow, range.isStartKeyInclusive(), endRow, range.isEndKeyInclusive()); if (max != null) { - shellState.getWriter().println(max.toString()); + shellState.getWriter().println(max); } } catch (Exception e) { log.debug("Could not get shell state.", e); diff --git a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java index de017e9..f453d04 100644 --- a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java +++ b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java @@ -124,7 +124,7 @@ public abstract class SharedMiniClusterBase extends AccumuloITBase implements Cl Optional<String> callerClassName = StackWalker.getInstance(RETAIN_CLASS_REFERENCE).walk(findCallerITClass).map(Class::getName); // use the calling class name, or default to a unique name if IT class can't be found - return callerClassName.orElse(String.format("UnknownITClass-{}-{}", System.currentTimeMillis(), + return callerClassName.orElse(String.format("UnknownITClass-%d-%s", System.currentTimeMillis(), random.nextInt(Short.MAX_VALUE))); } diff --git a/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java b/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java index eb614f6..fa08b38 100644 --- a/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java +++ b/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java @@ -359,10 +359,8 @@ public class AuditMessageIT extends ConfigurableMacBase { findAuditMessage(auditMessages, String.format(AuditedSecurityOperation.CAN_ONLINE_OFFLINE_TABLE_AUDIT_TEMPLATE, "offlineTable", OLD_TEST_TABLE_NAME))); - assertEquals(1, - findAuditMessage(auditMessages, - String.format(AuditedSecurityOperation.CAN_EXPORT_AUDIT_TEMPLATE, OLD_TEST_TABLE_NAME, - exportDir.toString()))); + assertEquals(1, findAuditMessage(auditMessages, String.format( + AuditedSecurityOperation.CAN_EXPORT_AUDIT_TEMPLATE, OLD_TEST_TABLE_NAME, exportDir))); assertEquals(1, findAuditMessage(auditMessages, String.format(AuditedSecurityOperation.CAN_IMPORT_AUDIT_TEMPLATE, NEW_TEST_TABLE_NAME, diff --git a/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java b/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java index c54c3df..fb1063b 100644 --- a/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java +++ b/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java @@ -148,11 +148,11 @@ public class GetManagerStats { } } - private static void out(int indent, String string, Object... args) { + private static void out(int indent, String fmtString, Object... args) { for (int i = 0; i < indent; i++) { System.out.print(" "); } - System.out.println(String.format(string, args)); + System.out.printf(fmtString + "%n", args); } } diff --git a/test/src/main/java/org/apache/accumulo/test/ShellIT.java b/test/src/main/java/org/apache/accumulo/test/ShellIT.java index 86c9cb7..5a8b7a7 100644 --- a/test/src/main/java/org/apache/accumulo/test/ShellIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ShellIT.java @@ -583,9 +583,9 @@ public class ShellIT extends SharedMiniClusterBase { } private void createTables(final int limit, final int modifier) throws IOException { - String tableModifier = "x" + Integer.toString(modifier); + String tableModifier = "x" + modifier; for (int i = 0; i < limit; i++) { - exec("createtable tabx" + Integer.toString(i) + tableModifier); + exec("createtable tabx" + i + tableModifier); } } diff --git a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java index ff2f166..8a18bba 100644 --- a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java +++ b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java @@ -95,8 +95,7 @@ public class TestMultiTableIngest { // populate for (int i = 0; i < opts.count; i++) { Mutation m = new Mutation(new Text(String.format("%06d", i))); - m.put(new Text("col" + Integer.toString((i % 3) + 1)), new Text("qual"), - new Value("junk")); + m.put("col" + ((i % 3) + 1), "qual", "junk"); b.getBatchWriter(tableNames.get(i % tableNames.size())).addMutation(m); } try { diff --git a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java index 2bc62bc..ccc67eb 100644 --- a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java @@ -89,9 +89,8 @@ public class TotalQueuedIT extends ConfigurableMacBase { double secs = diff / 1000.; double syncs = bytesSent / SMALL_QUEUE_SIZE; double syncsPerSec = syncs / secs; - System.out.println( - String.format("Sent %d bytes in %f secs approximately %d syncs (%f syncs per sec)", - bytesSent, secs, ((long) syncs), syncsPerSec)); + System.out.printf("Sent %d bytes in %f secs approximately %d syncs (%f syncs per sec)%n", + bytesSent, secs, ((long) syncs), syncsPerSec); long update = getSyncs(c); System.out.println("Syncs " + (update - realSyncs)); realSyncs = update; @@ -116,9 +115,8 @@ public class TotalQueuedIT extends ConfigurableMacBase { secs = diff / 1000.; syncs = bytesSent / LARGE_QUEUE_SIZE; syncsPerSec = syncs / secs; - System.out.println( - String.format("Sent %d bytes in %f secs approximately %d syncs (%f syncs per sec)", - bytesSent, secs, ((long) syncs), syncsPerSec)); + System.out.printf("Sent %d bytes in %f secs approximately %d syncs (%f syncs per sec)%n", + bytesSent, secs, ((long) syncs), syncsPerSec); update = getSyncs(c); System.out.println("Syncs " + (update - realSyncs)); assertTrue(update - realSyncs < realSyncs); diff --git a/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java b/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java index 7235908..857af30 100644 --- a/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java @@ -88,8 +88,7 @@ public class YieldScannersIT extends AccumuloClusterHarness { int yieldSeekCount = 0; while (it.hasNext()) { Map.Entry<Key,Value> next = it.next(); - log.info(Integer.toString(keyCount) + ": Got key " + next.getKey() + " with value " - + next.getValue()); + log.info(keyCount + ": Got key " + next.getKey() + " with value " + next.getValue()); // verify we got the expected key char expected = (char) (START_ROW + keyCount); @@ -144,8 +143,7 @@ public class YieldScannersIT extends AccumuloClusterHarness { int yieldSeekCount = 0; while (it.hasNext()) { Map.Entry<Key,Value> next = it.next(); - log.info(Integer.toString(keyCount) + ": Got key " + next.getKey() + " with value " - + next.getValue()); + log.info(keyCount + ": Got key " + next.getKey() + " with value " + next.getValue()); // verify we got the expected key char expected = (char) (START_ROW + keyCount); diff --git a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ServiceLockIT.java b/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ServiceLockIT.java index dfd700c..28c90b7 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ServiceLockIT.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ServiceLockIT.java @@ -65,7 +65,7 @@ public class ServiceLockIT { @BeforeClass public static void setup() throws Exception { szk = new ZooKeeperTestingServer(); - szk.initPaths("/accumulo/" + UUID.randomUUID().toString()); + szk.initPaths("/accumulo/" + UUID.randomUUID()); } @AfterClass diff --git a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooMutatorIT.java b/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooMutatorIT.java index 27e3b7f..18cc386 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooMutatorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ZooMutatorIT.java @@ -75,7 +75,7 @@ public class ZooMutatorIT { public void concurrentMutatorTest() throws Exception { try (ZooKeeperTestingServer szk = new ZooKeeperTestingServer()) { - szk.initPaths("/accumulo/" + UUID.randomUUID().toString()); + szk.initPaths("/accumulo/" + UUID.randomUUID()); ZooReaderWriter zk = new ZooReaderWriter(szk.getConn(), 10_0000, "aPasswd"); var executor = Executors.newFixedThreadPool(16); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java index 060a24d..6d224e4 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java @@ -85,8 +85,7 @@ public class TabletIT extends AccumuloClusterHarness { // populate for (int i = 0; i < N; i++) { Mutation m = new Mutation(new Text(String.format("%05d", i))); - m.put(new Text("col" + Integer.toString((i % 3) + 1)), new Text("qual"), - new Value("junk")); + m.put("col" + ((i % 3) + 1), "qual", "junk"); b.addMutation(m); } } diff --git a/test/src/main/java/org/apache/accumulo/test/functional/YieldingIterator.java b/test/src/main/java/org/apache/accumulo/test/functional/YieldingIterator.java index fcfa229..0e1d2bc 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/YieldingIterator.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/YieldingIterator.java @@ -95,8 +95,7 @@ public class YieldingIterator extends WrappingIterator { */ @Override public Value getTopValue() { - String value = Integer.toString(yieldNexts.get()) + ',' + Integer.toString(yieldSeeks.get()) - + ',' + Integer.toString(rebuilds.get()); + String value = yieldNexts.get() + "," + yieldSeeks.get() + "," + rebuilds.get(); return new Value(value); }