From 89210e9c1f5a4b81523bd7ee05b4272bdbaebda6 Mon Sep 17 00:00:00 2001 From: "Gerlach, Winfried" Date: Wed, 27 Nov 2024 09:06:23 +0100 Subject: [PATCH] #220 use StringBuilder instead of StringBuffer (+ some cleanup) --- src/main/java/com/ctc/wstx/dtd/DTDId.java | 2 +- src/main/java/com/ctc/wstx/evt/WstxEventReader.java | 4 ++-- src/main/java/com/ctc/wstx/sr/StreamScanner.java | 4 ++-- .../org/codehaus/stax/test/stream/TestGetSegmentedText.java | 2 +- src/test/java/stax2/BaseStax2Test.java | 2 -- src/test/java/wstxtest/io/TestUTF8Reader.java | 5 ++--- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/ctc/wstx/dtd/DTDId.java b/src/main/java/com/ctc/wstx/dtd/DTDId.java index b08e58f1..563146a5 100644 --- a/src/main/java/com/ctc/wstx/dtd/DTDId.java +++ b/src/main/java/com/ctc/wstx/dtd/DTDId.java @@ -111,7 +111,7 @@ public int hashCode() { @Override public String toString() { - StringBuffer sb = new StringBuffer(60); + StringBuilder sb = new StringBuilder(60); sb.append("Public-id: "); sb.append(mPublicId); sb.append(", system-id: "); diff --git a/src/main/java/com/ctc/wstx/evt/WstxEventReader.java b/src/main/java/com/ctc/wstx/evt/WstxEventReader.java index 5665da81..0c84b4be 100644 --- a/src/main/java/com/ctc/wstx/evt/WstxEventReader.java +++ b/src/main/java/com/ctc/wstx/evt/WstxEventReader.java @@ -220,7 +220,7 @@ public String getElementText() throws XMLStreamException // ??? do we need to update mPrePeekEvent now String str = null; - StringBuffer sb = null; + StringBuilder sb = null; // Ok, fine, then just need to loop through and get all the text... for (; true; evt = nextEvent()) { @@ -240,7 +240,7 @@ public String getElementText() throws XMLStreamException str = curr; } else { if (sb == null) { - sb = new StringBuffer(str.length() + curr.length()); + sb = new StringBuilder(str.length() + curr.length()); sb.append(str); } sb.append(curr); diff --git a/src/main/java/com/ctc/wstx/sr/StreamScanner.java b/src/main/java/com/ctc/wstx/sr/StreamScanner.java index 789c2e37..5f81a736 100644 --- a/src/main/java/com/ctc/wstx/sr/StreamScanner.java +++ b/src/main/java/com/ctc/wstx/sr/StreamScanner.java @@ -1120,9 +1120,9 @@ protected void throwNullParent(WstxInputSource curr) *
    *
  1. Entity in question is a simple character entity (either one of * 5 pre-defined ones, or using decimal/hex notation), AND - *
  2. + *
    3. *
  3. Entity fits completely inside current input buffer. - *
  4. + *
    5. *
* If so, character value of entity is returned. Character 0 is returned * otherwise; if so, caller needs to do full resolution. diff --git a/src/test/java/org/codehaus/stax/test/stream/TestGetSegmentedText.java b/src/test/java/org/codehaus/stax/test/stream/TestGetSegmentedText.java index 1a7f7a3d..54292ef1 100644 --- a/src/test/java/org/codehaus/stax/test/stream/TestGetSegmentedText.java +++ b/src/test/java/org/codehaus/stax/test/stream/TestGetSegmentedText.java @@ -196,7 +196,7 @@ private void doTest(boolean ns, boolean coalescing, boolean autoEntity) // Sanity check #2: and string buf should have it too assertEquals ("Expected segment #"+segOffset+" (one-based; read with "+readCount+" reads) to get " - +expLen+" chars; StringBuffer only has "+sb.length(), + +expLen+" chars; StringBuilder only has "+sb.length(), expLen, sb.length()); totalBuf.append(sb); diff --git a/src/test/java/stax2/BaseStax2Test.java b/src/test/java/stax2/BaseStax2Test.java index b1ced115..6bef3838 100644 --- a/src/test/java/stax2/BaseStax2Test.java +++ b/src/test/java/stax2/BaseStax2Test.java @@ -14,8 +14,6 @@ import org.codehaus.stax2.evt.*; import org.codehaus.stax2.ri.Stax2ReaderAdapter; -import org.codehaus.stax2.validation.ValidationProblemHandler; -import org.codehaus.stax2.validation.XMLValidationException; import org.codehaus.stax2.validation.XMLValidationProblem; import org.codehaus.stax2.validation.XMLValidationSchema; diff --git a/src/test/java/wstxtest/io/TestUTF8Reader.java b/src/test/java/wstxtest/io/TestUTF8Reader.java index 04c47f85..78af7c74 100644 --- a/src/test/java/wstxtest/io/TestUTF8Reader.java +++ b/src/test/java/wstxtest/io/TestUTF8Reader.java @@ -1,6 +1,7 @@ package wstxtest.io; import java.io.*; +import java.util.Arrays; import junit.framework.TestCase; @@ -26,9 +27,7 @@ public void testDelAtBufferBoundary() throws IOException // Create input that will cause the array index out of bounds exception byte[] inputBytes = new byte[INPUT_SIZE]; - for (int i=0; i < inputBytes.length; i++) { - inputBytes[i] = CHAR_FILLER; - } + Arrays.fill(inputBytes, CHAR_FILLER); inputBytes[BYTE_BUFFER_SIZE - 1] = CHAR_DEL; InputStream in = new ByteArrayInputStream(inputBytes);