This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 200da3c Simplify some #toString() methods 200da3c is described below commit 200da3c0aa58c3d6a815315d30cb4b5a3bacbb19 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> AuthorDate: Fri Jul 10 17:33:39 2020 +0300 Simplify some #toString() methods Do not use StringBuilder when String concatenation is just fine. Append char instead of String when possible. Fix the toString of ExampleFilter (cherry picked from commit 768524f02643c58f412c0ecea67bc41ebf4b7085) --- java/org/apache/catalina/connector/CoyotePrincipal.java | 5 +---- java/org/apache/catalina/core/StandardThreadExecutor.java | 4 +--- java/org/apache/catalina/tribes/UniqueId.java | 6 ++---- java/org/apache/juli/VerbatimFormatter.java | 9 ++------- .../tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java | 2 +- .../tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java | 4 ++-- .../apache/tomcat/util/descriptor/web/ContextTransaction.java | 4 +--- java/org/apache/tomcat/util/digester/SetPropertiesRule.java | 4 +--- java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java | 2 +- webapps/examples/WEB-INF/classes/async/Stockticker.java | 6 +++--- webapps/examples/WEB-INF/classes/filters/ExampleFilter.java | 8 +++----- 11 files changed, 18 insertions(+), 36 deletions(-) diff --git a/java/org/apache/catalina/connector/CoyotePrincipal.java b/java/org/apache/catalina/connector/CoyotePrincipal.java index 93d7c02..c20db11 100644 --- a/java/org/apache/catalina/connector/CoyotePrincipal.java +++ b/java/org/apache/catalina/connector/CoyotePrincipal.java @@ -62,10 +62,7 @@ public class CoyotePrincipal implements Principal, Serializable { */ @Override public String toString() { - StringBuilder sb = new StringBuilder("CoyotePrincipal["); - sb.append(this.name); - sb.append(']'); - return sb.toString(); + return "CoyotePrincipal[" + this.name + "]"; } diff --git a/java/org/apache/catalina/core/StandardThreadExecutor.java b/java/org/apache/catalina/core/StandardThreadExecutor.java index 9abf8e8..4ff1d9d 100644 --- a/java/org/apache/catalina/core/StandardThreadExecutor.java +++ b/java/org/apache/catalina/core/StandardThreadExecutor.java @@ -328,8 +328,6 @@ public class StandardThreadExecutor extends LifecycleMBeanBase @Override protected String getObjectNameKeyProperties() { - StringBuilder name = new StringBuilder("type=Executor,name="); - name.append(getName()); - return name.toString(); + return "type=Executor,name=" + getName(); } } diff --git a/java/org/apache/catalina/tribes/UniqueId.java b/java/org/apache/catalina/tribes/UniqueId.java index 40e5fba..cfb4387 100644 --- a/java/org/apache/catalina/tribes/UniqueId.java +++ b/java/org/apache/catalina/tribes/UniqueId.java @@ -70,9 +70,7 @@ public final class UniqueId implements Serializable{ @Override public String toString() { - StringBuilder buf = new StringBuilder("UniqueId"); - buf.append(Arrays.toString(id)); - return buf.toString(); + return "UniqueId" + Arrays.toString(id); } -} \ No newline at end of file +} diff --git a/java/org/apache/juli/VerbatimFormatter.java b/java/org/apache/juli/VerbatimFormatter.java index a7debe7..c08fce7 100644 --- a/java/org/apache/juli/VerbatimFormatter.java +++ b/java/org/apache/juli/VerbatimFormatter.java @@ -31,13 +31,8 @@ public class VerbatimFormatter extends Formatter { @Override public String format(LogRecord record) { - // Timestamp - StringBuilder sb = new StringBuilder(record.getMessage()); - - // New line for next record - sb.append(System.lineSeparator()); - - return sb.toString(); + // Timestamp + New line for next record + return record.getMessage() + System.lineSeparator(); } } diff --git a/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java b/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java index 02929e9..915e4cd 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java @@ -420,7 +420,7 @@ class CPDSConnectionFactory builder.append(validatingSet); builder.append(", pcMap="); builder.append(pcMap); - builder.append("]"); + builder.append(']'); return builder.toString(); } } diff --git a/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java b/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java index e50e34d..69d6eff 100644 --- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java +++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java @@ -1062,9 +1062,9 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable @Override public synchronized String toString() { final StringBuilder builder = new StringBuilder(super.toString()); - builder.append("["); + builder.append('['); toStringFields(builder); - builder.append("]"); + builder.append(']'); return builder.toString(); } diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java b/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java index 1a7609a..33c8acd 100644 --- a/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java +++ b/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java @@ -83,8 +83,6 @@ public class ContextTransaction implements Serializable { */ @Override public String toString() { - StringBuilder sb = new StringBuilder("Transaction["); - sb.append(']'); - return sb.toString(); + return "Transaction[]"; } } diff --git a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java index 01ef4f7..63133b2 100644 --- a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java +++ b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java @@ -86,8 +86,6 @@ public class SetPropertiesRule extends Rule { */ @Override public String toString() { - StringBuilder sb = new StringBuilder("SetPropertiesRule["); - sb.append(']'); - return sb.toString(); + return "SetPropertiesRule[]"; } } diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java index 96b2508..9af3772 100644 --- a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java +++ b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java @@ -491,7 +491,7 @@ public abstract class FileUploadBase { } // Continuation line found end = parseEndOfLine(headerPart, nonWs); - header.append(' ').append(headerPart.substring(nonWs, end)); + header.append(' ').append(headerPart, nonWs, end); start = end + 2; } parseHeaderLine(headers, header.toString()); diff --git a/webapps/examples/WEB-INF/classes/async/Stockticker.java b/webapps/examples/WEB-INF/classes/async/Stockticker.java index e87744e..49744b8 100644 --- a/webapps/examples/WEB-INF/classes/async/Stockticker.java +++ b/webapps/examples/WEB-INF/classes/async/Stockticker.java @@ -186,11 +186,11 @@ public class Stockticker implements Runnable { public String toString() { StringBuilder buf = new StringBuilder("STOCK#"); buf.append(getSymbol()); - buf.append("#"); + buf.append('#'); buf.append(getValueAsString()); - buf.append("#"); + buf.append('#'); buf.append(getLastChangeAsString()); - buf.append("#"); + buf.append('#'); buf.append(String.valueOf(getCnt())); return buf.toString(); diff --git a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java index db5ac40..ba0ecd9 100644 --- a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java @@ -127,11 +127,9 @@ public final class ExampleFilter implements Filter { public String toString() { if (filterConfig == null) - return ("TimingFilter()"); - StringBuilder sb = new StringBuilder("TimingFilter("); - sb.append(filterConfig); - sb.append(")"); - return sb.toString(); + return ("ExampleFilter()"); + + return "ExampleFilter(" + filterConfig + ")"; } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org