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-bsf.git
commit b766a6b91d652832a7629c3e79d759d7188fac4a
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Dec 10 10:36:06 2023 -0500
Replace internal StringBuffer with StringBuilder
---
src/changes/changes.xml | 7 ++++---
src/main/java/org/apache/bsf/engines/jacl/JaclEngine.java | 2 +-
src/main/java/org/apache/bsf/engines/java/JavaEngine.java | 2 +-
.../java/org/apache/bsf/engines/jython/JythonEngine.java | 4 ++--
src/main/java/org/apache/bsf/util/EngineUtils.java | 2 +-
src/main/java/org/apache/bsf/util/MethodUtils.java | 4 ++--
src/main/java/org/apache/bsf/util/StringUtils.java | 12 ++++++------
src/main/java/org/apache/bsf/util/cf/CodeFormatter.java | 4 ++--
8 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b0f223b..f755c98 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,9 +24,10 @@
</properties>
<body>
<release version="2.5.0" date="YYY-MM-DD" description="TBD.">
- <!-- FIXES -->
- <!-- ADDS -->
- <!-- UPDATES -->
+ <!-- FIX -->
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">Replace internal
StringBuffer with StringBuilder.</action>
+ <!-- ADD -->
+ <!-- UPDATS -->
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
actions/cache from 2 to current.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
actions/checkout 2.3.4 to current.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
actions/setup-java from 1.4.3 to current.</action>
diff --git a/src/main/java/org/apache/bsf/engines/jacl/JaclEngine.java
b/src/main/java/org/apache/bsf/engines/jacl/JaclEngine.java
index 325d613..1be1b09 100644
--- a/src/main/java/org/apache/bsf/engines/jacl/JaclEngine.java
+++ b/src/main/java/org/apache/bsf/engines/jacl/JaclEngine.java
@@ -47,7 +47,7 @@ public class JaclEngine extends BSFEngineImpl {
* @param args an array of arguments to be passed to the extension,
which may be either Vectors of Nodes, or Strings.
*/
public Object call(final Object obj, final String method, final Object[]
args) throws BSFException {
- final StringBuffer tclScript = new StringBuffer(method);
+ final StringBuilder tclScript = new StringBuilder(method);
if (args != null) {
for (int i = 0; i < args.length; i++) {
tclScript.append(" ");
diff --git a/src/main/java/org/apache/bsf/engines/java/JavaEngine.java
b/src/main/java/org/apache/bsf/engines/java/JavaEngine.java
index 82cce45..a5e91b2 100644
--- a/src/main/java/org/apache/bsf/engines/java/JavaEngine.java
+++ b/src/main/java/org/apache/bsf/engines/java/JavaEngine.java
@@ -168,7 +168,7 @@ public class JavaEngine extends BSFEngineImpl {
int startpoint = script.indexOf(placeholder);
int endpoint;
if (startpoint >= 0) {
- final StringBuffer changed = new StringBuffer();
+ final StringBuilder changed = new StringBuilder();
for (; startpoint >= 0; startpoint =
script.indexOf(placeholder, startpoint)) {
changed.setLength(0); // Reset for 2nd pass or later
if (startpoint > 0) {
diff --git a/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java
b/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java
index 8517dbd..1abd2a8 100644
--- a/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java
+++ b/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java
@@ -94,7 +94,7 @@ public class JythonEngine extends BSFEngineImpl {
* We wrapper the original script in a function definition, and
evaluate the function. A hack, no question, but it allows apply() to pretend to
work
* on Jython.
*/
- final StringBuffer script = new
StringBuffer(byteify(funcBody.toString()));
+ final StringBuilder script = new
StringBuilder(byteify(funcBody.toString()));
int index = 0;
script.insert(0, "def bsf_temp_fn():\n");
@@ -227,7 +227,7 @@ public class JythonEngine extends BSFEngineImpl {
private String byteify(final String orig) {
// Ugh. Jython likes to be fed bytes, rather than the input string.
final ByteArrayInputStream bais = new
ByteArrayInputStream(orig.getBytes());
- final StringBuffer s = new StringBuffer();
+ final StringBuilder s = new StringBuilder();
int c;
while ((c = bais.read()) >= 0) {
diff --git a/src/main/java/org/apache/bsf/util/EngineUtils.java
b/src/main/java/org/apache/bsf/util/EngineUtils.java
index ec83126..ccceb00 100644
--- a/src/main/java/org/apache/bsf/util/EngineUtils.java
+++ b/src/main/java/org/apache/bsf/util/EngineUtils.java
@@ -296,7 +296,7 @@ public class EngineUtils {
return "V";
}
} else {
- final StringBuffer sb = new StringBuffer("L");
+ final StringBuilder sb = new StringBuilder("L");
sb.append(cl.getName());
sb.append(";");
return sb.toString().replace('.', '/');
diff --git a/src/main/java/org/apache/bsf/util/MethodUtils.java
b/src/main/java/org/apache/bsf/util/MethodUtils.java
index 6839cdd..4a352fc 100644
--- a/src/main/java/org/apache/bsf/util/MethodUtils.java
+++ b/src/main/java/org/apache/bsf/util/MethodUtils.java
@@ -82,7 +82,7 @@ public class MethodUtils {
return firstElement();
}
if (size() > 1) {
- final StringBuffer buf = new StringBuffer();
+ final StringBuilder buf = new StringBuilder();
final Enumeration e = elements();
buf.append(e.nextElement());
while (e.hasMoreElements()) {
@@ -116,7 +116,7 @@ public class MethodUtils {
* Internal subroutine for getEntryPoint(): Format arguments as a string
describing the function being searched for. Used in verbose exceptions.
*/
private static String callToString(final Class targetClass, final String
methodName, final Class[] argTypes, final boolean isStaticReference) {
- final StringBuffer buf = new StringBuffer();
+ final StringBuilder buf = new StringBuilder();
if (isStaticReference) {
buf.append("static ");
}
diff --git a/src/main/java/org/apache/bsf/util/StringUtils.java
b/src/main/java/org/apache/bsf/util/StringUtils.java
index e35c2b9..d17c6fd 100644
--- a/src/main/java/org/apache/bsf/util/StringUtils.java
+++ b/src/main/java/org/apache/bsf/util/StringUtils.java
@@ -63,7 +63,7 @@ public class StringUtils {
return null;
} else {
final char[] charArray = str.toCharArray();
- final StringBuffer sBuf = new StringBuffer();
+ final StringBuilder sBuf = new StringBuilder();
for (int i = 0; i < charArray.length; i++) {
switch (charArray[i]) {
@@ -99,7 +99,7 @@ public class StringUtils {
return "";
}
- final StringBuffer sRet = new StringBuffer(numberOfChars);
+ final StringBuilder sRet = new StringBuilder(numberOfChars);
for (int i = 0; i < numberOfChars; i++) {
sRet.append(theChar);
@@ -122,7 +122,7 @@ public class StringUtils {
}
public static String getCommaListFromVector(final Vector sourceVector) {
- final StringBuffer strBuf = new StringBuffer();
+ final StringBuilder strBuf = new StringBuilder();
for (int i = 0; i < sourceVector.size(); i++) {
strBuf.append((i > 0 ? ", " : "") + sourceVector.elementAt(i));
@@ -175,7 +175,7 @@ public class StringUtils {
// Handles multi-line strings.
public static String getSafeString(final String scriptStr) {
final BufferedReader in = new BufferedReader(new
StringReader(scriptStr));
- final StringBuffer strBuf = new StringBuffer();
+ final StringBuilder strBuf = new StringBuilder();
String tempLine, previousLine = null;
try {
@@ -241,7 +241,7 @@ public class StringUtils {
return null;
}
- final StringBuffer strBuf = new StringBuffer();
+ final StringBuilder strBuf = new StringBuilder();
final char[] chars = identifierName.toCharArray();
@@ -327,7 +327,7 @@ public class StringUtils {
i++;
}
- final StringBuffer classNameBuf = new StringBuffer();
+ final StringBuilder classNameBuf = new StringBuilder();
switch (classNameChars[i++]) {
case 'B':
diff --git a/src/main/java/org/apache/bsf/util/cf/CodeFormatter.java
b/src/main/java/org/apache/bsf/util/cf/CodeFormatter.java
index 164a95d..74186f6 100644
--- a/src/main/java/org/apache/bsf/util/cf/CodeFormatter.java
+++ b/src/main/java/org/apache/bsf/util/cf/CodeFormatter.java
@@ -63,7 +63,7 @@ public class CodeFormatter {
private int origIndent;
private boolean inCPP_Comment;
- private void addTok(final StringBuffer targetBuf, final StringBuffer
tokBuf, final IndentWriter out) {
+ private void addTok(final StringBuilder targetBuf, final StringBuilder
tokBuf, final IndentWriter out) {
final int tokLength = tokBuf.length(), targetLength =
targetBuf.length();
if (indent + targetLength + tokLength > maxLineLength) {
@@ -160,7 +160,7 @@ public class CodeFormatter {
char quoteChar = ' ';
boolean inEscapeSequence = false;
boolean inString = false;
- final StringBuffer tokBuf = new StringBuffer(), targetBuf = new
StringBuffer(hangingIndent + line.length());
+ final StringBuilder tokBuf = new StringBuilder(), targetBuf = new
StringBuilder(hangingIndent + line.length());
for (int i = 0; i < source.length; i++) {
ch = source[i];
