This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1390aae850525df3fca9ddc38be1196339d050bd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 17 10:19:38 2023 +0000
Append single characters as characters rather than one character strings
---
java/javax/servlet/http/HttpServlet.java | 2 +-
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/tribes/transport/bio/BioSender.java | 4 ++--
java/org/apache/catalina/valves/ProxyErrorReportValve.java | 4 ++--
java/org/apache/coyote/ajp/AjpMessage.java | 2 +-
java/org/apache/tomcat/util/IntrospectionUtils.java | 5 ++---
.../src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java | 2 +-
.../src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java | 2 +-
.../org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java | 2 +-
.../tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java | 2 +-
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 4 ++--
test/org/apache/catalina/connector/TestOutputBuffer.java | 2 +-
test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java | 2 +-
test/org/apache/catalina/startup/TomcatBaseTest.java | 4 ++--
.../apache/catalina/tribes/group/TestGroupChannelMemberArrival.java | 2 +-
test/org/apache/coyote/TestResponse.java | 2 +-
test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java | 4 ++--
test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java | 2 +-
test/org/apache/coyote/http2/Http2TestBase.java | 6 +++---
test/org/apache/el/parser/TestELParser.java | 6 +++---
test/org/apache/tomcat/util/http/parser/TestMediaType.java | 4 ++--
test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java | 6 +++---
test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java | 6 +++---
webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java | 2 +-
24 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/java/javax/servlet/http/HttpServlet.java
b/java/javax/servlet/http/HttpServlet.java
index 97a4c17faa..2608066bb1 100644
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -437,7 +437,7 @@ public abstract class HttpServlet extends GenericServlet {
int responseLength;
String CRLF = "\r\n";
- StringBuilder buffer = new StringBuilder("TRACE
").append(req.getRequestURI()).append(" ")
+ StringBuilder buffer = new StringBuilder("TRACE
").append(req.getRequestURI()).append(' ')
.append(req.getProtocol());
Enumeration<String> reqHeaderNames = req.getHeaderNames();
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 10cb7e16c5..aaadf45171 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5606,7 +5606,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
parent = parent.getParent();
}
while (!stk.isEmpty()) {
- buff.append("/" + stk.remove());
+ buff.append('/').append(stk.remove());
}
buff.append(getName());
namingContextName = buff.toString();
diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
index 56e6e74579..05dd2fa5f9 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
@@ -139,8 +139,8 @@ public class BioSender extends AbstractSender {
@Override
public String toString() {
StringBuilder buf = new StringBuilder("DataSender[(");
- buf.append(super.toString()).append(")");
- buf.append(getAddress()).append(":").append(getPort()).append("]");
+ buf.append(super.toString()).append(')');
+ buf.append(getAddress()).append(':').append(getPort()).append(']');
return buf.toString();
}
diff --git a/java/org/apache/catalina/valves/ProxyErrorReportValve.java
b/java/org/apache/catalina/valves/ProxyErrorReportValve.java
index bf40fb8eba..1b59a210fe 100644
--- a/java/org/apache/catalina/valves/ProxyErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ProxyErrorReportValve.java
@@ -148,9 +148,9 @@ public class ProxyErrorReportValve extends ErrorReportValve
{
StringBuilder stringBuilder = new StringBuilder(urlString);
if (urlString.indexOf("?") > -1) {
- stringBuilder.append("&");
+ stringBuilder.append('&');
} else {
- stringBuilder.append("?");
+ stringBuilder.append('?');
}
try {
stringBuilder.append("requestUri=");
diff --git a/java/org/apache/coyote/ajp/AjpMessage.java
b/java/org/apache/coyote/ajp/AjpMessage.java
index f49a099125..7ec6b5139f 100644
--- a/java/org/apache/coyote/ajp/AjpMessage.java
+++ b/java/org/apache/coyote/ajp/AjpMessage.java
@@ -398,7 +398,7 @@ public class AjpMessage {
StringBuilder sb = new StringBuilder();
for (int i = start; i < start + 16 ; i++) {
if (i < len + 4) {
- sb.append(hex(buf[i])).append(" ");
+ sb.append(hex(buf[i])).append(' ');
} else {
sb.append(" ");
}
diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 03ee5337ea..33ce7fb920 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -451,15 +451,14 @@ public final class IntrospectionUtils {
if (log.isDebugEnabled()) {
// debug
StringBuilder sb = new StringBuilder();
- sb.append(target.getClass().getName()).append('.')
- .append(methodN).append("( ");
+
sb.append(target.getClass().getName()).append('.').append(methodN).append('(');
for (int i = 0; i < params.length; i++) {
if (i > 0) {
sb.append(", ");
}
sb.append(params[i]);
}
- sb.append(")");
+ sb.append(')');
log.debug("IntrospectionUtils:" + sb.toString());
}
return o;
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
index 80c05e9279..f333c3de59 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
@@ -838,7 +838,7 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
continue;
}
buf.append(field);
- buf.append("=");
+ buf.append('=');
if (DataSourceFactory.PROP_PASSWORD.equals(field)) {
buf.append("********");
} else {
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
index f1c3f21218..4771b321b4 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
@@ -149,7 +149,7 @@ public class StatementFacade extends
AbstractCreateStatementInterceptor {
buf.append(query);
buf.append("; Delegate=");
buf.append(delegate);
- buf.append("]");
+ buf.append(']');
return buf.toString();
}
}
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
index d800a1b9bc..4198d3759e 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
@@ -388,7 +388,7 @@ public class SlowQueryReport extends AbstractQueryReport {
buf.append(prepareCount);
buf.append(", prepareTime:");
buf.append(prepareTime);
- buf.append("]");
+ buf.append(']');
return buf.toString();
}
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
index ca93002206..a47c00d28d 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
@@ -263,7 +263,7 @@ public class StatementDecoratorInterceptor extends
AbstractCreateStatementInterc
buf.append(getDelegate());
buf.append("; Connection=");
buf.append(getConnection());
- buf.append("]");
+ buf.append(']');
return buf.toString();
}
}
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index 7e63d733fa..9b9dc7ef5b 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -465,7 +465,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
// build the HTTP request while assembling the uri
StringBuilder requestHead = new StringBuilder(128);
- requestHead.append(method).append(" ");
+ requestHead.append(method).append(' ');
if (isFullQualUri) {
requestHead.append(resourceUri);
} else {
@@ -499,7 +499,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
if (sessionId != null) {
requestHead.append("Cookie: ")
.append(SESSION_COOKIE_NAME)
- .append("=").append(sessionId).append(CRLF);
+ .append('=').append(sessionId).append(CRLF);
}
}
diff --git a/test/org/apache/catalina/connector/TestOutputBuffer.java
b/test/org/apache/catalina/connector/TestOutputBuffer.java
index dd2a812b2d..f8164f5e87 100644
--- a/test/org/apache/catalina/connector/TestOutputBuffer.java
+++ b/test/org/apache/catalina/connector/TestOutputBuffer.java
@@ -164,7 +164,7 @@ public class TestOutputBuffer extends TomcatBaseTest{
// Create test data. This is carefully constructed to trigger the edge
// case. Small variations may cause the test to miss the edge case.
StringBuffer sb = new StringBuffer();
- sb.append("a");
+ sb.append('a');
for (int i = 0x10000; i < 0x11000; i++) {
char[] chars = Character.toChars(i);
diff --git a/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
b/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
index f8bd72d967..141f690ea5 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
@@ -394,7 +394,7 @@ public class TestWebappClassLoaderWeaving extends
TomcatBaseTest {
for (int i = 0, b = input.read(); b >= 0; i++, b = input.read()) {
String value = "" + ((byte)b);
if (builder.length() + value.length() > 97) {
- builder.append(",");
+ builder.append(',');
System.out.println(builder.toString());
builder = new StringBuilder();
builder.append(" ").append(value);
diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java
b/test/org/apache/catalina/startup/TomcatBaseTest.java
index 131ac3b8f6..d457f87543 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -525,7 +525,7 @@ public abstract class TomcatBaseTest extends
LoggingBaseTest {
h.hasMoreElements();) {
value.append(h.nextElement());
if (h.hasMoreElements()) {
- value.append(";");
+ value.append(';');
}
}
out.println("HEADER:" + name + ": " + value);
@@ -548,7 +548,7 @@ public abstract class TomcatBaseTest extends
LoggingBaseTest {
for (int j = 0; j < m; j++) {
value.append(values[j]);
if (j < m - 1) {
- value.append(";");
+ value.append(';');
}
}
out.println("PARAM/" + name + ": " + value);
diff --git
a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
index 495b020751..6163361579 100644
--- a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
@@ -86,7 +86,7 @@ public class TestGroupChannelMemberArrival {
arrivalLengthErrors.append(listener.members.size());
arrivalLengthErrors.append("] but should have been [");
arrivalLengthErrors.append(channels.length - 1);
- arrivalLengthErrors.append("]");
+ arrivalLengthErrors.append(']');
arrivalLengthErrors.append('\n');
}
}
diff --git a/test/org/apache/coyote/TestResponse.java
b/test/org/apache/coyote/TestResponse.java
index 1111616212..acb9f84eff 100644
--- a/test/org/apache/coyote/TestResponse.java
+++ b/test/org/apache/coyote/TestResponse.java
@@ -118,7 +118,7 @@ public class TestResponse extends TomcatBaseTest {
String contentType = getSingleHeader("Content-Type", responseHeaders);
StringBuilder expected = new StringBuilder("text/plain;");
if (withSpace) {
- expected.append(" ");
+ expected.append(' ');
}
expected.append("v=1;charset=UTF-8");
Assert.assertEquals(expected.toString() , contentType);
diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
index d3615cbaa0..9f8bb15a22 100644
--- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
+++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
@@ -237,12 +237,12 @@ public class TestAbstractAjpProcessor extends
TomcatBaseTest {
boolean sep = false;
for (String name: params.keySet()) {
if (sep) {
- query.append("&");
+ query.append('&');
} else {
sep = true;
}
query.append(name);
- query.append("=");
+ query.append('=');
query.append(params.get(name));
}
forwardMessage.addAttribute(0x05, query.toString());
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index 6e8e6378be..8563e47bc1 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -236,7 +236,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
String extName = ";foo=";
StringBuilder extValue = new StringBuilder(len);
for (int i = 0; i < (len - extName.length()); i++) {
- extValue.append("x");
+ extValue.append('x');
}
String[] request = new String[]{
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java
b/test/org/apache/coyote/http2/Http2TestBase.java
index 72ec5a16b8..306d57f084 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -1206,11 +1206,11 @@ public abstract class Http2TestBase extends
TomcatBaseTest {
@Override
public void onSwallowedUnknownFrame(int streamId, int frameTypeId, int
flags, int size) {
trace.append(streamId);
- trace.append(",");
+ trace.append(',');
trace.append(frameTypeId);
- trace.append(",");
+ trace.append(',');
trace.append(flags);
- trace.append(",");
+ trace.append(',');
trace.append(size);
trace.append("\n");
}
diff --git a/test/org/apache/el/parser/TestELParser.java
b/test/org/apache/el/parser/TestELParser.java
index 59ecb382bf..ab1d1bbaf0 100644
--- a/test/org/apache/el/parser/TestELParser.java
+++ b/test/org/apache/el/parser/TestELParser.java
@@ -186,13 +186,13 @@ public class TestELParser {
StringBuilder expr = new StringBuilder();
expr.append("${");
for (int i = 0; i < parenthesesCount; i++) {
- expr.append("(");
+ expr.append('(');
}
expr.append(innerExpr);
for (int i = 0; i < parenthesesCount; i++) {
- expr.append(")");
+ expr.append(')');
}
- expr.append("}");
+ expr.append('}');
ValueExpression ve = factory.createValueExpression(
context, expr.toString(), String.class);
diff --git a/test/org/apache/tomcat/util/http/parser/TestMediaType.java
b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
index 99fd9bd567..7349de4d41 100644
--- a/test/org/apache/tomcat/util/http/parser/TestMediaType.java
+++ b/test/org/apache/tomcat/util/http/parser/TestMediaType.java
@@ -284,11 +284,11 @@ public class TestMediaType {
public String toString(String lws) {
StringBuilder sb = new StringBuilder();
sb.append(lws);
- sb.append(";");
+ sb.append(';');
sb.append(lws);
sb.append(name);
sb.append(lws);
- sb.append("=");
+ sb.append('=');
sb.append(lws);
sb.append(value);
sb.append(lws);
diff --git a/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
b/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
index 089bd3fe45..8a60ada2b7 100644
--- a/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
+++ b/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
@@ -111,17 +111,17 @@ public class TestOpenSSLConf extends TomcatBaseTest {
Set<String> disabledProtocols = new
HashSet<>(Arrays.asList(DISABLED_PROTOCOLS));
StringBuilder sb = new StringBuilder();
for (String protocol : DISABLED_PROTOCOLS) {
- sb.append(",").append("-").append(protocol);
+ sb.append(',').append('-').append(protocol);
}
if (hasTLS13()) {
// Also disable TLSv1.3
for (String protocol : DISABLED_PROTOCOLS_TLS13) {
- sb.append(",").append("-").append(protocol);
+ sb.append(',').append('-').append(protocol);
disabledProtocols.add(protocol);
}
}
for (String protocol : ENABLED_PROTOCOLS) {
- sb.append(",").append(protocol);
+ sb.append(',').append(protocol);
}
SSLHostConfig sslHostConfig = initOpenSSLConfCmd("Protocol",
sb.substring(1));
String[] protocols = sslHostConfig.getEnabledProtocols();
diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index 644347bae4..69f899d76c 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -660,11 +660,11 @@ public class TestEncodingDecoding extends TomcatBaseTest {
@Override
public String encode(List<String> str) throws EncodeException {
StringBuffer sbuf = new StringBuffer();
- sbuf.append("[");
+ sbuf.append('[');
for (String s: str){
- sbuf.append(s).append(",");
+ sbuf.append(s).append(',');
}
- sbuf.deleteCharAt(sbuf.lastIndexOf(",")).append("]");
+ sbuf.deleteCharAt(sbuf.lastIndexOf(",")).append(']');
return sbuf.toString();
}
}
diff --git a/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
b/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
index 1fc6e05e78..d279dac1d9 100644
--- a/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
+++ b/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
@@ -316,7 +316,7 @@ public final class Room {
String s = String.valueOf(p.getLastReceivedMessageId())
+ "," + msg.toString();
if (i > 0) {
- sb.append("|");
+ sb.append('|');
}
sb.append(s);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
