From e104ca71f60f779a7d0e502cd20306f6e7550b73 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 6 Jun 2026 10:43:59 -0400 Subject: [PATCH] Lint: Change replace(String) to replace(char) all over --- .../java/src/org/klomp/snark/web/BasicServlet.java | 4 ++-- .../java/src/org/klomp/snark/web/I2PSnarkServlet.java | 2 +- .../src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java | 2 +- .../java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java | 2 +- .../java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java | 6 +++--- .../java/src/net/i2p/router/web/ConfigUpdateHandler.java | 4 ++-- .../java/src/net/i2p/router/web/ConfigUpdateHelper.java | 2 +- .../src/net/i2p/router/web/helpers/ConfigHomeHandler.java | 4 ++-- .../net/i2p/router/web/helpers/ConfigReseedHandler.java | 2 +- apps/sam/java/src/net/i2p/sam/SAMv1Handler.java | 8 ++++---- core/java/src/net/i2p/util/DNSOverHTTPS.java | 2 +- .../tools/java/src/net/i2p/util/TranslationStatus.java | 2 +- router/java/src/net/i2p/router/PersistentKeyRing.java | 6 +++--- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java index 98f6a3f01..9c6b6afae 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java @@ -526,7 +526,7 @@ class BasicServlet extends HttpServlet { String cpath = getServletContext().getContextPath(); // this won't work if we aren't at top level - String cname = "".equals(cpath) ? "i2psnark" : cpath.substring(1).replace("/", "_"); + String cname = "".equals(cpath) ? "i2psnark" : cpath.substring(1).replace('/', '_'); return (new File(_context.getBaseDir(), "webapps/" + cname + ".war")).lastModified(); } @@ -599,7 +599,7 @@ class BasicServlet extends HttpServlet } String rv = (new File(base, path)).toString(); if (SystemVersion.isWindows()) - rv = rv.replace("\\", "/"); + rv = rv.replace('\\', '/'); return rv; } diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 4d7ccb1e9..dded9bf13 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -102,7 +102,7 @@ public class I2PSnarkServlet extends BasicServlet { super.init(cfg); String cpath = getServletContext().getContextPath(); _contextPath = cpath == "" ? "/" : cpath; - _contextName = cpath == "" ? DEFAULT_NAME : cpath.substring(1).replace("/", "_"); + _contextName = cpath == "" ? DEFAULT_NAME : cpath.substring(1).replace('/', '_'); // limited protection against overwriting other config files or directories // in case you named your war "router.war" // We don't handle bad characters in the context path. Don't do that. diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java index 7896adc27..cb5af0f2a 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java @@ -454,7 +454,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem authorization = authorization.substring(6); // hmm safeDecode(foo, true) to use standard alphabet is private in Base64 - byte[] decoded = Base64.decode(authorization.replace("/", "~").replace("+", "=")); + byte[] decoded = Base64.decode(authorization.replace('/', '~').replace('+', '=')); if (decoded != null) { // We send Accept-Charset: UTF-8 in the 407 so hopefully it comes back that way inside the B64 ? try { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java index ed4ea8851..936718fb0 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java @@ -905,7 +905,7 @@ public class GeneralHelper { public String getJumpList(int tunnel) { return getProperty(tunnel, I2PTunnelHTTPClient.PROP_JUMP_SERVERS, - I2PTunnelHTTPClient.DEFAULT_JUMP_SERVERS).replace(",", "\n"); + I2PTunnelHTTPClient.DEFAULT_JUMP_SERVERS).replace(',', '\n'); } public boolean getCloseOnIdle(int tunnel, boolean def) { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java index f600cde50..9d437dafe 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java @@ -469,7 +469,7 @@ public class TunnelConfig { public void setAccessList(String val) { if (val != null) { - val = val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ","); + val = val.trim().replace("\r\n", ",").replace('\n', ',').replace(' ', ','); // Convert to B64 to save space String[] vals = DataHelper.split(val, ","); StringBuilder buf = new StringBuilder(val.length()); @@ -493,7 +493,7 @@ public class TunnelConfig { public void setJumpList(String val) { if (val != null) - _otherOptions.put(I2PTunnelHTTPClient.PROP_JUMP_SERVERS, val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ",")); + _otherOptions.put(I2PTunnelHTTPClient.PROP_JUMP_SERVERS, val.trim().replace("\r\n", ",").replace('\n', ',').replace(' ', ',')); } public void setCloseTime(int val) { @@ -578,7 +578,7 @@ public class TunnelConfig { public void setSslProxies(String s) { if (s != null) - _otherOptions.put(I2PTunnelHTTPClient.PROP_SSL_OUTPROXIES, s.trim().replace(" ", ",")); + _otherOptions.put(I2PTunnelHTTPClient.PROP_SSL_OUTPROXIES, s.trim().replace(' ', ',')); } public void setUseOutproxyPlugin(boolean val) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index 62cee630a..2a9f4cef4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -252,7 +252,7 @@ public class ConfigUpdateHandler extends FormHandler { } if ( (_updateURL != null) && (_updateURL.length() > 0) ) { - _updateURL = _updateURL.replace("\r\n", ",").replace("\n", ","); + _updateURL = _updateURL.replace("\r\n", ",").replace('\n', ','); String oldURL = _context.router().getConfigSetting(PROP_UPDATE_URL); if ( (oldURL == null) || (!_updateURL.equals(oldURL)) ) { changes.put(PROP_UPDATE_URL, _updateURL); @@ -261,7 +261,7 @@ public class ConfigUpdateHandler extends FormHandler { } if ( (_trustedKeys != null) && (_trustedKeys.length() > 0) ) { - _trustedKeys = _trustedKeys.replace("\r\n", ",").replace("\n", ","); + _trustedKeys = _trustedKeys.replace("\r\n", ",").replace('\n', ','); String oldKeys = new TrustedUpdate(_context).getTrustedKeysString(); oldKeys = oldKeys.replace("\r\n", ","); if (!_trustedKeys.equals(oldKeys)) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java index 0cf829808..e07bcf91e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java @@ -47,7 +47,7 @@ public class ConfigUpdateHelper extends HelperBase { public String getUpdateURL() { String url = _context.getProperty(ConfigUpdateHandler.PROP_UPDATE_URL); if (url != null) - return url.replace(",", "\n"); + return url.replace(',', '\n'); else return ConfigUpdateHandler.DEFAULT_UPDATE_URL; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java index d15dbc4ac..44bc48115 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java @@ -78,8 +78,8 @@ public class ConfigHomeHandler extends FormHandler { // these would get double-escaped so we can't do it this way... //name = DataHelper.escapeHTML(name).replace(",", ","); //url = DataHelper.escapeHTML(url).replace(",", ","); - name = name.replace(",", "."); - url = url.replace(",", "."); // fail + name = name.replace(',', '.'); + url = url.replace(',', '.'); // fail App app; if ("1".equals(group)) app = new App(name, "", url, "/themes/console/images/eepsite.png"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java index 5f3dc0917..25cd6e251 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java @@ -161,7 +161,7 @@ public class ConfigReseedHandler extends FormHandler { saveBoolean(Reseeder.PROP_SPROXY_AUTH_ENABLE, "sauth"); String url = getJettyString("reseedURL"); if (url != null) { - url = url.trim().replace("\r\n", ",").replace("\n", ","); + url = url.trim().replace("\r\n", ",").replace('\n', ','); if (url.length() <= 0) { addFormNotice("Restoring default URLs"); removes.add(Reseeder.PROP_RESEED_URL); diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java index 5ba108503..e3c1ff82d 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java @@ -451,8 +451,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece continue; } String v = (String) entry.getValue(); - v = v.replace("\n", " "); - v = v.replace("\r", " "); + v = v.replace('\n', ' '); + v = v.replace('\r', ' '); v = v.replace("\\", "\\\\"); v = v.replace("\"", "\\\""); buf.append(" OPTION:").append(k).append("=\"").append(v).append('"'); @@ -995,8 +995,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece protected static String createMessageString(String msg) { String rv; if ( msg != null ) { - msg = msg.replace("\n", " "); - msg = msg.replace("\r", " "); + msg = msg.replace('\n', ' '); + msg = msg.replace('\r', ' '); if (!msg.startsWith("\"")) { msg = msg.replace("\"", ""); if (msg.contains(" ") || msg.contains("\t")) diff --git a/core/java/src/net/i2p/util/DNSOverHTTPS.java b/core/java/src/net/i2p/util/DNSOverHTTPS.java index 074a1e79b..95cde7d4b 100644 --- a/core/java/src/net/i2p/util/DNSOverHTTPS.java +++ b/core/java/src/net/i2p/util/DNSOverHTTPS.java @@ -676,7 +676,7 @@ public class DNSOverHTTPS implements EepGet.StatusListener { return null; } sdns = sdns.substring(7); - sdns = sdns.replace("_", "~"); + sdns = sdns.replace('_', '~'); d = Base64.decode(sdns); if (d == null) { if (log) System.out.println("Bad encoding"); diff --git a/installer/tools/java/src/net/i2p/util/TranslationStatus.java b/installer/tools/java/src/net/i2p/util/TranslationStatus.java index 6b55e1d36..720eb49fd 100644 --- a/installer/tools/java/src/net/i2p/util/TranslationStatus.java +++ b/installer/tools/java/src/net/i2p/util/TranslationStatus.java @@ -155,7 +155,7 @@ public class TranslationStatus { for (String name : classes) { name = name.substring(0, name.length() - 6); // .class int c = name.indexOf('_'); - String clz = name.substring(0, c).replace("/", "."); + String clz = name.substring(0, c).replace('/', '.'); if (!clz.equals(pclz)) { // pass 1C: output a table for the resource // output goes here, we have to make two passes to find the max diff --git a/router/java/src/net/i2p/router/PersistentKeyRing.java b/router/java/src/net/i2p/router/PersistentKeyRing.java index 016cf91b6..aa5d4108d 100644 --- a/router/java/src/net/i2p/router/PersistentKeyRing.java +++ b/router/java/src/net/i2p/router/PersistentKeyRing.java @@ -34,7 +34,7 @@ public class PersistentKeyRing extends KeyRing { public SessionKey put(Hash h, SessionKey sk) { SessionKey old = super.put(h, sk); if (!sk.equals(old)) { - _ctx.router().saveConfig(PROP_PFX + h.toBase64().replace("=", "$"), + _ctx.router().saveConfig(PROP_PFX + h.toBase64().replace('=', '$'), sk.toBase64()); } return old; @@ -45,7 +45,7 @@ public class PersistentKeyRing extends KeyRing { SessionKey rv = super.remove(o); if (rv != null && o instanceof Hash) { Hash h = (Hash) o; - _ctx.router().saveConfig(PROP_PFX + h.toBase64().replace("=", "$"), null); + _ctx.router().saveConfig(PROP_PFX + h.toBase64().replace('=', '$'), null); } return rv; } @@ -58,7 +58,7 @@ public class PersistentKeyRing extends KeyRing { if (key == null || key.length() != 44) continue; String hb = prop.substring(PROP_PFX.length()); - hb = hb.replace("$", "="); + hb = hb.replace('$', '='); Hash dest = new Hash(); SessionKey sk = new SessionKey(); try {