This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
commit 7698532588ae3f73207b9600e4c63fb40a2850a7 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sat Mar 4 09:42:06 2023 -0500 Use StringBuilder instead of StringBuffer for internal processing --- .../jelly/expression/CompositeExpression.java | 8 ++++---- .../apache/commons/jelly/servlet/JellyServlet.java | 2 +- .../jelly/tags/jetty/JellyResourceHttpHandler.java | 23 ++++++++++------------ .../apache/commons/jelly/tags/swing/ActionTag.java | 2 +- .../commons/jelly/tags/util/LoadTextTag.java | 2 +- .../jelly/tags/velocity/VelocityTagSupport.java | 2 +- .../org/apache/commons/jelly/tags/xml/SetTag.java | 4 ++-- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java index f91a469a..a5be69dd 100644 --- a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java +++ b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java @@ -89,8 +89,8 @@ public class CompositeExpression extends ExpressionSupport { int cur = 0; char c = 0; - StringBuffer chars = new StringBuffer(); - StringBuffer expr = new StringBuffer(); + StringBuilder chars = new StringBuilder(); + StringBuilder expr = new StringBuilder(); MAIN: while ( cur < len ) { @@ -244,7 +244,7 @@ public class CompositeExpression extends ExpressionSupport { //------------------------------------------------------------------------- public String getExpressionText() { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); for (Iterator iter = expressions.iterator(); iter.hasNext(); ) { Expression expression = (Expression) iter.next(); buffer.append( expression.getExpressionText() ); @@ -260,7 +260,7 @@ public class CompositeExpression extends ExpressionSupport { // inherit javadoc from interface public String evaluateAsString(JellyContext context) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); for (Iterator iter = expressions.iterator(); iter.hasNext(); ) { Expression expression = (Expression) iter.next(); String value = expression.evaluateAsString(context); diff --git a/core/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java b/core/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java index 05686f36..f5cda0b1 100644 --- a/core/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java +++ b/core/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java @@ -173,7 +173,7 @@ public class JellyServlet extends HttpServlet { Exception cause) throws ServletException, IOException { - StringBuffer html = new StringBuffer(); + StringBuilder html = new StringBuilder(); html.append("<html>"); html.append("<title>Error</title>"); html.append("<body bgcolor=\"#ffffff\">"); diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java index 6d2e3dbf..f65e8778 100644 --- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java +++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java @@ -17,26 +17,23 @@ package org.apache.commons.jelly.tags.jetty; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.HashMap; +import java.util.Map; + import org.apache.commons.jelly.JellyContext; import org.apache.commons.jelly.Tag; import org.apache.commons.jelly.XMLOutput; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.mortbay.http.HttpException; import org.mortbay.http.HttpRequest; import org.mortbay.http.HttpResponse; import org.mortbay.http.handler.AbstractHttpHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.StringBuffer; -import java.util.HashMap; -import java.util.Map; - /** * The actual http handler implementation for an http context in an http server * @@ -130,7 +127,7 @@ class JellyResourceHttpHandler extends AbstractHttpHandler { InputStream is = request.getInputStream(); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); char[] buffer = new char[1024]; int len; diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java index 8b3cd19f..f40abe1d 100644 --- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java +++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java @@ -173,7 +173,7 @@ public class ActionTag extends UseBeanTag { if ( Character.isUpperCase( ch ) ) { return text; } - StringBuffer buffer = new StringBuffer(text.length()); + StringBuilder buffer = new StringBuilder(text.length()); buffer.append( Character.toUpperCase( ch ) ); buffer.append( text.substring(1) ); return buffer.toString(); diff --git a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java index 20758c4f..303882de 100644 --- a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java +++ b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java @@ -176,7 +176,7 @@ public class LoadTextTag extends TagSupport { * Loads all the text from the given Reader */ protected String loadText(Reader reader) throws IOException { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); try { char[] charBuffer = new char[ 4096 ]; diff --git a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java index 08bbb560..72a86a63 100644 --- a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java +++ b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/VelocityTagSupport.java @@ -78,7 +78,7 @@ public abstract class VelocityTagSupport extends TagSupport */ private String keyName( String basedir ) { - return new StringBuffer() + return new StringBuilder() .append( VELOCITY_ENGINE_VAR_NAME ) .append( '.' ) .append( basedir ) diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java index ba391c34..eccb2c96 100644 --- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java +++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java @@ -153,7 +153,7 @@ public class SetTag extends XPathTagSupport { // finally convert the result to a concatenated string if delimiter is defined if(delimiter != null && value instanceof List) { - StringBuffer buff = new StringBuffer(); + StringBuilder buff = new StringBuilder(); for(Iterator it = ((List) value).iterator(); it.hasNext(); ) { Object v = it.next(); if (v instanceof Node) { @@ -220,7 +220,7 @@ public class SetTag extends XPathTagSupport { } private String joinDelimitedElements( final List values ) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int sz = values.size(); for (int i = 0; i < sz; i++) { String s = (String)values.get(i);