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-jxpath.git
The following commit(s) were added to refs/heads/master by this push: new 00f548c Use StringBuilder instead of StringBuffer for internal processing 00f548c is described below commit 00f548ceb6c70da59eb259745bfb209af4b81502 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sat Mar 4 09:15:06 2023 -0500 Use StringBuilder instead of StringBuffer for internal processing --- src/main/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java | 2 +- src/main/java/org/apache/commons/jxpath/JXPathException.java | 2 +- .../java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java | 4 ++-- .../java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java | 2 +- .../java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java | 2 +- .../org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java | 2 +- .../java/org/apache/commons/jxpath/ri/compiler/LocationPath.java | 2 +- src/main/java/org/apache/commons/jxpath/ri/compiler/Step.java | 2 +- src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java | 6 +++--- .../java/org/apache/commons/jxpath/ri/model/VariablePointer.java | 2 +- .../org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java | 2 +- .../apache/commons/jxpath/ri/model/beans/LangAttributePointer.java | 2 +- .../apache/commons/jxpath/ri/model/beans/NullElementPointer.java | 2 +- .../apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java | 2 +- .../org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java | 2 +- .../java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java | 4 ++-- .../org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java | 2 +- .../commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java | 2 +- .../apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java | 2 +- .../apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java | 2 +- .../org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java | 4 ++-- .../java/org/apache/commons/jxpath/ri/parser/ParseException.java | 2 +- .../java/org/apache/commons/jxpath/ri/parser/TokenMgrError.java | 2 +- src/main/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java | 2 +- .../java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java | 6 +++--- .../java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java | 6 +++--- 26 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java b/src/main/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java index 00f6d8a..c05c494 100644 --- a/src/main/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java +++ b/src/main/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java @@ -157,7 +157,7 @@ public class JXPathBasicBeanInfo implements JXPathBeanInfo { @Override public String toString() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append("BeanInfo [class = "); buffer.append(clazz.getName()); if (isDynamic()) { diff --git a/src/main/java/org/apache/commons/jxpath/JXPathException.java b/src/main/java/org/apache/commons/jxpath/JXPathException.java index e1d50a7..e76622d 100644 --- a/src/main/java/org/apache/commons/jxpath/JXPathException.java +++ b/src/main/java/org/apache/commons/jxpath/JXPathException.java @@ -85,7 +85,7 @@ public class JXPathException extends RuntimeException { if (exception == null) { return message; } - final StringBuffer buf = new StringBuffer(); + final StringBuilder buf = new StringBuilder(); if (message != null) { buf.append(message).append("; "); } diff --git a/src/main/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java b/src/main/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java index 8c87159..9b3bd01 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java +++ b/src/main/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java @@ -221,7 +221,7 @@ public class CoreFunction extends Operation { @Override public String toString() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append(getFunctionName()); buffer.append('('); final Expression[] args = getArguments(); @@ -528,7 +528,7 @@ public class CoreFunction extends Operation { if (getArgumentCount() < 2) { assertArgCount(2); } - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); final Expression[] args = getArguments(); for (final Expression arg : args) { buffer.append(InfoSetUtil.stringValue(arg.compute(context))); diff --git a/src/main/java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java b/src/main/java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java index 2080f88..488b1ea 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java +++ b/src/main/java/org/apache/commons/jxpath/ri/compiler/CoreOperation.java @@ -81,7 +81,7 @@ public abstract class CoreOperation extends Operation { if (args.length == 1) { return getSymbol() + parenthesize(args[0], false); } - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); for (int i = 0; i < args.length; i++) { if (i > 0) { buffer.append(' '); diff --git a/src/main/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java b/src/main/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java index e2e4647..39853fa 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java +++ b/src/main/java/org/apache/commons/jxpath/ri/compiler/ExpressionPath.java @@ -102,7 +102,7 @@ public class ExpressionPath extends Path { @Override public String toString() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); if (expression instanceof CoreOperation || expression instanceof ExpressionPath || expression instanceof LocationPath) { diff --git a/src/main/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java b/src/main/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java index 482df39..c8a9b27 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java +++ b/src/main/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java @@ -63,7 +63,7 @@ public class ExtensionFunction extends Operation { @Override public String toString() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append(functionName); buffer.append('('); final Expression[] args = getArguments(); diff --git a/src/main/java/org/apache/commons/jxpath/ri/compiler/LocationPath.java b/src/main/java/org/apache/commons/jxpath/ri/compiler/LocationPath.java index b21b533..98afe8a 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/compiler/LocationPath.java +++ b/src/main/java/org/apache/commons/jxpath/ri/compiler/LocationPath.java @@ -50,7 +50,7 @@ public class LocationPath extends Path { @Override public String toString() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); final Step[] steps = getSteps(); if (steps != null) { for (int i = 0; i < steps.length; i++) { diff --git a/src/main/java/org/apache/commons/jxpath/ri/compiler/Step.java b/src/main/java/org/apache/commons/jxpath/ri/compiler/Step.java index 958b649..8dc0e48 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/compiler/Step.java +++ b/src/main/java/org/apache/commons/jxpath/ri/compiler/Step.java @@ -78,7 +78,7 @@ public class Step { @Override public String toString() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); final int axis = getAxis(); if (axis == Compiler.AXIS_CHILD) { buffer.append(nodeTest); diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java index 34b498d..4d7e0e7 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java @@ -686,7 +686,7 @@ public abstract class NodePointer implements Pointer { return parent.asPath(); } - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); if (parent != null) { buffer.append(parent.asPath()); } @@ -849,10 +849,10 @@ public abstract class NodePointer implements Pointer { protected String escape(final String string) { final char[] c = { '\'', '"' }; final String[] esc = { "'", """ }; - StringBuffer sb = null; + StringBuilder sb = null; for (int i = 0; sb == null && i < c.length; i++) { if (string.indexOf(c[i]) >= 0) { - sb = new StringBuffer(string); + sb = new StringBuilder(string); } } if (sb == null) { diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointer.java index 3b1459c..d7d1803 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/VariablePointer.java @@ -320,7 +320,7 @@ public class VariablePointer extends NodePointer { @Override public String asPath() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append('$'); buffer.append(name); if (!actual) { diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java index ec73b2f..5fa85de 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionPointer.java @@ -232,7 +232,7 @@ public class CollectionPointer extends NodePointer { @Override public String asPath() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); final NodePointer parent = getImmediateParentPointer(); if (parent != null) { buffer.append(parent.asPath()); diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/LangAttributePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/LangAttributePointer.java index 8cab27c..0a0a2fc 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/LangAttributePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/LangAttributePointer.java @@ -85,7 +85,7 @@ public class LangAttributePointer extends NodePointer { @Override public String asPath() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); if (parent != null) { buffer.append(parent.asPath()); if (buffer.length() == 0 diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullElementPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullElementPointer.java index 0f8b1bd..bf7fbdb 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullElementPointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullElementPointer.java @@ -133,7 +133,7 @@ public class NullElementPointer extends CollectionPointer { @Override public String asPath() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); final NodePointer parent = getImmediateParentPointer(); if (parent != null) { buffer.append(parent.asPath()); diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java index e527e1a..fcc02ca 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/NullPropertyPointer.java @@ -212,7 +212,7 @@ public class NullPropertyPointer extends PropertyPointer { if (!byNameAttribute) { return super.asPath(); } - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append(getImmediateParentPointer().asPath()); buffer.append("[@name='"); buffer.append(escape(getPropertyName())); diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java index 834f4a6..e05daed 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java @@ -118,7 +118,7 @@ public class DOMAttributePointer extends NodePointer { @Override public String asPath() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); if (parent != null) { buffer.append(parent.asPath()); if (buffer.length() == 0 diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java index bccb30a..d3fdfaf 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java @@ -508,7 +508,7 @@ public class DOMNodePointer extends NodePointer { return "id('" + escape(id) + "')"; } - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); if (parent != null) { buffer.append(parent.asPath()); } @@ -747,7 +747,7 @@ public class DOMNodePointer extends NodePointer { return text == null ? "" : trim ? text.trim() : text; } final NodeList list = node.getChildNodes(); - final StringBuffer buf = new StringBuffer(); + final StringBuilder buf = new StringBuilder(); for (int i = 0; i < list.getLength(); i++) { final Node child = list.item(i); buf.append(stringValue(child)); diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java index adc9c41..5e4c6c2 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/NamespacePointer.java @@ -113,7 +113,7 @@ public class NamespacePointer extends NodePointer { @Override public String asPath() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); if (parent != null) { buffer.append(parent.asPath()); if (buffer.length() == 0 diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java index 7d3970c..a54c259 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java @@ -296,7 +296,7 @@ public class DynamicPropertyPointer extends PropertyPointer { @Override public String asPath() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append(getImmediateParentPointer().asPath()); if (buffer.length() == 0) { buffer.append("/."); diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java index f853697..05dd873 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java @@ -102,7 +102,7 @@ public class JDOMAttributePointer extends NodePointer { @Override public String asPath() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); if (parent != null) { buffer.append(parent.asPath()); if (buffer.length() == 0 diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java index fbfc769..2cc2843 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespacePointer.java @@ -102,7 +102,7 @@ public class JDOMNamespacePointer extends NodePointer { @Override public String asPath() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); if (parent != null) { buffer.append(parent.asPath()); if (buffer.length() == 0 diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java index 5e54476..f04dca0 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java @@ -270,7 +270,7 @@ public class JDOMNodePointer extends NodePointer { @Override public Object getValue() { if (node instanceof Element) { - final StringBuffer buf = new StringBuffer(); + final StringBuilder buf = new StringBuilder(); for (final NodeIterator children = childIterator(null, false, null); children.setPosition(children.getPosition() + 1);) { final NodePointer ptr = children.getNodePointer(); if (ptr.getImmediateNode() instanceof Element || ptr.getImmediateNode() instanceof Text) { @@ -642,7 +642,7 @@ public class JDOMNodePointer extends NodePointer { return "id('" + escape(id) + "')"; } - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); if (parent != null) { buffer.append(parent.asPath()); } diff --git a/src/main/java/org/apache/commons/jxpath/ri/parser/ParseException.java b/src/main/java/org/apache/commons/jxpath/ri/parser/ParseException.java index 3ff88a9..d95f1fb 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/parser/ParseException.java +++ b/src/main/java/org/apache/commons/jxpath/ri/parser/ParseException.java @@ -170,7 +170,7 @@ public String getMessage() { * @return escaped version of the input. */ protected String add_escapes(final String str) { - final StringBuffer retval = new StringBuffer(); + final StringBuilder retval = new StringBuilder(); char ch; for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) diff --git a/src/main/java/org/apache/commons/jxpath/ri/parser/TokenMgrError.java b/src/main/java/org/apache/commons/jxpath/ri/parser/TokenMgrError.java index 68ccfa0..1739a9f 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/parser/TokenMgrError.java +++ b/src/main/java/org/apache/commons/jxpath/ri/parser/TokenMgrError.java @@ -65,7 +65,7 @@ public class TokenMgrError extends Error * @return TODO */ public static final String addEscapes(final String str) { - final StringBuffer retval = new StringBuffer(); + final StringBuilder retval = new StringBuilder(); char ch; for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) diff --git a/src/main/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java b/src/main/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java index fa1db5e..1994b53 100644 --- a/src/main/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java +++ b/src/main/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java @@ -149,7 +149,7 @@ public class ClassLoaderUtil { throw new RuntimeException("Argument className was null."); } else if (className.endsWith("[]")) { - final StringBuffer classNameBuffer = new StringBuffer(); + final StringBuilder classNameBuffer = new StringBuilder(); while (className.endsWith("[]")) { className = className.substring(0, className.length() - 2); classNameBuffer.append("["); diff --git a/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java b/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java index b6def8b..97fda34 100644 --- a/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java +++ b/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java @@ -63,13 +63,13 @@ public class DOMModelTest extends XMLModelTestCase { final boolean text, final boolean pi) { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); appendXMLSignature(buffer, node, elements, attributes, text, pi); return buffer.toString(); } private void appendXMLSignature( - final StringBuffer buffer, + final StringBuilder buffer, final Object object, final boolean elements, final boolean attributes, @@ -120,7 +120,7 @@ public class DOMModelTest extends XMLModelTestCase { } private void appendXMLSignature( - final StringBuffer buffer, + final StringBuilder buffer, final NodeList children, final boolean elements, final boolean attributes, diff --git a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java index d0816c9..8ae0583 100644 --- a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java +++ b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java @@ -69,13 +69,13 @@ public class JDOMModelTest extends XMLModelTestCase { final boolean text, final boolean pi) { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); appendXMLSignature(buffer, node, elements, attributes, text, pi); return buffer.toString(); } private void appendXMLSignature( - final StringBuffer buffer, + final StringBuilder buffer, final Object object, final boolean elements, final boolean attributes, @@ -119,7 +119,7 @@ public class JDOMModelTest extends XMLModelTestCase { } private void appendXMLSignature( - final StringBuffer buffer, + final StringBuilder buffer, final List children, final boolean elements, final boolean attributes,