From 1e28557ce2ae8f45493c652cfc68f3217616cc40 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 31 Jan 2023 07:31:02 -0500 Subject: [PATCH] cleanup buf.append(s.substring(a, b)) -> buf.append(s, a, b) all over, for object churn --- .../java/src/net/i2p/addressbook/Daemon.java | 2 +- .../net/i2p/router/web/helpers/FileDumpHelper.java | 2 +- .../net/i2p/router/web/helpers/NetDbRenderer.java | 14 +++++++------- .../net/i2p/router/web/helpers/SummaryHelper.java | 2 +- .../net/i2p/client/streaming/impl/PacketLocal.java | 4 ++-- .../src/i2p/susi/webmail/encoding/HeaderLine.java | 2 +- .../src/net/i2p/client/impl/I2PSessionImpl.java | 2 +- core/java/src/net/i2p/util/Addresses.java | 4 ++-- .../net/i2p/router/peermanager/PeerTestJob.java | 2 +- .../i2p/router/transport/udp/PacketBuilder.java | 2 +- .../net/i2p/router/transport/udp/PeerState.java | 2 +- .../i2p/router/transport/udp/PeerTestState.java | 4 ++-- .../net/i2p/router/tunnel/FragmentedMessage.java | 2 +- .../java/src/net/i2p/router/tunnel/HopConfig.java | 2 +- .../net/i2p/router/tunnel/TunnelCreatorConfig.java | 2 +- .../src/net/i2p/router/tunnel/pool/TunnelPool.java | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java index f6cb505a0..2eaa54881 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java @@ -697,7 +697,7 @@ class Daemon { StringBuilder buf = new StringBuilder(16); final int sz = dests.size(); for (int i = 0; i < sz; i++) { - buf.append(dests.get(i).toBase64().substring(0, 6)); + buf.append(dests.get(i).toBase64(), 0, 6); if (i != sz - 1) buf.append(", "); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/FileDumpHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/FileDumpHelper.java index 769ea4e70..95111513f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/FileDumpHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/FileDumpHelper.java @@ -147,7 +147,7 @@ public class FileDumpHelper extends HelperBase { buf.append("
"); if (linkrev) buf.append(""); - buf.append("").append(s.substring(0, 20)).append("" + + buf.append("").append(s, 0, 20).append("" + "
" + "").append(s.substring(20)).append(""); if (linkrev) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java index 751c6af59..20bfe1417 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java @@ -730,7 +730,7 @@ class NetDbRenderer { buf.append(" (").append(_t("Encrypted")).append(")"); buf.append(""); if (_context.clientManager().isLocal(key)) { - buf.append("" + _t("Local") + " "); + buf.append("").append(_t("Local")).append(" "); boolean unpublished = ! _context.clientManager().shouldPublishLeaseSet(key); if (unpublished) buf.append("").append(_t("Unpublished")).append(" "); @@ -739,7 +739,7 @@ class NetDbRenderer { if (in != null && in.getDestinationNickname() != null) buf.append(DataHelper.escapeHTML(in.getDestinationNickname())); else - buf.append(dest.toBase64().substring(0, 6)); + buf.append(dest.toBase64(), 0, 6); buf.append("\n"); // we don't show a b32 or addressbook links if encrypted if (type != DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2) { @@ -772,7 +772,7 @@ class NetDbRenderer { String b32 = key.toBase32(); buf.append(""); if (dest != null) - buf.append(dest.toBase64().substring(0, 6)); + buf.append(dest.toBase64(), 0, 6); else buf.append("n/a"); buf.append("" + @@ -839,7 +839,7 @@ class NetDbRenderer { } if (type == DatabaseEntry.KEY_TYPE_LEASESET) { buf.append("\nEncryption Key: ELGAMAL_2048 ") - .append(ls.getEncryptionKey().toBase64().substring(0, 20)) + .append(ls.getEncryptionKey().toBase64(), 0, 20) .append("…"); } else if (type == DatabaseEntry.KEY_TYPE_LS2) { LeaseSet2 ls2 = (LeaseSet2) ls; @@ -851,7 +851,7 @@ class NetDbRenderer { else buf.append("Unsupported type ").append(pk.getUnknownTypeCode()); buf.append(' ') - .append(pk.toBase64().substring(0, 20)) + .append(pk.toBase64(), 0, 20) .append("…"); } } @@ -1183,7 +1183,7 @@ class NetDbRenderer { private void renderRouterInfo(StringBuilder buf, RouterInfo info, boolean isUs, boolean full) { String hash = info.getIdentity().getHash().toBase64(); buf.append("" + - "
").append(_t("Our Router Identity")).append(": ") .append(hash).append(""); @@ -1199,7 +1199,7 @@ class NetDbRenderer { } if (!full) { buf.append("[").append(_t("Full entry")).append("]"); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java index 98eacce49..3ee38368a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java @@ -635,7 +635,7 @@ public class SummaryHelper extends HelperBase { buf.append("server.png\" alt=\"Server\" title=\"").append(_t("Hidden Service")).append("\">"); else buf.append("client.png\" alt=\"Client\" title=\"").append(_t("Client")).append("\">"); - buf.append(""); // Increase permitted max length of tunnel name & handle overflow with css if (name.length() <= 32) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java index 3975f49e1..f99d6bb97 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java @@ -309,14 +309,14 @@ class PacketLocal extends Packet implements MessageOutputStream.WriteStatus { buf.append(" from "); Destination local = _session.getMyDestination(); if (local != null) - buf.append(local.calculateHash().toBase64().substring(0,4)); + buf.append(local.calculateHash().toBase64(), 0, 4); else buf.append("unknown"); buf.append(" to "); Destination remote = con.getRemotePeer(); if (remote != null) - buf.append(remote.calculateHash().toBase64().substring(0,4)); + buf.append(remote.calculateHash().toBase64(), 0, 4); else buf.append("unknown"); diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java index c1fa04f3a..f97dfac88 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java @@ -159,7 +159,7 @@ public class HeaderLine extends Encoding { return str + "\r\n"; // Output encoded. StringBuilder out = new StringBuilder(); - out.append(str.substring(0, l)); + out.append(str, 0, l); int start = l; StringBuilder qc = new StringBuilder(16); for (int i = start; i < str.length(); i++) { diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java index 1d18b48b7..b08a3e8b0 100644 --- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java @@ -1935,7 +1935,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 StringBuilder buf = new StringBuilder(32); buf.append("Session: "); if (_myDestination != null) - buf.append(_myDestination.calculateHash().toBase64().substring(0, 4)); + buf.append(_myDestination.calculateHash().toBase64(), 0, 4); else buf.append("[null dest]"); buf.append(getPrefix()); diff --git a/core/java/src/net/i2p/util/Addresses.java b/core/java/src/net/i2p/util/Addresses.java index 75e24d042..423a434b1 100644 --- a/core/java/src/net/i2p/util/Addresses.java +++ b/core/java/src/net/i2p/util/Addresses.java @@ -935,7 +935,7 @@ public abstract class Addresses { buf.setLength(0); int i = 0; while(true) { - buf.append(as.substring(i, i+4)); + buf.append(as, i, i+4); i += 4; if (i >= 32) break; @@ -1130,7 +1130,7 @@ public abstract class Addresses { for (String m : _macCache) { int i = 0; while(true) { - buf.append(m.substring(i, i+2)); + buf.append(m, i, i+2); i += 2; if (i >= 12) break; diff --git a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java index 83cc554a4..96335aecd 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java +++ b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java @@ -228,7 +228,7 @@ class PeerTestJob extends JobImpl { @Override public String toString() { StringBuilder buf = new StringBuilder(64); - buf.append("Test peer ").append(_peer.toBase64().substring(0,4)); + buf.append("Test peer ").append(_peer.toBase64(), 0, 4); buf.append(" with nonce ").append(_nonce); return buf.toString(); } diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java index b2421df82..ed7518ee1 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java @@ -613,7 +613,7 @@ class PacketBuilder { StringBuilder msg = null; if (_log.shouldLog(Log.DEBUG)) { msg = new StringBuilder(128); - msg.append("building ACK packet to ").append(peer.getRemotePeer().toBase64().substring(0,6)); + msg.append("building ACK packet to ").append(peer.getRemotePeer().toBase64(), 0, 6); } int fullACKCount = 0; diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java index c51a66050..8d2ebe9e5 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java @@ -2447,7 +2447,7 @@ public class PeerState { public String toString() { StringBuilder buf = new StringBuilder(256); buf.append(_remoteHostId.toString()); - buf.append(' ').append(_remotePeer.toBase64().substring(0,6)); + buf.append(' ').append(_remotePeer.toBase64(), 0, 6); if (getVersion() == 2) buf.append(_isInbound? " IB2 " : " OB2 "); diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestState.java b/router/java/src/net/i2p/router/transport/udp/PeerTestState.java index da1602386..d9b93177c 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerTestState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerTestState.java @@ -266,7 +266,7 @@ class PeerTestState { buf.append("me "); buf.append(_aliceIP).append(':').append(_alicePort); if (_aliceHash != null) - buf.append(' ').append(_aliceHash.toBase64().substring(0, 6)); + buf.append(' ').append(_aliceHash.toBase64(), 0, 6); } if (_aliceIPFromCharlie != null) buf.append(" (fromCharlie ").append(_aliceIPFromCharlie).append(':').append(_alicePortFromCharlie).append(')'); @@ -281,7 +281,7 @@ class PeerTestState { } else { buf.append(_charlieIP).append(':').append(_charliePort); if (_charlieHash != null) - buf.append(' ').append(_charlieHash.toBase64().substring(0, 6)); + buf.append(' ').append(_charlieHash.toBase64(), 0, 6); } if (_previousCharlies != null && !_previousCharlies.isEmpty()) buf.append(" previous: ").append(_previousCharlies); diff --git a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java index ad98c8e5a..5b56189bf 100644 --- a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java +++ b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java @@ -290,7 +290,7 @@ class FragmentedMessage { buf.append(" last received? ").append(_lastReceived); buf.append(" lifetime: ").append(DataHelper.formatDuration(_context.clock().now()-_createdOn)); if (_toRouter != null) { - buf.append(" targetting ").append(_toRouter.toBase64().substring(0,4)); + buf.append(" targetting ").append(_toRouter.toBase64(), 0, 4); if (_toTunnel != null) buf.append(":").append(_toTunnel.getTunnelId()); } diff --git a/router/java/src/net/i2p/router/tunnel/HopConfig.java b/router/java/src/net/i2p/router/tunnel/HopConfig.java index dabe7045e..c2fe9d353 100644 --- a/router/java/src/net/i2p/router/tunnel/HopConfig.java +++ b/router/java/src/net/i2p/router/tunnel/HopConfig.java @@ -181,7 +181,7 @@ public class HopConfig { buf.append(_receiveTunnel.getTunnelId()); } if (_sendTo != null) { - buf.append(" send to ").append(_sendTo.toBase64().substring(0,4)).append(":"); + buf.append(" send to ").append(_sendTo.toBase64(), 0, 4).append(":"); if (_sendTunnel != null) buf.append(_sendTunnel.getTunnelId()); } diff --git a/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java index d6ff95104..2efdcd85f 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java @@ -392,7 +392,7 @@ public abstract class TunnelCreatorConfig implements TunnelInfo { buf.append(" client ").append(Base64.encode(_destination.getData(), 0, 3)); buf.append(": GW "); for (int i = 0; i < _peers.length; i++) { - buf.append(_peers[i].toBase64().substring(0,4)); + buf.append(_peers[i].toBase64(), 0, 4); long id = _config[i].getReceiveTunnelId(); if (id != 0) { // don't show for "me" at OBGW or IBEP diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index 8c48ae150..aa77ac482 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -1338,7 +1338,7 @@ public class TunnelPool { if (_settings.getDestinationNickname() != null) rv.append(_settings.getDestinationNickname()); else - rv.append(_settings.getDestination().toBase64().substring(0,4)); + rv.append(_settings.getDestination().toBase64(), 0, 4); return rv.toString(); }