Provides algorithms for looking up strings used by a - StringSubstitutor. + StringSubstitutor. Standard lookups are defined in - StringLookupFactory + StringLookupFactory and the associated - DefaultStringLookup + DefaultStringLookup enum.

@@ -192,7 +192,7 @@ limitations under the License. construct a complex string.

NOTE: The list of lookups available by default changed in version 1.10.0. See the documentation for - StringLookupFactory + StringLookupFactory for details and instructions on how to reproduce the previous behavior.

From 04d98c4e9d86f2f3eb04079b74885f254fcc8ee8 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 7 Nov 2025 05:58:53 -0500 Subject: [PATCH 049/188] Bump commons-io:commons-io from 2.20.0 to 2.21.0 --- pom.xml | 2 +- src/changes/changes.xml | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index c34914b36d..e54d054494 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ commons-io commons-io - 2.20.0 + 2.21.0 test diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 61138101f9..e12bb48ac8 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -46,17 +46,18 @@ The type attribute can be add,update,fix,remove. - - Fix exception message typo in XmlStringLookup.XmlStringLookup(Map, Path...). - Inserting at end of a TextStringBuilder throws a StringIndexOutOfBoundsException. - - Add experimental CycloneDX VEX file #683. - Add Damerau-Levenshtein distance #687. - - Bump org.apache.commons:commons-parent from 85 to 91 #704. - Bump commons.bytebuddy.version from 1.17.6 to 1.17.8 #696. - Bump graalvm.version from 24.2.2 to 25.0.1 #703, #716. - Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0. + + Fix exception message typo in XmlStringLookup.XmlStringLookup(Map, Path...). + Inserting at end of a TextStringBuilder throws a StringIndexOutOfBoundsException. + + Add experimental CycloneDX VEX file #683. + Add Damerau-Levenshtein distance #687. + + Bump org.apache.commons:commons-parent from 85 to 91 #704. + Bump commons.bytebuddy.version from 1.17.6 to 1.17.8 #696. + Bump graalvm.version from 24.2.2 to 25.0.1 #703, #716. + Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0. + Bump commons-io:commons-io from 2.20.0 to 2.21.0. From 271181b949d248a3f2397e67c44f834c2951486a Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 7 Nov 2025 15:18:39 -0500 Subject: [PATCH 050/188] Typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 29041c11c4..9d1083cc5e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -69,7 +69,7 @@ Making Changes + Respect the original code style: + Only use spaces for indentation; you can check for unnecessary whitespace with `git diff` before committing. + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first. -+ Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied. This may not always be possible but is a best-practice. ++ Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied. This may not always be possible but is a best practice. Unit tests are typically in the `src/test/java` directory. + Run a successful build using the default [Maven](https://maven.apache.org/) goal with `mvn`; that's `mvn` on the command line by itself. + Write a pull request description that is detailed enough to understand what the pull request does, how, and why. From 9398a77cf70f668cf0a72fe5746d3e81b75bc9c7 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 8 Nov 2025 11:23:53 -0500 Subject: [PATCH 051/188] No need to override project/issueManagement/system --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index e54d054494..1f331014d0 100644 --- a/pom.xml +++ b/pom.xml @@ -414,7 +414,6 @@ https://gitbox.apache.org/repos/asf?p=commons-text.git - jira https://issues.apache.org/jira/browse/TEXT From 965f90dc297137e703cbd8d3f79b0239de5bef98 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 11 Nov 2025 07:39:01 -0500 Subject: [PATCH 052/188] Javadoc --- .../org/apache/commons/text/lookup/StringLookupFactory.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java index e3678f3ff1..229c410d39 100644 --- a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java +++ b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java @@ -363,7 +363,7 @@ Map getDefaultStringLookups() { /** * Name of the system property used to determine the string lookups added by the {@link #addDefaultStringLookups(Map)} method. Use of this property is only - * required in cases where the set of default lookups must be modified. (See the class documentation for details.) + * required in cases where the set of default lookups must be modified. (See the {@link StringLookupFactory class documentation} for details.) * * @since 1.10.0 */ @@ -657,6 +657,9 @@ private StringLookupFactory(final Path[] fences) { * Adds the default string lookups for this class to {@code stringLookupMap}. The default string lookups are a set of built-in lookups added for convenience * during string interpolation. The defaults may be configured using the {@value #DEFAULT_STRING_LOOKUPS_PROPERTY} system property. See the class * documentation for details and a list of lookups. + *

+ * The format of the property string is a comma-separated list of names from the {@link DefaultStringLookup} enum. + *

* * @param stringLookupMap the map of string lookups to edit. * @since 1.5 From 0b63d06654e10418ce49f83f882531cf603bf80e Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 11 Nov 2025 07:40:04 -0500 Subject: [PATCH 053/188] Javadoc --- .../org/apache/commons/text/lookup/StringLookupFactory.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java index 229c410d39..2f163b8e05 100644 --- a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java +++ b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java @@ -364,6 +364,9 @@ Map getDefaultStringLookups() { /** * Name of the system property used to determine the string lookups added by the {@link #addDefaultStringLookups(Map)} method. Use of this property is only * required in cases where the set of default lookups must be modified. (See the {@link StringLookupFactory class documentation} for details.) + *

+ * The format of the property string is a comma-separated list of names from the {@link DefaultStringLookup} enum. + *

* * @since 1.10.0 */ From aab6439edd5c25d399d3435d8f79be20994270f9 Mon Sep 17 00:00:00 2001 From: Michael Hausegger Date: Fri, 14 Nov 2025 19:47:03 +0100 Subject: [PATCH 054/188] Add unit tests to increase coverage (#719) * Added new Unit Tests to increase coverage * Remove trailing whitespace * I verified a before-and-after JaCoCo report that each change improved coverage. --------- Co-authored-by: TheRealHaui Co-authored-by: Gary Gregory --- .../commons/text/StringSubstitutorTest.java | 7 +++++++ .../text/similarity/HammingDistanceTest.java | 15 +++++++++++++++ .../text/similarity/JaroWinklerDistanceTest.java | 10 ++++++++++ .../similarity/JaroWinklerSimilarityTest.java | 10 ++++++++++ 4 files changed, 42 insertions(+) diff --git a/src/test/java/org/apache/commons/text/StringSubstitutorTest.java b/src/test/java/org/apache/commons/text/StringSubstitutorTest.java index 0f1fbf4339..3692653f10 100644 --- a/src/test/java/org/apache/commons/text/StringSubstitutorTest.java +++ b/src/test/java/org/apache/commons/text/StringSubstitutorTest.java @@ -1078,4 +1078,11 @@ void testSubstitutePreserveEscape() throws IOException { assertEqualsCharSeq("value $${escaped}", replace(sub, org)); } + @Test + void testDetectsCyclicSubstitution() { + final Map map = new HashMap<>(); + map.put("name", ""); + assertThrows(IllegalStateException.class, () -> StringSubstitutor.replace("Hi !", map, "<", ">")); + } + } diff --git a/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java b/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java index 181d2fe277..918a7bedc2 100644 --- a/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java +++ b/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java @@ -59,6 +59,21 @@ void testHammingDistance_nullRightValue() { assertThrows(IllegalArgumentException.class, () -> distance.apply("", null)); } + @Test + void testApply_NullSimilarityInput() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a"))); + } + + @Test + void testApply_SimilarityInputNull() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null)); + } + + @Test + void testApply_DifferentSimilarityInputLength() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), new SimilarityCharacterInput("ab"))); + } + @Test void testHammingDistanceCharSequence() { assertEquals(0, distance.apply("", "")); diff --git a/src/test/java/org/apache/commons/text/similarity/JaroWinklerDistanceTest.java b/src/test/java/org/apache/commons/text/similarity/JaroWinklerDistanceTest.java index f1242fb301..412f1e721c 100644 --- a/src/test/java/org/apache/commons/text/similarity/JaroWinklerDistanceTest.java +++ b/src/test/java/org/apache/commons/text/similarity/JaroWinklerDistanceTest.java @@ -95,4 +95,14 @@ void testGetJaroWinklerDistance_StringString() { assertEquals(1 - 0.51111d, distance.apply("foo", " foo"), 0.00001d); } + @Test + void testApply_NullSimilarityInput() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a"))); + } + + @Test + void testApply_SimilarityInputNull() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null)); + } + } diff --git a/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java b/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java index a5acfb2394..0b1f97052a 100644 --- a/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java +++ b/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java @@ -136,4 +136,14 @@ void testGetJaroWinklerSimilarity_StringString() { assertEquals(0.911111d, similarity.apply(wrap("John Horn"), "John Hopkins"), 0.00001d); } + @Test + void testApply_NullSimilarityInput() { + assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, new SimilarityCharacterInput("a"))); + } + + @Test + void testApply_SimilarityInputNull() { + assertThrows(IllegalArgumentException.class, () -> similarity.apply(new SimilarityCharacterInput("a"), null)); + } + } From 9280e357ac8ef9c9a8b4dc0c35985f9b6a5ef538 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 14 Nov 2025 13:49:03 -0500 Subject: [PATCH 055/188] Add unit tests to increase coverage #719 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e12bb48ac8..21c89d0d00 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -52,6 +52,7 @@ The type attribute can be add,update,fix,remove. Add experimental CycloneDX VEX file #683. Add Damerau-Levenshtein distance #687. + Add unit tests to increase coverage #719. Bump org.apache.commons:commons-parent from 85 to 91 #704. Bump commons.bytebuddy.version from 1.17.6 to 1.17.8 #696. From 0211ac6868f7329256a093de6b87c67c393cb424 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 14 Nov 2025 13:59:25 -0500 Subject: [PATCH 056/188] Sort members --- .../commons/text/StringSubstitutorTest.java | 14 +++--- .../text/similarity/HammingDistanceTest.java | 48 +++++++++---------- .../similarity/JaroWinklerDistanceTest.java | 20 ++++---- .../similarity/JaroWinklerSimilarityTest.java | 28 +++++------ 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/test/java/org/apache/commons/text/StringSubstitutorTest.java b/src/test/java/org/apache/commons/text/StringSubstitutorTest.java index 3692653f10..75f112ba6b 100644 --- a/src/test/java/org/apache/commons/text/StringSubstitutorTest.java +++ b/src/test/java/org/apache/commons/text/StringSubstitutorTest.java @@ -228,6 +228,13 @@ void testConstructorStringSubstitutor() { assertTrue(target.getVariableSuffixMatcher().toString().endsWith("['s']"), target.getValueDelimiterMatcher().toString()); } + @Test + void testDetectsCyclicSubstitution() { + final Map map = new HashMap<>(); + map.put("name", ""); + assertThrows(IllegalStateException.class, () -> StringSubstitutor.replace("Hi !", map, "<", ">")); + } + /** * Tests get set. */ @@ -1078,11 +1085,4 @@ void testSubstitutePreserveEscape() throws IOException { assertEqualsCharSeq("value $${escaped}", replace(sub, org)); } - @Test - void testDetectsCyclicSubstitution() { - final Map map = new HashMap<>(); - map.put("name", ""); - assertThrows(IllegalStateException.class, () -> StringSubstitutor.replace("Hi !", map, "<", ">")); - } - } diff --git a/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java b/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java index 918a7bedc2..0b8e5e133c 100644 --- a/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java +++ b/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java @@ -36,42 +36,42 @@ public static void setUp() { distance = new HammingDistance(); } - @ParameterizedTest - @MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()") - void testHammingDistance(final Class cls) { - assertEquals(0, distance.apply(SimilarityInputTest.build(cls, ""), SimilarityInputTest.build(cls, ""))); - assertEquals(0, distance.apply(SimilarityInputTest.build(cls, "pappa"), SimilarityInputTest.build(cls, "pappa"))); - assertEquals(1, distance.apply(SimilarityInputTest.build(cls, "papaa"), SimilarityInputTest.build(cls, "pappa"))); - assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kathrin"))); - assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kerstin"))); - assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "1011101"), SimilarityInputTest.build(cls, "1001001"))); - assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "2173896"), SimilarityInputTest.build(cls, "2233796"))); - assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "ATCG"), SimilarityInputTest.build(cls, "ACCC"))); + @Test + void testApply_DifferentSimilarityInputLength() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), new SimilarityCharacterInput("ab"))); } @Test - void testHammingDistance_nullLeftValue() { - assertThrows(IllegalArgumentException.class, () -> distance.apply(null, "")); - } + void testApply_NullSimilarityInput() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a"))); + } @Test - void testHammingDistance_nullRightValue() { - assertThrows(IllegalArgumentException.class, () -> distance.apply("", null)); + void testApply_SimilarityInputNull() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null)); } - @Test - void testApply_NullSimilarityInput() { - assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a"))); - } + @ParameterizedTest + @MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()") + void testHammingDistance(final Class cls) { + assertEquals(0, distance.apply(SimilarityInputTest.build(cls, ""), SimilarityInputTest.build(cls, ""))); + assertEquals(0, distance.apply(SimilarityInputTest.build(cls, "pappa"), SimilarityInputTest.build(cls, "pappa"))); + assertEquals(1, distance.apply(SimilarityInputTest.build(cls, "papaa"), SimilarityInputTest.build(cls, "pappa"))); + assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kathrin"))); + assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kerstin"))); + assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "1011101"), SimilarityInputTest.build(cls, "1001001"))); + assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "2173896"), SimilarityInputTest.build(cls, "2233796"))); + assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "ATCG"), SimilarityInputTest.build(cls, "ACCC"))); + } @Test - void testApply_SimilarityInputNull() { - assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null)); + void testHammingDistance_nullLeftValue() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(null, "")); } @Test - void testApply_DifferentSimilarityInputLength() { - assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), new SimilarityCharacterInput("ab"))); + void testHammingDistance_nullRightValue() { + assertThrows(IllegalArgumentException.class, () -> distance.apply("", null)); } @Test diff --git a/src/test/java/org/apache/commons/text/similarity/JaroWinklerDistanceTest.java b/src/test/java/org/apache/commons/text/similarity/JaroWinklerDistanceTest.java index 412f1e721c..509d58bb59 100644 --- a/src/test/java/org/apache/commons/text/similarity/JaroWinklerDistanceTest.java +++ b/src/test/java/org/apache/commons/text/similarity/JaroWinklerDistanceTest.java @@ -36,6 +36,16 @@ public static void setUp() { distance = new JaroWinklerDistance(); } + @Test + void testApply_NullSimilarityInput() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a"))); + } + + @Test + void testApply_SimilarityInputNull() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null)); + } + @ParameterizedTest @MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()") void testGetJaroWinklerDistance(final Class cls) { @@ -95,14 +105,4 @@ void testGetJaroWinklerDistance_StringString() { assertEquals(1 - 0.51111d, distance.apply("foo", " foo"), 0.00001d); } - @Test - void testApply_NullSimilarityInput() { - assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a"))); - } - - @Test - void testApply_SimilarityInputNull() { - assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null)); - } - } diff --git a/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java b/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java index 0b1f97052a..f2a362dc12 100644 --- a/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java +++ b/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java @@ -78,6 +78,16 @@ public String toString() { }; } + @Test + void testApply_NullSimilarityInput() { + assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, new SimilarityCharacterInput("a"))); + } + + @Test + void testApply_SimilarityInputNull() { + assertThrows(IllegalArgumentException.class, () -> similarity.apply(new SimilarityCharacterInput("a"), null)); + } + @ParameterizedTest @MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()") void testGetJaroWinklerSimilarity(final Class cls) { @@ -111,10 +121,10 @@ void testGetJaroWinklerSimilarity_NullString() { assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, "clear")); } - @Test - void testGetJaroWinklerSimilarity_StringNull() { - assertThrows(IllegalArgumentException.class, () -> similarity.apply(" ", null)); - } + @Test + void testGetJaroWinklerSimilarity_StringNull() { + assertThrows(IllegalArgumentException.class, () -> similarity.apply(" ", null)); + } @Test void testGetJaroWinklerSimilarity_StringString() { @@ -136,14 +146,4 @@ void testGetJaroWinklerSimilarity_StringString() { assertEquals(0.911111d, similarity.apply(wrap("John Horn"), "John Hopkins"), 0.00001d); } - @Test - void testApply_NullSimilarityInput() { - assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, new SimilarityCharacterInput("a"))); - } - - @Test - void testApply_SimilarityInputNull() { - assertThrows(IllegalArgumentException.class, () -> similarity.apply(new SimilarityCharacterInput("a"), null)); - } - } From b696bda8326f196803af3deee16528fc8c7400a0 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 15 Nov 2025 08:48:47 -0500 Subject: [PATCH 057/188] No tabs for you --- .../text/similarity/HammingDistanceTest.java | 32 +++++++++---------- .../similarity/JaroWinklerSimilarityTest.java | 16 +++++----- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java b/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java index 0b8e5e133c..7eb744856e 100644 --- a/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java +++ b/src/test/java/org/apache/commons/text/similarity/HammingDistanceTest.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.text.similarity; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -42,27 +43,27 @@ void testApply_DifferentSimilarityInputLength() { } @Test - void testApply_NullSimilarityInput() { - assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a"))); - } + void testApply_NullSimilarityInput() { + assertThrows(IllegalArgumentException.class, () -> distance.apply(null, new SimilarityCharacterInput("a"))); + } @Test void testApply_SimilarityInputNull() { assertThrows(IllegalArgumentException.class, () -> distance.apply(new SimilarityCharacterInput("a"), null)); } - @ParameterizedTest - @MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()") - void testHammingDistance(final Class cls) { - assertEquals(0, distance.apply(SimilarityInputTest.build(cls, ""), SimilarityInputTest.build(cls, ""))); - assertEquals(0, distance.apply(SimilarityInputTest.build(cls, "pappa"), SimilarityInputTest.build(cls, "pappa"))); - assertEquals(1, distance.apply(SimilarityInputTest.build(cls, "papaa"), SimilarityInputTest.build(cls, "pappa"))); - assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kathrin"))); - assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kerstin"))); - assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "1011101"), SimilarityInputTest.build(cls, "1001001"))); - assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "2173896"), SimilarityInputTest.build(cls, "2233796"))); - assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "ATCG"), SimilarityInputTest.build(cls, "ACCC"))); - } + @ParameterizedTest + @MethodSource("org.apache.commons.text.similarity.SimilarityInputTest#similarityInputsEquals()") + void testHammingDistance(final Class cls) { + assertEquals(0, distance.apply(SimilarityInputTest.build(cls, ""), SimilarityInputTest.build(cls, ""))); + assertEquals(0, distance.apply(SimilarityInputTest.build(cls, "pappa"), SimilarityInputTest.build(cls, "pappa"))); + assertEquals(1, distance.apply(SimilarityInputTest.build(cls, "papaa"), SimilarityInputTest.build(cls, "pappa"))); + assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kathrin"))); + assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "karolin"), SimilarityInputTest.build(cls, "kerstin"))); + assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "1011101"), SimilarityInputTest.build(cls, "1001001"))); + assertEquals(3, distance.apply(SimilarityInputTest.build(cls, "2173896"), SimilarityInputTest.build(cls, "2233796"))); + assertEquals(2, distance.apply(SimilarityInputTest.build(cls, "ATCG"), SimilarityInputTest.build(cls, "ACCC"))); + } @Test void testHammingDistance_nullLeftValue() { @@ -85,5 +86,4 @@ void testHammingDistanceCharSequence() { assertEquals(3, distance.apply("2173896", "2233796")); assertEquals(2, distance.apply("ATCG", "ACCC")); } - } diff --git a/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java b/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java index f2a362dc12..55986ab59d 100644 --- a/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java +++ b/src/test/java/org/apache/commons/text/similarity/JaroWinklerSimilarityTest.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.text.similarity; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -79,9 +80,9 @@ public String toString() { } @Test - void testApply_NullSimilarityInput() { - assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, new SimilarityCharacterInput("a"))); - } + void testApply_NullSimilarityInput() { + assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, new SimilarityCharacterInput("a"))); + } @Test void testApply_SimilarityInputNull() { @@ -121,10 +122,10 @@ void testGetJaroWinklerSimilarity_NullString() { assertThrows(IllegalArgumentException.class, () -> similarity.apply(null, "clear")); } - @Test - void testGetJaroWinklerSimilarity_StringNull() { - assertThrows(IllegalArgumentException.class, () -> similarity.apply(" ", null)); - } + @Test + void testGetJaroWinklerSimilarity_StringNull() { + assertThrows(IllegalArgumentException.class, () -> similarity.apply(" ", null)); + } @Test void testGetJaroWinklerSimilarity_StringString() { @@ -145,5 +146,4 @@ void testGetJaroWinklerSimilarity_StringString() { assertEquals(0.941666d, similarity.apply(wrap("aaabcd"), "aaacdb"), 0.00001d); assertEquals(0.911111d, similarity.apply(wrap("John Horn"), "John Hopkins"), 0.00001d); } - } From 4d8b9098e05f21e7abaa3bc6300a950c8faa4010 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Nov 2025 08:49:54 -0500 Subject: [PATCH 058/188] Bump github/codeql-action from 4.31.2 to 4.31.3 (#721) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.2 to 4.31.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/0499de31b99561a6d14a36a5f662c2a54f91beee...014f16e7ab1402f30e7c3329d33797e7948572db) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.31.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a04eb0532f..a3881f0766 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # 3.29.5 + uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # 3.29.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # 3.29.5 + uses: github/codeql-action/autobuild@014f16e7ab1402f30e7c3329d33797e7948572db # 3.29.5 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # 3.29.5 + uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # 3.29.5 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 2372664fcd..8f94802660 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # 3.29.5 + uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # 3.29.5 with: sarif_file: results.sarif From 45584f05c622e80511ae6327220a59c29d6c0da2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Nov 2025 08:50:04 -0500 Subject: [PATCH 059/188] Bump actions/dependency-review-action from 4.8.1 to 4.8.2 (#720) Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.8.1 to 4.8.2. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/40c09b7dc99638e5ddb0bfd91c1673effc064d8a...3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-version: 4.8.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index a657a4ae2c..11834ed9d1 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -28,4 +28,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: 'Dependency Review PR' - uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1 + uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2 From d255668d8971dc0f76e399d35dce4e3db3752c08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Nov 2025 08:55:57 -0500 Subject: [PATCH 060/188] Bump org.apache.commons:commons-parent from 91 to 92 (#723) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 91 to 92. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-version: '92' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f331014d0..5d2afd3371 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.apache.commons commons-parent - 91 + 92 commons-text 1.15.0-SNAPSHOT From 5c4c7c35952f4654ef872881fd59d60fd995245d Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 15 Nov 2025 08:56:25 -0500 Subject: [PATCH 061/188] Bump org.apache.commons:commons-parent from 91 to 92 #723 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 21c89d0d00..5f913a9d7a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -54,7 +54,7 @@ The type attribute can be add,update,fix,remove. Add Damerau-Levenshtein distance #687. Add unit tests to increase coverage #719. - Bump org.apache.commons:commons-parent from 85 to 91 #704. + Bump org.apache.commons:commons-parent from 85 to 92 #704, #723. Bump commons.bytebuddy.version from 1.17.6 to 1.17.8 #696. Bump graalvm.version from 24.2.2 to 25.0.1 #703, #716. Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0. From d7bc06c49f28cbbde09c01990b5a3c3ca9a14036 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 15 Nov 2025 08:56:46 -0500 Subject: [PATCH 062/188] Fix typo in exception message for TextStringBuilder --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 5f913a9d7a..b24bd1a0f9 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ The type attribute can be add,update,fix,remove. Fix exception message typo in XmlStringLookup.XmlStringLookup(Map, Path...). - Inserting at end of a TextStringBuilder throws a StringIndexOutOfBoundsException. + Inserting at the end of a TextStringBuilder throws a StringIndexOutOfBoundsException. Add experimental CycloneDX VEX file #683. Add Damerau-Levenshtein distance #687. From 2b229580f64e8c3cd39e6d172e728e00f21a14cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Nov 2025 09:04:17 -0500 Subject: [PATCH 063/188] Bump commons.bytebuddy.version from 1.17.8 to 1.18.1 (#722) Bumps `commons.bytebuddy.version` from 1.17.8 to 1.18.1. Updates `net.bytebuddy:byte-buddy` from 1.17.8 to 1.18.1 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.17.8...byte-buddy-1.18.1) Updates `net.bytebuddy:byte-buddy-agent` from 1.17.8 to 1.18.1 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.17.8...byte-buddy-1.18.1) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-version: 1.18.1 dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: net.bytebuddy:byte-buddy-agent dependency-version: 1.18.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d2afd3371..fa0d58d927 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-text site-content 3.19.0 - 1.17.8 + 1.18.1 1.6 false 1.37 From 213a883d915799e2b087ab28099536a9d7e1b1c6 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 15 Nov 2025 09:05:03 -0500 Subject: [PATCH 064/188] Bump commons.bytebuddy.version from 1.17.8 to 1.18.1 #722 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index b24bd1a0f9..260ef37daa 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -55,7 +55,7 @@ The type attribute can be add,update,fix,remove. Add unit tests to increase coverage #719. Bump org.apache.commons:commons-parent from 85 to 92 #704, #723. - Bump commons.bytebuddy.version from 1.17.6 to 1.17.8 #696. + Bump commons.bytebuddy.version from 1.17.6 to 1.18.1 #696, #722. Bump graalvm.version from 24.2.2 to 25.0.1 #703, #716. Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0. Bump commons-io:commons-io from 2.20.0 to 2.21.0. From b1f661539eac561501a8a860a3f140bc6937c8d4 Mon Sep 17 00:00:00 2001 From: Sebb Date: Sat, 15 Nov 2025 17:45:49 +0000 Subject: [PATCH 065/188] Dependabot => quarterly --- .github/dependabot.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 00079caf1b..90ec55f742 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,10 +18,8 @@ updates: - package-ecosystem: "maven" directory: "/" schedule: - interval: "weekly" - day: "friday" + interval: "quarterly" - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "weekly" - day: "friday" + interval: "quarterly" From b2b5b978ccc1cdcf08e8812f17657a71bdf3b092 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 16 Nov 2025 09:56:56 -0500 Subject: [PATCH 066/188] Bump commons-lang3 from 3.19.0 to 3.20.0 --- pom.xml | 2 +- src/changes/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fa0d58d927..4b221340f6 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ text https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-text site-content - 3.19.0 + 3.20.0 1.18.1 1.6 false diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 260ef37daa..a72d382cf3 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -57,7 +57,7 @@ The type attribute can be add,update,fix,remove. Bump org.apache.commons:commons-parent from 85 to 92 #704, #723. Bump commons.bytebuddy.version from 1.17.6 to 1.18.1 #696, #722. Bump graalvm.version from 24.2.2 to 25.0.1 #703, #716. - Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0. + Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.20.0. Bump commons-io:commons-io from 2.20.0 to 2.21.0. From c3c3b598220b63aa1776c56482dd4a9345379783 Mon Sep 17 00:00:00 2001 From: Michael Hausegger Date: Tue, 18 Nov 2025 18:47:20 +0100 Subject: [PATCH 067/188] TextStringBuilderTest#testAppendToStringBuffer appends to StringBuffer now (#724) Co-authored-by: TheRealHaui --- .../java/org/apache/commons/text/TextStringBuilderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java index 8ef3eaa111..3317543f73 100644 --- a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java +++ b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java @@ -246,7 +246,7 @@ void testAppendToCharBuffer() throws Exception { @Test void testAppendToStringBuffer() throws Exception { final TextStringBuilder sb = new TextStringBuilder("1234567890"); - final StringBuilder buffer = new StringBuilder("Test "); + final StringBuffer buffer = new StringBuffer("Test "); sb.appendTo(buffer); From eb00fd532ac4e3e59772939d434aaf7224fb5246 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 18 Nov 2025 12:49:03 -0500 Subject: [PATCH 068/188] Fix TextStringBuilderTest.testAppendToCharBuffer() to use proper argument type #724 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a72d382cf3..ef5abe56ee 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -49,6 +49,7 @@ The type attribute can be add,update,fix,remove. Fix exception message typo in XmlStringLookup.XmlStringLookup(Map, Path...). Inserting at the end of a TextStringBuilder throws a StringIndexOutOfBoundsException. + Fix TextStringBuilderTest.testAppendToCharBuffer() to use proper argument type #724. Add experimental CycloneDX VEX file #683. Add Damerau-Levenshtein distance #687. From 6f42263ec6e78cf86b697f936a5bed054068c3d6 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 21 Nov 2025 14:25:44 +0000 Subject: [PATCH 069/188] Use HTTPS to download XML Schema --- src/site/xdoc/download_text.xml | 2 +- src/site/xdoc/issue-tracking.xml | 2 +- src/site/xdoc/mail-lists.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/xdoc/download_text.xml b/src/site/xdoc/download_text.xml index 12c6a1a08a..4f7cbc7c3a 100644 --- a/src/site/xdoc/download_text.xml +++ b/src/site/xdoc/download_text.xml @@ -58,7 +58,7 @@ limitations under the License. --> + xsi:schemaLocation="https://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd"> Download Apache Commons Text Apache Commons Team diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml index 83219a0dd5..9ef2de7e3f 100644 --- a/src/site/xdoc/issue-tracking.xml +++ b/src/site/xdoc/issue-tracking.xml @@ -43,7 +43,7 @@ limitations under the License. --> + xsi:schemaLocation="https://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd"> Apache Commons Text Issue tracking Apache Commons Team diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index 806e21bb19..c8734db5fb 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -41,7 +41,7 @@ limitations under the License. --> + xsi:schemaLocation="https://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd"> Apache Commons Text Mailing Lists Apache Commons Team From db60004c6bdc6d1b15c39fb04c4e9e022d1e1700 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 21 Nov 2025 14:44:48 +0000 Subject: [PATCH 070/188] Bump CodeQL 4.31.4 --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a3881f0766..60d115d843 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # 3.29.5 + uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # 4.31.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@014f16e7ab1402f30e7c3329d33797e7948572db # 3.29.5 + uses: github/codeql-action/autobuild@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # 4.31.4 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # 3.29.5 + uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # 4.31.4 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 8f94802660..d0348717cf 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # 3.29.5 + uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # 4.31.4 with: sarif_file: results.sarif From 66bafadc42c722ce8e8f99f318408ba5baca13b8 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 21 Nov 2025 19:46:51 +0000 Subject: [PATCH 071/188] Bump actions/checkout from v5.0.0 to v6.0.0 --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 60d115d843..db1d51c381 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 with: persist-credentials: false - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 11834ed9d1..b58ce93016 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -26,6 +26,6 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 - name: 'Dependency Review PR' uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6724e87101..882c73abbd 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -34,7 +34,7 @@ jobs: experimental: true steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 with: persist-credentials: false - name: Set up JDK ${{ matrix.java }} diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index d0348717cf..4270678db1 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 with: persist-credentials: false From 13fe39124867d03110513304edda1312c5c6f0db Mon Sep 17 00:00:00 2001 From: Michael Hausegger Date: Fri, 21 Nov 2025 23:22:10 +0100 Subject: [PATCH 072/188] Added new test for CharSequenceTranslator#with. (#725) * Added new test for CharSequenceTranslator#with. * Fixed typo * Reduce whitespace --------- Co-authored-by: TheRealHaui Co-authored-by: Gary Gregory --- src/changes/changes.xml | 2 +- .../translate/CharSequenceTranslatorTest.java | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java diff --git a/src/changes/changes.xml b/src/changes/changes.xml index ef5abe56ee..e9c6b331a8 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -49,7 +49,7 @@ The type attribute can be add,update,fix,remove. Fix exception message typo in XmlStringLookup.XmlStringLookup(Map, Path...). Inserting at the end of a TextStringBuilder throws a StringIndexOutOfBoundsException. - Fix TextStringBuilderTest.testAppendToCharBuffer() to use proper argument type #724. + Fix TextStringBuilderTest.testAppendToCharBuffer() to use proper argument type #724. Add experimental CycloneDX VEX file #683. Add Damerau-Levenshtein distance #687. diff --git a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java new file mode 100644 index 0000000000..8bc38cae71 --- /dev/null +++ b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.commons.text.translate; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.IOException; +import java.io.Writer; + +import org.junit.jupiter.api.Test; + + +class CharSequenceTranslatorTest { + + //Used to count translate invocations + private int translateInvocationCounter; + + @Test + void testWith() throws IOException { + CharSequenceTranslator charSequenceTranslatorOne = new TestCharSequenceTranslator(); + CharSequenceTranslator charSequenceTranslatorTwo = new TestCharSequenceTranslator(); + CharSequenceTranslator charSequenceTranslatorThree = new TestCharSequenceTranslator(); + CharSequenceTranslator aggregatedTranslator = charSequenceTranslatorOne.with(charSequenceTranslatorTwo, charSequenceTranslatorThree); + aggregatedTranslator.translate("", 0, null); + assertTrue(aggregatedTranslator instanceof AggregateTranslator); + assertEquals(3, translateInvocationCounter); + } + + private final class TestCharSequenceTranslator extends CharSequenceTranslator { + @Override + public int translate(final CharSequence input, final int index, final Writer writer) { + translateInvocationCounter++; + return 0; + } + + } + +} From 8625878805284992c76ce3a5b0d32fb177f667e3 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 21 Nov 2025 22:24:39 +0000 Subject: [PATCH 073/188] Sort members Use final --- .../translate/CharSequenceTranslatorTest.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java index 8bc38cae71..7585f71df1 100644 --- a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java +++ b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java @@ -16,8 +16,8 @@ */ package org.apache.commons.text.translate; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.Writer; @@ -27,27 +27,27 @@ class CharSequenceTranslatorTest { + private final class TestCharSequenceTranslator extends CharSequenceTranslator { + @Override + public int translate(final CharSequence input, final int index, final Writer writer) { + translateInvocationCounter++; + return 0; + } + + } + //Used to count translate invocations private int translateInvocationCounter; @Test void testWith() throws IOException { - CharSequenceTranslator charSequenceTranslatorOne = new TestCharSequenceTranslator(); - CharSequenceTranslator charSequenceTranslatorTwo = new TestCharSequenceTranslator(); - CharSequenceTranslator charSequenceTranslatorThree = new TestCharSequenceTranslator(); - CharSequenceTranslator aggregatedTranslator = charSequenceTranslatorOne.with(charSequenceTranslatorTwo, charSequenceTranslatorThree); + final CharSequenceTranslator charSequenceTranslatorOne = new TestCharSequenceTranslator(); + final CharSequenceTranslator charSequenceTranslatorTwo = new TestCharSequenceTranslator(); + final CharSequenceTranslator charSequenceTranslatorThree = new TestCharSequenceTranslator(); + final CharSequenceTranslator aggregatedTranslator = charSequenceTranslatorOne.with(charSequenceTranslatorTwo, charSequenceTranslatorThree); aggregatedTranslator.translate("", 0, null); assertTrue(aggregatedTranslator instanceof AggregateTranslator); assertEquals(3, translateInvocationCounter); } - private final class TestCharSequenceTranslator extends CharSequenceTranslator { - @Override - public int translate(final CharSequence input, final int index, final Writer writer) { - translateInvocationCounter++; - return 0; - } - - } - } From 2eb7d4c39119b7b6419794d2a0c4488afc8044e2 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 21 Nov 2025 22:26:29 +0000 Subject: [PATCH 074/188] Add new test for CharSequenceTranslator#with() #725 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e9c6b331a8..963c8aa72d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -54,6 +54,7 @@ The type attribute can be add,update,fix,remove. Add experimental CycloneDX VEX file #683. Add Damerau-Levenshtein distance #687. Add unit tests to increase coverage #719. + Add new test for CharSequenceTranslator#with() #725. Bump org.apache.commons:commons-parent from 85 to 92 #704, #723. Bump commons.bytebuddy.version from 1.17.6 to 1.18.1 #696, #722. From ecff9a0ad3c7a6287532fa3a4293d41dc810a12f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 Nov 2025 08:53:12 -0500 Subject: [PATCH 075/188] Bump org.apache.commons:commons-parent from 92 to 93 (#726) Bumps org.apache.commons:commons-parent from 92 to 93. --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-version: '93' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b221340f6..b173021fd3 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.apache.commons commons-parent - 92 + 93 commons-text 1.15.0-SNAPSHOT From 05a02e16240d8f4d3f6c623acee41ec916e29440 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 22 Nov 2025 08:53:43 -0500 Subject: [PATCH 076/188] Bump org.apache.commons:commons-parent from 92 to 93 #726 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 963c8aa72d..4a2aaa1c8b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -56,7 +56,7 @@ The type attribute can be add,update,fix,remove. Add unit tests to increase coverage #719. Add new test for CharSequenceTranslator#with() #725. - Bump org.apache.commons:commons-parent from 85 to 92 #704, #723. + Bump org.apache.commons:commons-parent from 85 to 93 #704, #723, #726. Bump commons.bytebuddy.version from 1.17.6 to 1.18.1 #696, #722. Bump graalvm.version from 24.2.2 to 25.0.1 #703, #716. Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.20.0. From fa7a253aaea60059e418563ee31a3807b8fe5bcd Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 23 Nov 2025 10:01:41 -0500 Subject: [PATCH 077/188] Fix Apache RAT plugin console warnings --- pom.xml | 16 ++++++++-------- src/changes/changes.xml | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b173021fd3..5a00fd7778 100644 --- a/pom.xml +++ b/pom.xml @@ -139,14 +139,14 @@ org.apache.rat apache-rat-plugin - - site-content/** - src/site/resources/download_text.cgi - src/site/resources/release-notes/RELEASE-NOTES-*.txt - src/test/resources/org/apache/commons/text/stringEscapeUtilsTestData.txt - src/test/resources/org/apache/commons/text/lcs-perf-analysis-inputs.csv - src/test/resources/org/apache/commons/text/oss-fuzz/** - + + site-content/** + src/site/resources/download_text.cgi + src/site/resources/release-notes/RELEASE-NOTES-*.txt + src/test/resources/org/apache/commons/text/stringEscapeUtilsTestData.txt + src/test/resources/org/apache/commons/text/lcs-perf-analysis-inputs.csv + src/test/resources/org/apache/commons/text/oss-fuzz/** + diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 4a2aaa1c8b..b901a067ea 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -50,6 +50,7 @@ The type attribute can be add,update,fix,remove. Fix exception message typo in XmlStringLookup.XmlStringLookup(Map, Path...). Inserting at the end of a TextStringBuilder throws a StringIndexOutOfBoundsException. Fix TextStringBuilderTest.testAppendToCharBuffer() to use proper argument type #724. + Fix Apache RAT plugin console warnings. Add experimental CycloneDX VEX file #683. Add Damerau-Levenshtein distance #687. From 0c52aa1449895c24088f694f2883fdc3b90e1248 Mon Sep 17 00:00:00 2001 From: Michael Hausegger Date: Wed, 26 Nov 2025 14:00:14 +0100 Subject: [PATCH 078/188] Added new tests for equals method for SimilarityCharacterInput class (#727) Co-authored-by: TheRealHaui --- .../commons/text/similarity/SimilarityCharacterInputTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/apache/commons/text/similarity/SimilarityCharacterInputTest.java b/src/test/java/org/apache/commons/text/similarity/SimilarityCharacterInputTest.java index a8d2ae8400..218fce1916 100644 --- a/src/test/java/org/apache/commons/text/similarity/SimilarityCharacterInputTest.java +++ b/src/test/java/org/apache/commons/text/similarity/SimilarityCharacterInputTest.java @@ -42,6 +42,8 @@ void testEquals(final Class cls) { assertNotEquals(similarityInput1, similarityInput4); assertNotEquals(similarityInput2, similarityInput4); assertNotEquals(similarityInput3, similarityInput4); + assertNotEquals(similarityInput1, null); + assertNotEquals(similarityInput1, new Object()); } @ParameterizedTest From 5f0833414a8a5f498f0e04de47235644f97b0f7a Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 26 Nov 2025 08:01:47 -0500 Subject: [PATCH 079/188] Add test assertions for SimilarityCharacterInput#equals() class #727 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index b901a067ea..741b7fc46b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -56,6 +56,7 @@ The type attribute can be add,update,fix,remove. Add Damerau-Levenshtein distance #687. Add unit tests to increase coverage #719. Add new test for CharSequenceTranslator#with() #725. + Add test assertions for SimilarityCharacterInput#equals() class #727. Bump org.apache.commons:commons-parent from 85 to 93 #704, #723, #726. Bump commons.bytebuddy.version from 1.17.6 to 1.18.1 #696, #722. From b9fac67ec0cd764924a5dc9181c8bc76fa14c6b5 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 26 Nov 2025 08:02:22 -0500 Subject: [PATCH 080/188] Add test assertions for SimilarityCharacterInput#equals() #727 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 741b7fc46b..a04993582f 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -56,7 +56,7 @@ The type attribute can be add,update,fix,remove. Add Damerau-Levenshtein distance #687. Add unit tests to increase coverage #719. Add new test for CharSequenceTranslator#with() #725. - Add test assertions for SimilarityCharacterInput#equals() class #727. + Add test assertions for SimilarityCharacterInput#equals() #727. Bump org.apache.commons:commons-parent from 85 to 93 #704, #723, #726. Bump commons.bytebuddy.version from 1.17.6 to 1.18.1 #696, #722. From 1c87739cbbc866c7ed0eb7fd110688070e3adcca Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 26 Nov 2025 13:06:18 +0000 Subject: [PATCH 081/188] Fix site XML to use version 2.0.0 XML schema --- src/changes/changes.xml | 3 ++- src/site/site.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a04993582f..c6de2b3687 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -51,12 +51,13 @@ The type attribute can be add,update,fix,remove. Inserting at the end of a TextStringBuilder throws a StringIndexOutOfBoundsException. Fix TextStringBuilderTest.testAppendToCharBuffer() to use proper argument type #724. Fix Apache RAT plugin console warnings. + Fix site XML to use version 2.0.0 XML schema. Add experimental CycloneDX VEX file #683. Add Damerau-Levenshtein distance #687. Add unit tests to increase coverage #719. Add new test for CharSequenceTranslator#with() #725. - Add test assertions for SimilarityCharacterInput#equals() #727. + Add test assertions for SimilarityCharacterInput#equals() #727. Bump org.apache.commons:commons-parent from 85 to 93 #704, #723, #726. Bump commons.bytebuddy.version from 1.17.6 to 1.18.1 #696, #722. diff --git a/src/site/site.xml b/src/site/site.xml index cf3fee8aaf..484a229cc1 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - Commons Text - /images/logo.png - /index.html - - + + +

+ @@ -43,4 +43,4 @@ - + From 3f5295bfa4032058a838290d1c888096da2204bd Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 26 Nov 2025 13:09:26 +0000 Subject: [PATCH 082/188] Use new oak leaf logo --- src/media/commons-logo-component-100.xcf | Bin 0 -> 25475 bytes src/media/commons-logo-component.xcf | Bin 0 -> 150711 bytes src/media/logo.png | Bin 0 -> 9454 bytes src/media/logo.xcf | Bin 17288 -> 0 bytes src/site/resources/images/logo.png | Bin 10143 -> 9454 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/media/commons-logo-component-100.xcf create mode 100644 src/media/commons-logo-component.xcf create mode 100644 src/media/logo.png delete mode 100644 src/media/logo.xcf diff --git a/src/media/commons-logo-component-100.xcf b/src/media/commons-logo-component-100.xcf new file mode 100644 index 0000000000000000000000000000000000000000..daba87fdaf87936496a613d983e7a1a63c9817a3 GIT binary patch literal 25475 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

QQ)H1} zjc1(F`j0q_(XTGF&e9D=qf=0Zbb>v0TXY9e68j z_GKr;ND^;QstI&2#ErbKgZO%g8!h5)H2bX9L+Gpr>tI7Sj72_Wq~S0j-U{(nh&Nco zoi_0yn>Yrs<7tR?q^P)&uI7^b6!f2fe%^WL^;}eQE$unI)}w~q_dGSt`>NJ&m($qd zH*k~Q_bFo<-!=5R@z2hbZPS(iiLgZA`BjYf33g}CSIni%X^*Dr@spdC3jGNa`11_0hx1f`vv;)|^Dz1z z2{~1w@Lw^kMC{>W+s@u2k5`SjmPfw$?Qh+?GvHNYRh{>L<^IkpbXj5?)QeDU`@w@d z0T%-n9dukov?5U%>x=h1^NDAiL_c1_yix*3iBcuVErwP?Scz7Pl2L1s71m}(3aval z>SOk{qQ4?5sH99b^C%@VBhz`i|4O<@8CHB|(@D%`Bx{~1D*?3=Txyb62GZE^pp+45 zizM!yovcg(Yhfxez7R-oU98Lq6Pt|?JsfoYLCQ?T%4q-+JUf&QNXm|sF~2%HZgvwT zi%Oi9Y9vZdk0dIT6(^e!D^!+{IU^F!b3~>_$}FfNW|b8(lPF8Z_^hHVjfv)1!JsRF zCCHwPG9~S{@@%OSDsoP)w8N%yMgCfD#yMrDau!926n3wPBzmdHbpCpiTLH37A=*8= zVo?FhLvq-A;61?>z0U9_d*tjKM#C06caG3RgjiBShmH|%& zz8J6-38QGYr0lR415UAnU<}w&2?oqtLf-Unf)g_ddd;vE_ewG&9Cxbl)UelzfjwXx zf~8N+XbmH_()4i>ClT{x&}g?$@@%OSFg`n1+VQvMiZY}oyJv*sBsn77%(*8#RFSZ7%-8|f1k$I ztk}t>lUUA3);v*Gf?X%L)FiJAq!FHWzDSD!N6m&LLV{jlDxwHe34Af&sCZxtLB~fe z1D=dyF<>jOwLCB>!ZZRh%L5~jpJD};N-$vF62YcN6CCGC3~NTMFjkTo(RjWQof^ej zA#F7n3^*zt_>9&hmKDumR!N)$z>^W6-9E{)rB0~mIl0n~zcm*RY}I7^$jHJn;K+PKN2Sg&^8JTP#t51n3y!S&gwgaI#0v&aphO6%L*R8j#%k-)7;7x;rH&&FXG5vBUTT_%2^vrj{O^2uMFVmbFld6631J)(zu)RnA~f4R`(EFzS8_s1+Ue?my}NtSCl_aXV0 ziq-gykI%4VFki|c7WNQ(o${#$7Or2R%5ldxiPiIpl{Qe6H1>A48oP&xuuSy=?Q>sk zMZQ;0w{y3%=K2ursZjT%vx-b&x17O#7Hr>pupfofcYI&eD~gm^a7D7B$wIPt{vcza zxI~R*JZ65iNK~ei`J)xe{~FQtbuN{-@~!KU^mo+%)u|+LmMWcw9yTBCy`l5l34MAg z!&ArqYx-287(~u56HO&{;zxAsg_)LCCaTdDgn{l4jS~F4eN(YY{BTz)a;`9r=qqSk z2k#P>8mau~ldli|<>%3&B`jy%u7j??`vz95VAF2;@{>m%|I|w6TYa(d?UAzicRhCG zm!H4d2}jn*=LT19Wv*wNBVqoe8k^bJ^1OL5n_+;Qfl!1!z{-ykl>yaOt17ww0VHC zDBkRG8fv&5^ZBV#{~

tH0z2J~VEwesr*a#1oFc zp-`MCk?7a_;dHcq;frW}o27M~6pt1yJ5P%wxD38YgGc`Jks}G-j}at`?#>i*JbIpD z5@VXH-ocihk-+_|0@Y*ZEkNWJev~bi#K<5jvht zycQ(pzVhI~TRpbZjadt69}DW*NP=M9NlFej6A{Jf6x((YeX$&E+UJN`g-H7%7qDQa zBr6aftCHGqf+jmj$q^BK3YL;#og)WC_Gt_yN&CXdlDK{!Q%G&ps*{v#wI`yKWP(YJ zQYScjSDTWgeNjpp>;!qP`Rvb*JoU(JiyW%%u!p^xpUrp?C63n_`sDFD`fq#qZT+Cq z`d!@ZNY3qLB*)gf*a_FMSHFMf^~I?A1&^PpmANMR)febG^HbGq zEjk+BVSJ5!ZWcR-Cre5Hhyn1s?>zi}-lkI{?CBlJ{Eu

@{_Ti9p+?PxJ*j>$a6&|V1xLN`QL&KI7>OrzSJaUDuu{$HU~R$mP2k< z6XZFPwPzq3XPr!ODQ8J5hv$wYPL8-)9zp3#p5JCuzrZOLoMN?Bbdo%Dzk0P=%qg$^ z98@2(HEW&8p;=D1vI)edzO%48`*0GyhS3YBVq%vb7VDW7?6!_7CCOCfL76q{hZNi zRL*_SCMPK8zOxvS?xrkT8lz7XK_L=XTj(V58;YRK62Lxm)^-v z@pm$`{sC?%+bGkrS2+QH3TKiF{2=@BuaJI~_ZOgJw_NaUhu%VJyBjAIb7a+4r?C$4 z8b0l!58Q??k?Q*l`6XZ+?B8xCz0IRergS_L*Lw7^O>D?_8>aaaj&H{NL#7!wSptL5 zMHAF4cq*Uq>e#pZ%J>?^Z)ZMod>$wGv6Cr!l8jBpg5S&5zEi*X9ga^quZUl*R5MGA zM?L3I>W5j^Jhh>`s)gC}jb^3hoYwmFiUxLy|6HW%W`2okmK!s*YeEK=z#-)QS*laL zS;nc&bBHaRfB8Ia`$Fb8OB>nA_5t_9;R3f)vpSB|vflojn-wpbIhXE>hW4D+vJuVc zk(qXgP3&*TLhxL=M_4g8!S^QGZO%uv=MsDw7Vr4plFJ)rF^5{_Q_>OVQpu9$3ZFNI z`0gLGYJ7;r*11IE4V=b2o6ADF?0ZFI-;S=n{5bJKE5JX&pm3s{RPa4Rzj9)GvA?wK zzw{Ga4qi{$Bk9xGg&v;I6t

7!E{qChr=jisi1l zW@+l>oR2M-W!8IH0zR`)Yn+lUUs$6(*3e10O&y&2IPSy!Pd?lRyNqWJkNk14p$e^( zQa|F|!o%LX%4zCt+t$&wvuhhy?pkN{-m+7O{(ri}E%L}8;ltl`i5p9s`ZxcQsZcUK zp%IoG@;ATRemCzvMt@VE(_`_{;9H-`6~3zpqd7xsljS{=hHHS8QQhu>bP^sq+~^GT!-D$i5;bn1vcIY;St(}1giiSb{h?@#+jDwTP1*aiJN z7~-k)k)Sev`xh@{nEJ4vcTgpcpLo|hk{JH;>GTnOI;b2c^oxb0DwIBIoX~G%K;@;N zK5m>ae-BRqrJz3UJfZ(9-%cNMozQP02QpPs&;{u!5l^0cDi2an zhnz$Dg~AhwKfit|b0l{9o!4J_5$s{-kooMfX(xt{A3Jg4_kVun^*7%(-WhxQtv6qL z<<338csW|V1dHiU;jX2~P($D2iP^2j@)n}7`i~`3P z&xb+0kR|!KC-hNTdMIT`AI&5U{M!trpY#psW73r4QtY)Xilm5S{u4H%r*LS$_6a6c z*k(~J=dy<_j1L+?qNW3ChCLcx9CQzOe=I@SE-|<3936XTz@fULFif7C6l^^k( zB3?d-V@K(wXFxrNHTa8Zflno#IrI!YcGy1@KXUZ=(Nd7u8`_HG~p$anIG%x5T)_{|H)i)gyR+Sk1GvAiK}w19k` zZouSJY%mh}&=WaB=HX{jhvLuv=6Q5v`RRyx`;*y2=ApxxL$M>zJ%3b`1HI1Sfao8e z%7V?bp^;~gJonq@UwGl@QRA3CiYX0}`KhNfh8%~2LwY(*5X7gSPKO%AVLWP=3yP=G zsP8E-Pt&XeU_SAyRLTUv{u~n!%pJd=kCb4Z;3R$!%!hyC1v)fcKGG$yIQV@Jia1;f z;#YLxAgHe#at&#J&X93<{Ls_C96J2#JY~8h

yICT&(pcUY;#7& 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

@oR0=SGglh`eW;WBOv#V|x#QaQz2X zS>8jSY+R%5Jp{@j&-NYy<^X`6TCEI&M$1hdUeb7f}z!~phVSLf}zUI}o_plIL?%SXA z9!y5*mvG&T`-h3hPTPA#b(dTxObl+Zy@v&(wLP}?ut0qPM3?P7ECk+TdmlU7J7{|? zJJj+U3wV#4`k2upw)X%j-eb;<`?<^7q*hpZzk3O-z2N=tHM49Vs?d_WM9&}0) ziAoP<-o`I8N^tGvH;4A;N%DZ22HcD1BnUUvU_KDLhT_4vU~3*2|4zzzZ(7EVHl<3N52v$>pYnMYkM|TF9XO#01(VjPJJ@P|5zOIcJK%qG37w7NI+0 z8wWpK!y%KL3o?WkqBx0%)HE5h1=juFoUjo>YoRnyT*7sP(1L;Q4DkiW5UsCfz>9kc z)uJ?s%eZ;0Lz0$g07nA7oOE&(w~~}x7|sn>@l|g*ktJCpr@Ja7g=*#Ommenz@peFq zBq0

Du-+YFG1K3sOocRYQy14 z(g~hPzA#KfQ6W*3tTVm*!1{d#%dC~Nzz$ZAp;gev(Pr7uutZQWuD2IU__C~+zCU|A7+mo$JozqX`&Cktpq;g zP>-=`du%Pyf$R5aI{qPkPJ?ao7yosGm*}mB^MwU!W2zpBAN}qFx3yec;w<5k>hIaE ze$k~q%L&b6(;b`{UClR*;twk0k3Mea)+l`s;5s#fV}e-hn|oJJ3o0{(-_eNk;|pDE z0FQkkrGjPn6YLuQK&kI$@k=aFWd1LH`JqRpybXLeCu5#FxfIG7@-nuL+pE>sB}e&6 zmx{6{eI%_$jc1>JP^lkt^zmd_ts1{jZ&Immrt8F?x(Qi_KR%M9RKe!^e*HG*0H+Us z=5lXXB^-x;?BO>w3TG`{KCj$YuM*{n{^hKS&6#|D{SO8z^t}E6=_Pstp9e>CP~^`@ z<&56O=UTmt&wqNu3!P)=TcnHQyZPL#vG2r#e{zC1UicE}GIIx?TN71$K6K1juFQ|l zyhY)Z_moH2H?%eYHT(Q}ULa!bb+O)O*HRCHxTzwdF96<)(Su=Ci5{}548F!-G4-Pb*AD0Zr23|7IReZ| z>Y%ecO2}))u3{ACyhwS}>=COV;^u2S?D^?b`LqC`sw+b6#|MOQ`5PRlH0VYN)mf>U-eivi%Z zw0bx1X6juRk*^r&D=DyF%t8_e_+cmP#VHvb&{<|71&O=Nr9B4UJun-@t472uwo#(n zGK+P6@(qoZDckiHG&0w>-8PF0MI{IMItl8z7USAL`;yU?u4hfwCQb@t8Ix#7BysaH4=c#3E#wf`Pi8qIWBt2!Y;Nm3Kty!|`c77v$C9FM zD#)3{nM_tP?U|Dxaoo*0NSG{2+&8!-i&i9Ii3?j7u&7GHiJN+mBEJ9TYwNJWQijLn zx$5-vMQi#72M5-yp5;C0{)i|+%vQ!nGOEx%s$evng_8xW?BGqT=UKa(;Zo$z!MIZ< z3v=-!n8`JRgr`I{OlzP>vUP^XYXapZfhv|1C6nkptUYBasAa90ER!2HD@6NAP=Xiv z(nt~{5-gRQ_DN78AHPIC)QfnDvT7uVhboG^wBF6Q$jep3u8h3$n%e68ywrp4k4odO z!;ZvTPAuPT3&6G}ab~N?&<>$(0oKww5w$Hq40`4yts|PadAVf)H^`*lZ(D#>!WkXA zW!H`^JG%y16>p`<$tv?$4%il8k>#=VVs*I%5w+ZGTYv?!7T+yjlSvk3?H;+owg4+z z*7j|-1z2!mTQ5??5A43qwt($=jaa~9v48_tte$OIz(MCsl}Jf-9dz@1JWBB`PsMjQ Nt-slP^7~av{a;#jx!nK& literal 0 HcmV?d00001 diff --git a/src/media/commons-logo-component.xcf b/src/media/commons-logo-component.xcf new file mode 100644 index 0000000000000000000000000000000000000000..2c78b608bf420f7053538dedf4ad78944f810d10 GIT binary patch literal 150711 zcmeFa37j28)&Adi?yPtA?an@#Et$DVX0mS(0zza{5ZOcx$RwF;WFw1$&NWd{KxI*p zO=T4q6okkNxPYu8h#;#V`@R!Q2$^K&cKyFkRrk!DG2r{+N8Z=p-{e#C^r`M!T~%Fu z&Z$$UPA^`%Vs+CA3l=qfcH*R2p66vv_PmTj4)pJAQYk4C;ZHd!cOSBp_*X&7B$bfj z!LhEZB>P3>FQ(|ur7OA@_jE2^vveU@9_J%99c$N}xV)!n?W*NV7bapIixw|fwS3i@ zSQGy`>|s;Oq3!#%@7?~PrbWwFb+2n_nl!zsW!}X1_&<5##CbDjv@}gjP~iOkL4odv zw&eFZ3`#y>?dt9YOII##nlzF7oH&dMh|cvZm#%ACx^lsip0!+a!m34!*7mHUVqBkg z><))ttPUE#ADwo{npF#W7Or2@v(KuPis;Qw zc3s$^?Hx;3uIpK|yqh02tz5;O7OYyadQH#TwM$p6Y?=i<|G32qn@+S9(v96ktCyU( zHppDJbVW~axVHPVJ)P^;bg!g6YkF3$bJwm~%_U1ePZheC_pDpj<8l|RTC<{iT~kZ< z`gN;XxDBmdzJ6g3bzHj0T@mIiUA=C>@SGDEcDAnJCHBd8u3ocBO&xw}-IDby=CABt zx_o#xtz0o!Lp#{QoR)po^mMPIH$Jy?-IAvL4mju#s;BO%NE?$Yde(I>>|WO$bYsTk z*?XR_VtLbNd)BDm_Gq8fHL<;^XXS!b3wh#uv>$Q!zMV7M_nZ@(9sY0*Lw5GM?!`?j zyI1t=(ehzh-F1M5d)MAe*R4IIXU$>VD^@S>X_+&#iT|@FaOu1M#QyN3Ju4TlThcOT z+T>~foy$M5bfK=EG-b-fe{lK7)-0u`y4TS#uKx!YAKJsKxn9>E!B}pYGx;A}f7H+q zTINidIB~*1y1^&^`#(5j$*Og$y7m!+IE;6X&P*#@{jS%pr-{+NXz2-iw5(gYXi-bk z`Zdex!$x=R;!?XuHm zPZ)aq8aZkIvQ}6k;+>k7IpQ$mdDyGCrZ{E(hp7CLo~Ev@E?t(PKm5xk=@LU~*72Sj z`3v(Ug+FZxj+I}ZcC1mZYxJ*)6dsRFJI+r#E=W5T*AK5R=9v3M4iEBj0@S@m2giWd zreniDur=*C6b>p6fsidB;RM3Eo)g5rPV8AjmbxM9?T!`QYmQsLx~XNhJD4+@r@FFf z(W;f}_L$cqm@#eAJf7M7!82=m7Oz>ge&s^Wx6W8FdDe`DI&Xir7CuGxl&MoEPAAj# z@w}D$z%5p-Tsv>&>

W$>GoMYQ|B+5xoE~L`gYpn$&-4fPh2={X3vc7 zDU;_

w-|9mBe;V?{)7g^FN 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

<4PnPwhnZ-pV6=do+KJ(Q`iA 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

<|Pyg&uGl~h` znDe18{pxil%FkS}W@4n-8;E`K%C}iAeCfP>G8nJtZ)r5CXE)aB)k^LBL7QHxRR6hg zrtT*7x8+e>xQHq+y28U0^7b+4NO&G)F-bK3Z;F^N;#68z>~*oVunZqpu8iUCYWyqM zmNyA&w*LD5KKbbG{ck<@jt^ zmKW3iY2LRbJ{rIg?50c|i8It9h+F8mHE19wbKJq35WR_4;v^Pcn%+S$|CQG!Nk)gd z@(zS(A%d?E%wwo(ds{X_nJqXB@lh5t5WJ#|*9yv-_&-feyf*p#u8~=ME?CcNmIKyW zVV%vZLacD;YJ`5KMSPdRDqbI9+zRv%ZLM*2DJGRO$g4=@SPdKO)-L(QYl|1Pwn(i( zSrz}MsR=iie16x6RUsFw=OxSmYpvL&*1SyGWnPW=&a^0>c52PbC5&6q9HOl?&LYL6 za$bQdQaRSc22we%$0&=`+9I_EXTFcrl%&@Dt`RFoE?CbingiBa0ZOfT)wEx`8bO?C zQGVjonpaO4w?Z~V)!IZ#iSSfpx`lIh|ICgd!>-=*u>8vI!pbPOn z@WiFZT9;nsW_zj1)qh~CihoN_p{(=DBy8;Xi~I1)+ZyH&IJWI_ztK3lf3=tUwVh1? zm0I2Pa7%FP|89G$J)H4R{2gVsK61gTgJz5!J#O|

`BZxrlvA1 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

vV}Znc9o_9qOqUO0sbpX}9ug%l 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

8D-=uSqvL;`|E0`!g|0qG<~sC_#zhwDS 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 z

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≷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 literal 0 HcmV?d00001 diff --git a/src/media/logo.xcf b/src/media/logo.xcf deleted file mode 100644 index 8b4d18819ea6ff7fc8bcd61e10a6d73d003980e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17288 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 diff --git a/src/site/resources/images/logo.png b/src/site/resources/images/logo.png index 48d4609fec7a387dabaf06f7d5955ba6fbe35259..0c32a3e474662557f6cccc6cfd381a2fecf946ee 100644 GIT binary patch literal 9454 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 literal 10143 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 From 3ed9b5db4debb07953a69daca6c275ed1c8fd291 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 28 Nov 2025 13:29:28 +0000 Subject: [PATCH 083/188] Javadoc --- .../org/apache/commons/text/WordUtils.java | 4 ++-- .../commons/text/similarity/FuzzyScore.java | 6 +++--- .../text/similarity/JaroWinklerDistance.java | 12 ++++++------ .../text/similarity/JaroWinklerSimilarity.java | 12 ++++++------ .../LevenshteinDetailedDistance.java | 18 +++++++++--------- .../text/similarity/LevenshteinDistance.java | 18 +++++++++--------- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/apache/commons/text/WordUtils.java b/src/main/java/org/apache/commons/text/WordUtils.java index ea84d548b7..83f2eec2f1 100644 --- a/src/main/java/org/apache/commons/text/WordUtils.java +++ b/src/main/java/org/apache/commons/text/WordUtils.java @@ -73,8 +73,8 @@ public class WordUtils { * WordUtils.abbreviate("Now is the time for all good men", 20, -1, "")); = "Now is the time for all" * WordUtils.abbreviate("Now is the time for all good men", 50, -1, "")); = "Now is the time for all good men" * WordUtils.abbreviate("Now is the time for all good men", 1000, -1, "")); = "Now is the time for all good men" - * WordUtils.abbreviate("Now is the time for all good men", 9, -10, null)); = IllegalArgumentException - * WordUtils.abbreviate("Now is the time for all good men", 10, 5, null)); = IllegalArgumentException + * WordUtils.abbreviate("Now is the time for all good men", 9, -10, null)); = Throws {@link IllegalArgumentException} + * WordUtils.abbreviate("Now is the time for all good men", 10, 5, null)); = Throws {@link IllegalArgumentException} *

+ Introducing Apache Commons Text +

Apache Commons Text is a set of utility functions and reusable components for processing and manipulating text in a Java environment.

Description

The Commons Text library provides additions to the standard JDK's text handling. Our goal is to provide a consistent set of tools for processing text + generally from computing distances between Strings to being able to efficiently do String escaping of various types.

Using the org.apache.commons.text package

+ Originally the text package was added in Commons Lang 2.2. However, its new home is here. It provides, amongst other classes, a replacement for + StringBuffer + named + StrBuilder + , a class for substituting variables within a String named + StrSubstitutor + and a replacement for StringTokenizer named + StrTokenizer + . While somewhat ungainly, the + Str + prefix has been used to ensure we don't clash with any current or future standard Java classes. +

Beyond the text utilities ported over from Commons Lang, we have also included various string similarity and distance functions. Lastly, there are + also utilities for addressing differences between bodies of text for the sake of viewing these differences.

Class StringEscapeUtils

+ From Lang 3.5, we have moved into Text StringEscapeUtils and StrTokenizer. It provides ways in which to generate pieces of text, such as might be used + for default passwords. StringEscapeUtils contains methods to escape and unescape Java, JavaScript, HTML and XML. It is worth noting that the package + org.apache.commons.text.translate + holds the functionality underpinning the StringEscapeUtils with mappings and translations between such mappings for the sake of doing String escaping. + StrTokenizer is an improved alternative to java.util.StringTokenizer. +

Class StringSubstitutor

The simplest example is to use this class to replace Java System properties. For example:

+        StringSubstitutor.replaceSystemProperties(
+          "You are running with java.version = ${java.version} and os.name = ${os.name}.");
+

+ For details see StringSubstitutor. +

+ Use a StringSubstitutorReader + to avoid reading a whole file into memory as a + String + to perform string substitution, for example, when a Servlet filters a file to a client. +

To build a default full-featured substitutor, use:

Commons Text >= 1.8: org.apache.commons.text.StringSubstitutor.createInterpolator()
Commons Text < 1.8: new + StringSubstitutor(StringLookupFactory.INSTANCE.interpolatorStringLookup())

+ The available substitutions are defined in org.apache.commons.text.lookup.StringLookupFactory. +

Similarity and Distance

+ The + org.apache.commons.text.similarity + packages contains various different mechanisms of calculating "similarity scores" as well as "edit distances between Strings. Note, the difference + between a "similarity score" and a "distance function" is that a distance functions meets the following qualifications: +

d(x,y) >= 0, non-negativity or separation axiom
d(x,y) == 0, if and only if, x == y
d(x,y) == d(y,x), symmetry, and
d(x,z) <= d(x,y) + d(y,z), the triangle inequality

whereas a "similarity score" need not satisfy all such properties. Though, it is fairly easy to "normalize" a similarity score to manufacture an + "edit distance."

The list of "edit distances" that we currently support follow:

Cosine Distance,
Hamming Distance,
Jaccard Distance,
Jaro Winkler Distance,
Levenshtein Distance,
Longest Commons Subsequence Distance,

and the list of "similarity scores" that we support follows:

Cosine Similarity,
Fuzzy Score Similarity,
Jaccard Similarity,
Jaro-Winkler Similarity, and
Longest Common Subsequence Similarity.

Text diff'ing

+ The + org.apache.commons.text.diff + package contains code for doing diff between strings. The initial implementation of the Myers algorithm was adapted from the commons-collections + sequence package. +

Package org.apache.commons.text.diff

+ +

Provides algorithms for diff between strings.

The initial implementation of the Myers algorithm was adapted from the commons-collections sequence package.

Using the org.apache.commons.text.lookup package

+ Provides algorithms for looking up strings used by a StringSubstitutor. Standard lookups are + defined in StringLookupFactory + and the associated DefaultStringLookup + enum. +

+ The example below demonstrates use of the default lookups for + StringSubstitutor + in order to construct a complex string. +

+ NOTE: The list of lookups available by default changed in version 1.10.0. See the documentation for StringLookupFactory for + details and instructions on how to reproduce the previous behavior. +

+final StringSubstitutor interpolator = StringSubstitutor.createInterpolator();
+final String text = interpolator.replace(
+    "Base64 Decoder:        ${base64Decoder:SGVsbG9Xb3JsZCE=}\n" +
+    "Base64 Encoder:        ${base64Encoder:HelloWorld!}\n" +
+    "Java Constant:         ${const:java.awt.event.KeyEvent.VK_ESCAPE}\n" +
+    "Date:                  ${date:yyyy-MM-dd}\n" +
+    "Environment Variable:  ${env:USERNAME}\n" +
+    "File Content:          ${file:UTF-8:src/test/resources/document.properties}\n" +
+    "Java:                  ${java:version}\n" +
+    "Local host:            ${localhost:canonical-name}\n" +
+    "Loopback address:      ${loopbackAddress:canonical-name}\n" +
+    "Properties File:       ${properties:src/test/resources/document.properties::mykey}\n" +
+    "Resource Bundle:       ${resourceBundle:org.apache.commons.text.example.testResourceBundleLookup:mykey}\n" +
+    "System Property:       ${sys:user.dir}\n" +
+    "URL Decoder:           ${urlDecoder:Hello%20World%21}\n" +
+    "URL Encoder:           ${urlEncoder:Hello World!}\n" +
+    "XML Decoder:           ${xmlDecoder:&lt;element&gt;}\n" +
+    "XML Encoder:           ${xmlEncoder:<element>}\n" +
+    "XML XPath:             ${xml:src/test/resources/document.xml:/root/path/to/node}\n");
+

Using the org.apache.commons.text.similarity package

+ +

Provides algorithms for string similarity.

The algorithms that implement the EditDistance interface follow the same simple principle: the more similar (closer) strings are, the lower is the + distance. For example, the words house and hose are closer than house and trousers.

The following algorithms are available at the moment:

CosineDistance
CosineSimilarity
FuzzyScore
HammingDistance
JaroWinklerDistance
JaroWinklerSimilarity
LevenshteinDistance
LongestCommonSubsequenceDistance

+ The + CosineDistance + utilises a + RegexTokenizer + regular expression tokenizer (\w+). And the + LevenshteinDistance + 's behavior can be changed to take into consideration a maximum throughput. +

Using the org.apache.commons.text.translate package

+ +

An API for creating text translation routines from a set of smaller building blocks. Initially created to make it possible for the user to customize + the rules in the StringEscapeUtils class.

These classes are immutable, and therefore thread-safe.

+ Requirements +

Java 8 or above.
If using OSGi, R7 or above.

The Commons Text Package -

Users Guide

-
- [Description] - [text] - [text.diff] - [text.lookup] - [text.similarity] - [text.translate] -
-
-

The Commons Text library provides additions to the standard JDK's - text handling. Our goal is to provide a consistent set of tools for - processing text generally from computing distances between Strings - to being able to efficiently do String escaping of various types. -

- -

Originally the text package was added in Commons Lang 2.2. However, its - new home is here. It provides, amongst other - classes, a replacement for StringBuffer named - StrBuilder, a class for substituting variables within a String - named StrSubstitutor and a replacement for StringTokenizer - named StrTokenizer. While somewhat ungainly, the - Str - prefix has been used to ensure we don't clash with any current - or future standard Java classes. -

- -

Beyond the text utilities ported over from Commons Lang, we have also included various - string similarity and distance functions. Lastly, there are also utilities for - addressing differences between bodies of text for the sake of viewing these - differences. -

- - -

From Lang 3.5, we have moved into Text StringEscapeUtils and StrTokenizer. - It provides ways in which to generate pieces of text, such as might - be used for default passwords. StringEscapeUtils contains methods to - escape and unescape Java, JavaScript, HTML and XML. It is worth noting that - the package org.apache.commons.text.translate holds the - functionality underpinning the StringEscapeUtils with mappings and translations - between such mappings for the sake of doing String escaping. StrTokenizer is - an improved alternative to java.util.StringTokenizer. -

- - - -

- The simplest example is to use this class to replace Java System properties. For example: -

              
-        StringSubstitutor.replaceSystemProperties(
-          "You are running with java.version = ${java.version} and os.name = ${os.name}.");
-

- For details see StringSubstitutor. -

- Use a StringSubstitutorReader - to avoid reading a whole file into memory as a String to perform string substitution, for example, when a Servlet filters a file to a client. -

- To build a default full-featured substitutor, use: -

Commons Text >= 1.8: - org.apache.commons.text.StringSubstitutor.createInterpolator()
Commons Text < 1.8: - new StringSubstitutor(StringLookupFactory.INSTANCE.interpolatorStringLookup())

- The available substitutions are defined in - org.apache.commons.text.lookup.StringLookupFactory. -

- - - -

The org.apache.commons.text.similarity packages contains various different mechanisms of - calculating "similarity scores" as well as "edit distances between Strings. Note, - the difference between a "similarity score" and a "distance function" is that - a distance functions meets the following qualifications: -

d(x,y) >= 0, non-negativity or separation axiom -
d(x,y) == 0, if and only if, - x == y -
d(x,y) == d(y,x), symmetry, and -
d(x,z) <= d(x,y) + d(y,z), the triangle inequality -

- whereas a "similarity score" need not satisfy all such properties. Though, it - is fairly easy to "normalize" a similarity score to manufacture an "edit distance." -

- The list of "edit distances" that we currently support follow: -

Cosine Distance,
Hamming Distance,
Jaccard Distance,
Jaro Winkler Distance,
Levenshtein Distance,
Longest Commons Subsequence Distance,

- and the list of "similarity scores" that we support follows: -

Cosine Similarity,
Fuzzy Score Similarity,
Jaccard Similarity,
Jaro-Winkler Similarity, and
Longest Common Subsequence Similarity.

- - - -

The org.apache.commons.text.diff package contains code for - doing diff between strings. The initial implementation of the Myers algorithm was adapted from the - commons-collections sequence package. -

- - - -

- -

Provides algorithms for diff between strings.

The initial implementation of the Myers algorithm was adapted from the - commons-collections sequence package. -

Provides algorithms for looking up strings used by a - StringSubstitutor. - Standard lookups are defined in - StringLookupFactory - and the associated - DefaultStringLookup - enum. -

- The example below demonstrates use of the default lookups for StringSubstitutor in order to - construct a complex string. -

NOTE: The list of lookups available by default changed in version 1.10.0. See the documentation for - StringLookupFactory - for details and instructions on how to reproduce the previous behavior. -

- -final StringSubstitutor interpolator = StringSubstitutor.createInterpolator(); -final String text = interpolator.replace( - "Base64 Decoder: ${base64Decoder:SGVsbG9Xb3JsZCE=}\n" + - "Base64 Encoder: ${base64Encoder:HelloWorld!}\n" + - "Java Constant: ${const:java.awt.event.KeyEvent.VK_ESCAPE}\n" + - "Date: ${date:yyyy-MM-dd}\n" + - "Environment Variable: ${env:USERNAME}\n" + - "File Content: ${file:UTF-8:src/test/resources/document.properties}\n" + - "Java: ${java:version}\n" + - "Local host: ${localhost:canonical-name}\n" + - "Loopback address: ${loopbackAddress:canonical-name}\n" + - "Properties File: ${properties:src/test/resources/document.properties::mykey}\n" + - "Resource Bundle: ${resourceBundle:org.apache.commons.text.example.testResourceBundleLookup:mykey}\n" + - "System Property: ${sys:user.dir}\n" + - "URL Decoder: ${urlDecoder:Hello%20World%21}\n" + - "URL Encoder: ${urlEncoder:Hello World!}\n" + - "XML Decoder: ${xmlDecoder:<element>}\n" + - "XML Encoder: ${xmlEncoder:<element>}\n" + - "XML XPath: ${xml:src/test/resources/document.xml:/root/path/to/node}\n" -); - -

- -

Provides algorithms for string similarity.

- -

The algorithms that implement the EditDistance interface follow the - same - simple principle: the more similar (closer) strings are, the lower is the - distance. - For example, the words house and hose are closer than house and - trousers. -

- -

The following algorithms are available at the moment:

- -

- CosineDistance -
- CosineSimilarity -
- FuzzyScore -
- HammingDistance -
- JaroWinklerDistance -
- JaroWinklerSimilarity -
- LevenshteinDistance -
- LongestCommonSubsequenceDistance -

- -

The CosineDistance utilises a - RegexTokenizer - regular expression tokenizer (\w+). And the - LevenshteinDistance's - behavior can be changed to take into consideration a maximum - throughput. -

- -

An API for creating text translation routines from a set of smaller - building blocks. Initially created to make it possible for the user to - customize the rules in the StringEscapeUtils class. -

These classes are immutable, and therefore thread-safe.

-We provide documentation in the form of a User Guide, +We provide documentation in the form of a User Guide, Javadoc, and Project Reports.

From 04f779aa158b65d3089b99d4e9ed454eed9b0bf0 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 3 Dec 2025 08:41:40 -0500 Subject: [PATCH 107/188] Better release description --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index bfb7505e85..e689fcd749 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,7 +45,7 @@ The type attribute can be add,update,fix,remove. Apache Commons Text Changes - + Fix exception message typo in XmlStringLookup.XmlStringLookup(Map, Path...). Inserting at the end of a TextStringBuilder throws a StringIndexOutOfBoundsException. From abce711cbf63098ad9c1e9f26b8bcf7111614dba Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 3 Dec 2025 08:48:01 -0500 Subject: [PATCH 108/188] Javadoc --- .../text/lookup/ConstantStringLookup.java | 18 +++++++++--------- .../commons/text/lookup/DateStringLookup.java | 4 ++-- .../text/lookup/IllegalArgumentExceptions.java | 14 +++++++------- .../text/lookup/InetAddressStringLookup.java | 2 +- .../text/lookup/InterpolatorStringLookup.java | 4 ++-- .../text/lookup/JavaPlatformStringLookup.java | 4 ++-- .../text/lookup/PropertiesStringLookup.java | 2 +- .../lookup/ResourceBundleStringLookup.java | 2 +- .../text/lookup/ScriptStringLookup.java | 2 +- .../text/lookup/StringLookupFactory.java | 14 +++++++------- .../commons/text/lookup/UrlStringLookup.java | 2 +- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/apache/commons/text/lookup/ConstantStringLookup.java b/src/main/java/org/apache/commons/text/lookup/ConstantStringLookup.java index dff4509846..ddd95e0343 100644 --- a/src/main/java/org/apache/commons/text/lookup/ConstantStringLookup.java +++ b/src/main/java/org/apache/commons/text/lookup/ConstantStringLookup.java @@ -91,9 +91,9 @@ static void clear() { * * ClassUtils. * - * @param className the name of the class to be loaded - * @return The corresponding class object - * @throws ClassNotFoundException if the class cannot be loaded + * @param className the name of the class to be loaded. + * @return The corresponding class object. + * @throws ClassNotFoundException if the class cannot be loaded. */ protected Class fetchClass(final String className) throws ClassNotFoundException { return ClassUtils.getClass(className); @@ -105,8 +105,8 @@ protected Class fetchClass(final String className) throws ClassNotFoundExcept * cache. Otherwise this method will invoke the {@code resolveField()} method and pass in the name of the class and * the field. * - * @param key the name of the variable to be resolved - * @return The value of this variable or null if it cannot be resolved + * @param key the name of the variable to be resolved. + * @return The value of this variable or null if it cannot be resolved. */ @Override public synchronized String lookup(final String key) { @@ -141,10 +141,10 @@ public synchronized String lookup(final String key) { * {@code fetchClass()} to obtain the {@link Class} object for the target class. Then it will use * reflection to obtain the field's value. For this to work the field must be accessible. * - * @param className the name of the class - * @param fieldName the name of the member field of that class to read - * @return The field's value - * @throws ReflectiveOperationException if an error occurs + * @param className the name of the class. + * @param fieldName the name of the member field of that class to read. + * @return The field's value. + * @throws ReflectiveOperationException if an error occurs. */ protected Object resolveField(final String className, final String fieldName) throws ReflectiveOperationException { final Class clazz = fetchClass(className); diff --git a/src/main/java/org/apache/commons/text/lookup/DateStringLookup.java b/src/main/java/org/apache/commons/text/lookup/DateStringLookup.java index fe313c2bf3..a7dc0b7123 100644 --- a/src/main/java/org/apache/commons/text/lookup/DateStringLookup.java +++ b/src/main/java/org/apache/commons/text/lookup/DateStringLookup.java @@ -66,9 +66,9 @@ private DateStringLookup() { /** * Formats the given {@code date} long with the given {@code format}. * - * @param dateMillis the date to format + * @param dateMillis the date to format. * @param format the format string for {@link SimpleDateFormat}. - * @return The formatted date + * @return The formatted date. */ private String formatDate(final long dateMillis, final String format) { FastDateFormat dateFormat = null; diff --git a/src/main/java/org/apache/commons/text/lookup/IllegalArgumentExceptions.java b/src/main/java/org/apache/commons/text/lookup/IllegalArgumentExceptions.java index 3eac7d4a2d..e52d5360b5 100644 --- a/src/main/java/org/apache/commons/text/lookup/IllegalArgumentExceptions.java +++ b/src/main/java/org/apache/commons/text/lookup/IllegalArgumentExceptions.java @@ -28,9 +28,9 @@ final class IllegalArgumentExceptions { * Creates an {@link IllegalArgumentException} with a message * formatted with {@link String#format(String,Object...)}. * - * @param format See {@link String#format(String,Object...)} - * @param args See {@link String#format(String,Object...)} - * @return an {@link IllegalArgumentException} with a message formatted with {@link String#format(String,Object...)} + * @param format See {@link String#format(String,Object...)}. + * @param args See {@link String#format(String,Object...)}. + * @return an {@link IllegalArgumentException} with a message formatted with {@link String#format(String,Object...)}. */ static IllegalArgumentException format(final String format, final Object... args) { return new IllegalArgumentException(String.format(format, args)); @@ -40,10 +40,10 @@ static IllegalArgumentException format(final String format, final Object... args * Creates an {@link IllegalArgumentException} with a message * formatted with {@link String#format(String,Object...)}. * - * @param t the throwable cause - * @param format See {@link String#format(String,Object...)} - * @param args See {@link String#format(String,Object...)} - * @return an {@link IllegalArgumentException} with a message formatted with {@link String#format(String,Object...)} + * @param t the throwable cause. + * @param format See {@link String#format(String,Object...)}. + * @param args See {@link String#format(String,Object...)}. + * @return an {@link IllegalArgumentException} with a message formatted with {@link String#format(String,Object...)}. */ static IllegalArgumentException format(final Throwable t, final String format, final Object... args) { return new IllegalArgumentException(String.format(format, args), t); diff --git a/src/main/java/org/apache/commons/text/lookup/InetAddressStringLookup.java b/src/main/java/org/apache/commons/text/lookup/InetAddressStringLookup.java index 6d0183db9c..5a9a72a359 100644 --- a/src/main/java/org/apache/commons/text/lookup/InetAddressStringLookup.java +++ b/src/main/java/org/apache/commons/text/lookup/InetAddressStringLookup.java @@ -55,7 +55,7 @@ final class InetAddressStringLookup extends AbstractStringLookup { static final InetAddressStringLookup LOOPACK_ADDRESS = new InetAddressStringLookup(InetAddress::getLoopbackAddress); /** - * Supplies the InetAddress. + * Supplies the {@link InetAddress}. */ private final FailableSupplier inetAddressSupplier; diff --git a/src/main/java/org/apache/commons/text/lookup/InterpolatorStringLookup.java b/src/main/java/org/apache/commons/text/lookup/InterpolatorStringLookup.java index 17e3da7b93..9027c5d5f4 100644 --- a/src/main/java/org/apache/commons/text/lookup/InterpolatorStringLookup.java +++ b/src/main/java/org/apache/commons/text/lookup/InterpolatorStringLookup.java @@ -113,8 +113,8 @@ public Map getStringLookupMap() { * the prefix stripped to the lookup object registered for this prefix. If no prefix can be found or if the * associated lookup object cannot resolve this variable, the default lookup object will be used. * - * @param key the name of the variable whose value is to be looked up - * @return The value of this variable or null if it cannot be resolved + * @param key the name of the variable whose value is to be looked up. + * @return The value of this variable or null if it cannot be resolved. */ @Override public String lookup(String key) { diff --git a/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java b/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java index 734e2dd436..faf01ee9cb 100644 --- a/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java +++ b/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java @@ -156,7 +156,7 @@ private String getSystemProperty(final String name) { /** * Gets the given system property. * - * @param prefix the prefix to use for the result string + * @param prefix the prefix to use for the result string. * @param name a system property name. * @return The prefix + a system property value. */ @@ -192,7 +192,7 @@ String getVirtualMachine() { *

locale: "default locale: en_US, platform encoding: iso-8859-1"

* * - * @param key the key to be looked up, may be null + * @param key the key to be looked up, may be null. * @return The value of the environment variable. */ @Override diff --git a/src/main/java/org/apache/commons/text/lookup/PropertiesStringLookup.java b/src/main/java/org/apache/commons/text/lookup/PropertiesStringLookup.java index dab5f62d5d..b5aa177116 100644 --- a/src/main/java/org/apache/commons/text/lookup/PropertiesStringLookup.java +++ b/src/main/java/org/apache/commons/text/lookup/PropertiesStringLookup.java @@ -78,7 +78,7 @@ static String toPropertyKey(final String file, final String key) { * Note the use of "::" instead of ":" to allow for "C:" drive letters in paths. *

* - * @param key the key to be looked up, may be null + * @param key the key to be looked up, may be null. * @return The value associated with the key. */ @Override diff --git a/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java b/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java index a517058ecc..6ffcc5b4a9 100644 --- a/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java +++ b/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java @@ -79,7 +79,7 @@ String getString(final String keyBundleName, final String bundleKey) { * * For example: "com.domain.messages:MyKey". * - * @param key the key to be looked up, may be null + * @param key the key to be looked up, may be null. * @return The value associated with the key. * @see ResourceBundle * @see ResourceBundle#getBundle(String) diff --git a/src/main/java/org/apache/commons/text/lookup/ScriptStringLookup.java b/src/main/java/org/apache/commons/text/lookup/ScriptStringLookup.java index 4151a732f7..2ed725b456 100644 --- a/src/main/java/org/apache/commons/text/lookup/ScriptStringLookup.java +++ b/src/main/java/org/apache/commons/text/lookup/ScriptStringLookup.java @@ -66,7 +66,7 @@ private ScriptStringLookup() { * For example: {@code "javascript:3 + 4"}. *

* - * @param key the engine:script to execute, may be null + * @param key the engine:script to execute, may be null. * @return The value returned by the execution. */ @Override diff --git a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java index f172f58870..3135f5fae3 100644 --- a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java +++ b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java @@ -278,8 +278,8 @@ static final class DefaultStringLookupsHolder { * Adds the key and string lookup from {@code lookup} to {@code map}, also adding any additional key aliases if needed. Keys are normalized using the * {@link #toKey(String)} method. * - * @param lookup lookup to add - * @param map map to add to + * @param lookup lookup to add. + * @param map map to add to. */ private static void addLookup(final DefaultStringLookup lookup, final Map map) { map.put(toKey(lookup.getKey()), lookup.getStringLookup()); @@ -292,7 +292,7 @@ private static void addLookup(final DefaultStringLookup lookup, final Map createDefaultStringLookups() { final Map lookupMap = new HashMap<>(); @@ -320,8 +320,8 @@ private static Map createDefaultStringLookups() { * Constructs a lookup map by parsing the given string. The string is expected to contain comma or space-separated names of values from the * {@link DefaultStringLookup} enum. If the given string is null or empty, an empty map is returned. * - * @param str string to parse; may be null or empty - * @return lookup map parsed from the given string + * @param str string to parse; may be null or empty. + * @return lookup map parsed from the given string. */ private static Map parseStringLookups(final String str) { final Map lookupMap = new HashMap<>(); @@ -343,7 +343,7 @@ private static Map parseStringLookups(final String str) { /** * Constructs a new instance initialized with the given properties. * - * @param props initialization properties + * @param props initialization properties. */ DefaultStringLookupsHolder(final Properties props) { final Map lookups = props.containsKey(DEFAULT_STRING_LOOKUPS_PROPERTY) @@ -355,7 +355,7 @@ private static Map parseStringLookups(final String str) { /** * Gets the default string lookups map. * - * @return default string lookups map + * @return default string lookups map. */ Map getDefaultStringLookups() { return defaultStringLookups; diff --git a/src/main/java/org/apache/commons/text/lookup/UrlStringLookup.java b/src/main/java/org/apache/commons/text/lookup/UrlStringLookup.java index 948f2b1bef..473c546da4 100644 --- a/src/main/java/org/apache/commons/text/lookup/UrlStringLookup.java +++ b/src/main/java/org/apache/commons/text/lookup/UrlStringLookup.java @@ -60,7 +60,7 @@ private UrlStringLookup() { * For example: "UTF-8:https://www.apache.org". *

* - * @param key the key to be looked up, may be null + * @param key the key to be looked up, may be null. * @return The value associated with the key. */ @Override From fd98b6ed6403348f181f8440fb43781d6b5ec388 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 3 Dec 2025 08:50:16 -0500 Subject: [PATCH 109/188] Javadoc --- .../text/matcher/AbstractStringMatcher.java | 102 +++++++++--------- .../commons/text/matcher/StringMatcher.java | 12 +-- .../text/matcher/StringMatcherFactory.java | 40 +++---- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/main/java/org/apache/commons/text/matcher/AbstractStringMatcher.java b/src/main/java/org/apache/commons/text/matcher/AbstractStringMatcher.java index 68ec022d23..04dc401689 100644 --- a/src/main/java/org/apache/commons/text/matcher/AbstractStringMatcher.java +++ b/src/main/java/org/apache/commons/text/matcher/AbstractStringMatcher.java @@ -124,11 +124,11 @@ static final class CharArrayMatcher extends AbstractStringMatcher { /** * Returns the number of matching characters, {@code 0} if there is no match. * - * @param buffer the text content to match against, do not change - * @param start the starting position for the match, valid for buffer - * @param bufferStart unused - * @param bufferEnd the end index of the active buffer, valid for buffer - * @return The number of matching characters, zero for no match + * @param buffer the text content to match against, do not change. + * @param start the starting position for the match, valid for buffer. + * @param bufferStart unused. + * @param bufferEnd the end index of the active buffer, valid for buffer. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final char[] buffer, final int start, final int bufferStart, final int bufferEnd) { @@ -148,11 +148,11 @@ public int isMatch(final char[] buffer, final int start, final int bufferStart, /** * Returns the number of matching characters, {@code 0} if there is no match. * - * @param buffer the text content to match against, do not change - * @param start the starting position for the match, valid for buffer - * @param bufferStart unused - * @param bufferEnd the end index of the active buffer, valid for buffer - * @return The number of matching characters, zero for no match + * @param buffer the text content to match against, do not change. + * @param start the starting position for the match, valid for buffer. + * @param bufferStart unused. + * @param bufferEnd the end index of the active buffer, valid for buffer. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final CharSequence buffer, final int start, final int bufferStart, final int bufferEnd) { @@ -209,11 +209,11 @@ static final class CharMatcher extends AbstractStringMatcher { /** * Returns {@code 1} if there is a match, or {@code 0} if there is no match. * - * @param buffer the text content to match against, do not change - * @param start the starting position for the match, valid for buffer - * @param bufferStart unused - * @param bufferEnd unused - * @return The number of matching characters, zero for no match + * @param buffer the text content to match against, do not change. + * @param start the starting position for the match, valid for buffer. + * @param bufferStart unused. + * @param bufferEnd unused. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final char[] buffer, final int start, final int bufferStart, final int bufferEnd) { @@ -223,11 +223,11 @@ public int isMatch(final char[] buffer, final int start, final int bufferStart, /** * Returns {@code 1} if there is a match, or {@code 0} if there is no match. * - * @param buffer the text content to match against, do not change - * @param start the starting position for the match, valid for buffer - * @param bufferStart unused - * @param bufferEnd unused - * @return The number of matching characters, zero for no match + * @param buffer the text content to match against, do not change. + * @param start the starting position for the match, valid for buffer. + * @param bufferStart unused. + * @param bufferEnd unused. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final CharSequence buffer, final int start, final int bufferStart, final int bufferEnd) { @@ -264,7 +264,7 @@ static final class CharSetMatcher extends AbstractStringMatcher { /** * Constructs a matcher from a character array. * - * @param chars the characters to match, must not be null + * @param chars the characters to match, must not be null. */ CharSetMatcher(final char[] chars) { this.chars = chars.clone(); @@ -274,11 +274,11 @@ static final class CharSetMatcher extends AbstractStringMatcher { /** * Returns {@code 1} if there is a match, or {@code 0} if there is no match. * - * @param buffer the text content to match against, do not change - * @param start the starting position for the match, valid for buffer - * @param bufferStart unused - * @param bufferEnd unused - * @return The number of matching characters, zero for no match + * @param buffer the text content to match against, do not change. + * @param start the starting position for the match, valid for buffer. + * @param bufferStart unused. + * @param bufferEnd unused. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final char[] buffer, final int start, final int bufferStart, final int bufferEnd) { @@ -288,11 +288,11 @@ public int isMatch(final char[] buffer, final int start, final int bufferStart, /** * Returns {@code 1} if there is a match, or {@code 0} if there is no match. * - * @param buffer the text content to match against, do not change - * @param start the starting position for the match, valid for buffer - * @param bufferStart unused - * @param bufferEnd unused - * @return The number of matching characters, zero for no match + * @param buffer the text content to match against, do not change. + * @param start the starting position for the match, valid for buffer. + * @param bufferStart unused. + * @param bufferEnd unused. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final CharSequence buffer, final int start, final int bufferStart, final int bufferEnd) { @@ -333,11 +333,11 @@ static final class NoneMatcher extends AbstractStringMatcher { /** * Always returns {@code 0}. * - * @param buffer unused - * @param start unused - * @param bufferStart unused - * @param bufferEnd unused - * @return The number of matching characters, zero for no match + * @param buffer unused. + * @param start unused. + * @param bufferStart unused. + * @param bufferEnd unused. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final char[] buffer, final int start, final int bufferStart, final int bufferEnd) { @@ -347,11 +347,11 @@ public int isMatch(final char[] buffer, final int start, final int bufferStart, /** * Always returns {@code 0}. * - * @param buffer unused - * @param start unused - * @param bufferStart unused - * @param bufferEnd unused - * @return The number of matching characters, zero for no match + * @param buffer unused. + * @param start unused. + * @param bufferStart unused. + * @param bufferEnd unused. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final CharSequence buffer, final int start, final int bufferStart, final int bufferEnd) { @@ -392,11 +392,11 @@ static final class TrimMatcher extends AbstractStringMatcher { /** * Returns {@code 1} if there is a match, or {@code 0} if there is no match. * - * @param buffer the text content to match against, do not change - * @param start the starting position for the match, valid for buffer - * @param bufferStart unused - * @param bufferEnd unused - * @return The number of matching characters, zero for no match + * @param buffer the text content to match against, do not change. + * @param start the starting position for the match, valid for buffer. + * @param bufferStart unused. + * @param bufferEnd unused. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final char[] buffer, final int start, final int bufferStart, final int bufferEnd) { @@ -406,11 +406,11 @@ public int isMatch(final char[] buffer, final int start, final int bufferStart, /** * Returns {@code 1} if there is a match, or {@code 0} if there is no match. * - * @param buffer the text content to match against, do not change - * @param start the starting position for the match, valid for buffer - * @param bufferStart unused - * @param bufferEnd unused - * @return The number of matching characters, zero for no match + * @param buffer the text content to match against, do not change. + * @param start the starting position for the match, valid for buffer. + * @param bufferStart unused. + * @param bufferEnd unused. + * @return The number of matching characters, zero for no match. */ @Override public int isMatch(final CharSequence buffer, final int start, final int bufferStart, final int bufferEnd) { diff --git a/src/main/java/org/apache/commons/text/matcher/StringMatcher.java b/src/main/java/org/apache/commons/text/matcher/StringMatcher.java index af94b86831..57d93b5d19 100644 --- a/src/main/java/org/apache/commons/text/matcher/StringMatcher.java +++ b/src/main/java/org/apache/commons/text/matcher/StringMatcher.java @@ -53,9 +53,9 @@ default StringMatcher andThen(final StringMatcher stringMatcher) { * characters that matched. *

* - * @param buffer the text content to match against, do not change - * @param pos the starting position for the match, valid for buffer - * @return The number of matching characters, zero for no match + * @param buffer the text content to match against, do not change. + * @param pos the starting position for the match, valid for buffer. + * @return The number of matching characters, zero for no match. * @since 1.9 */ default int isMatch(final CharSequence buffer, final int pos) { diff --git a/src/main/java/org/apache/commons/text/matcher/StringMatcherFactory.java b/src/main/java/org/apache/commons/text/matcher/StringMatcherFactory.java index 0a3b9d8afd..b3c1226575 100644 --- a/src/main/java/org/apache/commons/text/matcher/StringMatcherFactory.java +++ b/src/main/java/org/apache/commons/text/matcher/StringMatcherFactory.java @@ -91,7 +91,7 @@ private StringMatcherFactory() { /** * Creates a matcher that matches all of the given matchers in order. * - * @param stringMatchers the matcher + * @param stringMatchers the matcher. * @return a matcher that matches all of the given matchers in order. * @since 1.9 */ @@ -109,8 +109,8 @@ public StringMatcher andMatcher(final StringMatcher... stringMatchers) { /** * Constructor that creates a matcher from a character. * - * @param ch the character to match, must not be null - * @return a new Matcher for the given char + * @param ch the character to match, must not be null. + * @return a new Matcher for the given char. */ public StringMatcher charMatcher(final char ch) { return new AbstractStringMatcher.CharMatcher(ch); @@ -119,8 +119,8 @@ public StringMatcher charMatcher(final char ch) { /** * Constructor that creates a matcher from a set of characters. * - * @param chars the characters to match, null or empty matches nothing - * @return a new matcher for the given char[] + * @param chars the characters to match, null or empty matches nothing. + * @return a new matcher for the given char[]. */ public StringMatcher charSetMatcher(final char... chars) { final int len = ArrayUtils.getLength(chars); @@ -136,8 +136,8 @@ public StringMatcher charSetMatcher(final char... chars) { /** * Creates a matcher from a string representing a set of characters. * - * @param chars the characters to match, null or empty matches nothing - * @return a new Matcher for the given characters + * @param chars the characters to match, null or empty matches nothing. + * @return a new Matcher for the given characters. */ public StringMatcher charSetMatcher(final String chars) { final int len = StringUtils.length(chars); @@ -153,7 +153,7 @@ public StringMatcher charSetMatcher(final String chars) { /** * Returns a matcher which matches the comma character. * - * @return a matcher for a comma + * @return a matcher for a comma. */ public StringMatcher commaMatcher() { return COMMA_MATCHER; @@ -162,7 +162,7 @@ public StringMatcher commaMatcher() { /** * Returns a matcher which matches the double quote character. * - * @return a matcher for a double quote + * @return a matcher for a double quote. */ public StringMatcher doubleQuoteMatcher() { return DOUBLE_QUOTE_MATCHER; @@ -171,7 +171,7 @@ public StringMatcher doubleQuoteMatcher() { /** * Matches no characters. * - * @return a matcher that matches nothing + * @return a matcher that matches nothing. */ public StringMatcher noneMatcher() { return NONE_MATCHER; @@ -180,7 +180,7 @@ public StringMatcher noneMatcher() { /** * Returns a matcher which matches the single or double quote character. * - * @return a matcher for a single or double quote + * @return a matcher for a single or double quote. */ public StringMatcher quoteMatcher() { return QUOTE_MATCHER; @@ -189,7 +189,7 @@ public StringMatcher quoteMatcher() { /** * Returns a matcher which matches the single quote character. * - * @return a matcher for a single quote + * @return a matcher for a single quote. */ public StringMatcher singleQuoteMatcher() { return SINGLE_QUOTE_MATCHER; @@ -198,7 +198,7 @@ public StringMatcher singleQuoteMatcher() { /** * Returns a matcher which matches the space character. * - * @return a matcher for a space + * @return a matcher for a space. */ public StringMatcher spaceMatcher() { return SPACE_MATCHER; @@ -207,7 +207,7 @@ public StringMatcher spaceMatcher() { /** * Matches the same characters as StringTokenizer, namely space, tab, newline and form feed. * - * @return The split matcher + * @return The split matcher. */ public StringMatcher splitMatcher() { return SPLIT_MATCHER; @@ -216,8 +216,8 @@ public StringMatcher splitMatcher() { /** * Creates a matcher from a string. * - * @param chars the string to match, null or empty matches nothing - * @return a new Matcher for the given String + * @param chars the string to match, null or empty matches nothing. + * @return a new Matcher for the given String. * @since 1.9 */ public StringMatcher stringMatcher(final char... chars) { @@ -230,8 +230,8 @@ public StringMatcher stringMatcher(final char... chars) { /** * Creates a matcher from a string. * - * @param str the string to match, null or empty matches nothing - * @return a new Matcher for the given String + * @param str the string to match, null or empty matches nothing. + * @return a new Matcher for the given String. */ public StringMatcher stringMatcher(final String str) { return StringUtils.isEmpty(str) ? NONE_MATCHER : stringMatcher(str.toCharArray()); @@ -240,7 +240,7 @@ public StringMatcher stringMatcher(final String str) { /** * Returns a matcher which matches the tab character. * - * @return a matcher for a tab + * @return a matcher for a tab. */ public StringMatcher tabMatcher() { return TAB_MATCHER; @@ -249,7 +249,7 @@ public StringMatcher tabMatcher() { /** * Matches the String trim() whitespace characters. * - * @return The trim matcher + * @return The trim matcher. */ public StringMatcher trimMatcher() { return TRIM_MATCHER; From 5d574755cb932dc8edf5a035f0de5c64cb8c8303 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 3 Dec 2025 08:59:09 -0500 Subject: [PATCH 110/188] Javadoc --- .../commons/text/numbers/DoubleFormat.java | 100 +++---- .../commons/text/numbers/ParsedDecimal.java | 245 +++++++++--------- 2 files changed, 179 insertions(+), 166 deletions(-) diff --git a/src/main/java/org/apache/commons/text/numbers/DoubleFormat.java b/src/main/java/org/apache/commons/text/numbers/DoubleFormat.java index 1ad97d5fd3..214f380f52 100644 --- a/src/main/java/org/apache/commons/text/numbers/DoubleFormat.java +++ b/src/main/java/org/apache/commons/text/numbers/DoubleFormat.java @@ -251,7 +251,7 @@ public String apply(final double d) { /** * Returns a formatted string representation of the given finite value. * - * @param d double value + * @param d double value. */ private String applyFinite(final double d) { final ParsedDecimal n = ParsedDecimal.from(d); @@ -268,7 +268,7 @@ private String applyFinite(final double d) { /** * Returns a formatted representation of the given rounded decimal value to {@code dst}. * - * @param val value to format + * @param val value to format. * @return a formatted representation of the given rounded decimal value to {@code dst}. */ protected abstract String applyFiniteInternal(ParsedDecimal val); @@ -411,7 +411,7 @@ private static String getDigitString(final DecimalFormatSymbols symbols) { /** * Builds a new instance that delegates double function construction to the given factory object. * - * @param factory factory function + * @param factory factory function. */ private Builder(final Function> factory) { this.factory = factory; @@ -423,8 +423,8 @@ private Builder(final Function> factory) { * returned, regardless of the sign of the input number. The default value is {@code true}. * * @param signedZero if {@code true}, the zero string may be returned with a preceding minus sign; if {@code false}, the zero string will only be - * returned in its positive form - * @return {@code this} instance + * returned in its positive form. + * @return {@code this} instance. */ public Builder allowSignedZero(final boolean signedZero) { this.signedZero = signedZero; @@ -436,8 +436,8 @@ public Builder allowSignedZero(final boolean signedZero) { * only applies to formats that use scientific notation, namely {@link DoubleFormat#SCIENTIFIC SCIENTIFIC}, {@link DoubleFormat#ENGINEERING * ENGINEERING}, and {@link DoubleFormat#MIXED MIXED}. The default value is {@code false}. * - * @param alwaysIncludeExponent if {@code true}, exponents will always be included in formatted output even if the exponent value is zero - * @return {@code this} instance + * @param alwaysIncludeExponent if {@code true}, exponents will always be included in formatted output even if the exponent value is zero. + * @return {@code this} instance. */ public Builder alwaysIncludeExponent(final boolean alwaysIncludeExponent) { this.alwaysIncludeExponent = alwaysIncludeExponent; @@ -459,8 +459,8 @@ public DoubleFunction build() { * Sets the decimal separator character, i.e., the character placed between the whole number and fractional portions of the formatted strings. The * default value is {@code '.'}. * - * @param decimalSeparator decimal separator character - * @return {@code this} instance + * @param decimalSeparator decimal separator character. + * @return {@code this} instance. */ public Builder decimalSeparator(final char decimalSeparator) { this.decimalSeparator = decimalSeparator; @@ -470,10 +470,10 @@ public Builder decimalSeparator(final char decimalSeparator) { /** * Sets the string containing the digit characters 0-9, in that order. The default value is the string {@code "0123456789"}. * - * @param digits string containing the digit characters 0-9 - * @return {@code this} instance - * @throws NullPointerException if the argument is {@code null} - * @throws IllegalArgumentException if the argument does not have a length of exactly 10 + * @param digits string containing the digit characters 0-9. + * @return {@code this} instance. + * @throws NullPointerException if the argument is {@code null}. + * @throws IllegalArgumentException if the argument does not have a length of exactly 10. */ public Builder digits(final String digits) { Objects.requireNonNull(digits, "digits"); @@ -489,9 +489,9 @@ public Builder digits(final String digits) { * Sets the exponent separator character, i.e., the string placed between the mantissa and the exponent. The default value is {@code "E"}, as in * {@code "1.2E6"}. * - * @param exponentSeparator exponent separator string - * @return {@code this} instance - * @throws NullPointerException if the argument is {@code null} + * @param exponentSeparator exponent separator string. + * @return {@code this} instance. + * @throws NullPointerException if the argument is {@code null}. */ public Builder exponentSeparator(final String exponentSeparator) { this.exponentSeparator = Objects.requireNonNull(exponentSeparator, "exponentSeparator"); @@ -512,9 +512,9 @@ public Builder exponentSeparator(final String exponentSeparator) { * The digit character string is constructed by starting at the configured {@link DecimalFormatSymbols#getZeroDigit() zero digit} and adding the next 9 * consecutive characters. * - * @param symbols format symbols - * @return {@code this} instance - * @throws NullPointerException if the argument is {@code null} + * @param symbols format symbols. + * @return {@code this} instance. + * @throws NullPointerException if the argument is {@code null}. */ public Builder formatSymbols(final DecimalFormatSymbols symbols) { Objects.requireNonNull(symbols, "symbols"); @@ -526,7 +526,7 @@ public Builder formatSymbols(final DecimalFormatSymbols symbols) { /** * Builds a new double format function. * - * @return format function + * @return a new double format function. */ @Override public DoubleFunction get() { @@ -536,8 +536,8 @@ public DoubleFunction get() { /** * Sets the character used to separate groups of thousands. Default value is {@code ','}. * - * @param groupingSeparator character used to separate groups of thousands - * @return {@code this} instance + * @param groupingSeparator character used to separate groups of thousands. + * @return {@code this} instance. * @see #groupThousands(boolean) */ public Builder groupingSeparator(final char groupingSeparator) { @@ -550,8 +550,8 @@ public Builder groupingSeparator(final char groupingSeparator) { * the number {@code 1000} could be formatted as {@code "1,000"}. This property only applies to the {@link DoubleFormat#PLAIN PLAIN} format. Default * value is {@code false}. * - * @param groupThousands if {@code true}, thousands will be grouped - * @return {@code this} instance + * @param groupThousands if {@code true}, thousands will be grouped. + * @return {@code this} instance. * @see #groupingSeparator(char) */ public Builder groupThousands(final boolean groupThousands) { @@ -565,8 +565,8 @@ public Builder groupThousands(final boolean groupThousands) { * is {@code true}. * * @param fractionPlaceholder if {@code true}, a zero character is placed in the fraction position when no fractional value is present; if - * {@code false}, fractional digits are only included when needed - * @return {@code this} instance + * {@code false}, fractional digits are only included when needed. + * @return {@code this} instance. */ public Builder includeFractionPlaceholder(final boolean fractionPlaceholder) { this.fractionPlaceholder = fractionPlaceholder; @@ -576,9 +576,9 @@ public Builder includeFractionPlaceholder(final boolean fractionPlaceholder) { /** * Sets the string used to represent infinity. For negative infinity, this string is prefixed with the {@link #minusSign(char) minus sign}. * - * @param infinity string used to represent infinity - * @return {@code this} instance - * @throws NullPointerException if the argument is {@code null} + * @param infinity string used to represent infinity. + * @return {@code this} instance. + * @throws NullPointerException if the argument is {@code null}. */ public Builder infinity(final String infinity) { this.infinity = Objects.requireNonNull(infinity, "infinity"); @@ -589,8 +589,8 @@ public Builder infinity(final String infinity) { * Sets the maximum number of significant decimal digits used in format results. A value of {@code 0} indicates no limit. The default value is * {@code 0}. * - * @param maxPrecision maximum precision - * @return {@code this} instance + * @param maxPrecision maximum precision. + * @return {@code this} instance. */ public Builder maxPrecision(final int maxPrecision) { this.maxPrecision = maxPrecision; @@ -603,8 +603,8 @@ public Builder maxPrecision(final int maxPrecision) { * {@code minDecimalExponent} is set to {@code -2} and the number {@code 3.14159} is formatted, the plain format result will be {@code "3.14"}. If * {@code 0.001} is formatted, then the result is the zero string. * - * @param minDecimalExponent minimum decimal exponent - * @return {@code this} instance + * @param minDecimalExponent minimum decimal exponent. + * @return {@code this} instance. */ public Builder minDecimalExponent(final int minDecimalExponent) { this.minDecimalExponent = minDecimalExponent; @@ -614,8 +614,8 @@ public Builder minDecimalExponent(final int minDecimalExponent) { /** * Sets the character used as the minus sign. * - * @param minusSign character to use as the minus sign - * @return {@code this} instance + * @param minusSign character to use as the minus sign. + * @return {@code this} instance. */ public Builder minusSign(final char minusSign) { this.minusSign = minusSign; @@ -625,9 +625,9 @@ public Builder minusSign(final char minusSign) { /** * Sets the string used to represent {@link Double#NaN}. * - * @param nan string used to represent {@link Double#NaN} - * @return {@code this} instance - * @throws NullPointerException if the argument is {@code null} + * @param nan string used to represent {@link Double#NaN}. + * @return {@code this} instance. + * @throws NullPointerException if the argument is {@code null}. */ public Builder nan(final String nan) { this.nan = Objects.requireNonNull(nan, "nan"); @@ -635,17 +635,19 @@ public Builder nan(final String nan) { } /** - * Sets the maximum decimal exponent for numbers formatted as plain decimal strings when using the {@link DoubleFormat#MIXED MIXED} format type. If the - * number being formatted has an absolute value less than 10^{plainFormatMaxDecimalExponent + 1} and greater than or equal to - * 10^{plainFormatMinDecimalExponent} after any necessary rounding, then the formatted result will use the + * Sets the maximum decimal exponent for numbers formatted as plain decimal strings when using the {@link DoubleFormat#MIXED MIXED} format type. + *

+ * If the number being formatted has an absolute value less than 10^{plainFormatMaxDecimalExponent + 1} and greater than or equal + * to 10^{plainFormatMinDecimalExponent} after any necessary rounding, then the formatted result will use the * {@link DoubleFormat#PLAIN PLAIN} format type. Otherwise, {@link DoubleFormat#SCIENTIFIC SCIENTIFIC} format will be used. For example, if this value * is set to {@code 2}, the number {@code 999} will be formatted as {@code "999.0"} while {@code 1000} will be formatted as {@code "1.0E3"}. - * + *

* The default value is {@code 6}. - * + *

* This value is ignored for formats other than {@link DoubleFormat#MIXED}. + *

* * @param plainFormatMaxDecimalExponent maximum decimal exponent for values formatted as plain strings when using the {@link DoubleFormat#MIXED MIXED} * format type. @@ -658,17 +660,19 @@ public Builder plainFormatMaxDecimalExponent(final int plainFormatMaxDecimalExpo } /** - * Sets the minimum decimal exponent for numbers formatted as plain decimal strings when using the {@link DoubleFormat#MIXED MIXED} format type. If the - * number being formatted has an absolute value less than 10^{plainFormatMaxDecimalExponent + 1} and greater than or equal to - * 10^{plainFormatMinDecimalExponent} after any necessary rounding, then the formatted result will use the + * Sets the minimum decimal exponent for numbers formatted as plain decimal strings when using the {@link DoubleFormat#MIXED MIXED} format type. + *

+ * If the number being formatted has an absolute value less than 10^{plainFormatMaxDecimalExponent + 1} and greater than or equal + * to 10^{plainFormatMinDecimalExponent} after any necessary rounding, then the formatted result will use the * {@link DoubleFormat#PLAIN PLAIN} format type. Otherwise, {@link DoubleFormat#SCIENTIFIC SCIENTIFIC} format will be used. For example, if this value * is set to {@code -2}, the number {@code 0.01} will be formatted as {@code "0.01"} while {@code 0.0099} will be formatted as {@code "9.9E-3"}. - * + *

* The default value is {@code -3}. - * + *

* This value is ignored for formats other than {@link DoubleFormat#MIXED}. + *

* * @param plainFormatMinDecimalExponent maximum decimal exponent for values formatted as plain strings when using the {@link DoubleFormat#MIXED MIXED} * format type. diff --git a/src/main/java/org/apache/commons/text/numbers/ParsedDecimal.java b/src/main/java/org/apache/commons/text/numbers/ParsedDecimal.java index 4bc4d1c681..d4541b0280 100644 --- a/src/main/java/org/apache/commons/text/numbers/ParsedDecimal.java +++ b/src/main/java/org/apache/commons/text/numbers/ParsedDecimal.java @@ -44,59 +44,64 @@ interface FormatOptions { /** * Gets the decimal separator character. + * * @return decimal separator character */ char getDecimalSeparator(); /** - * Gets an array containing the localized digit characters 0-9 in that order. - * This string must be non-null and have a length of 10. - * @return array containing the digit characters 0-9 + * Gets an array containing the localized digit characters 0-9 in that order. This string must be non-null and have a length of 10. + * + * @return array containing the digit characters 0-9. */ char[] getDigits(); /** * Gets the exponent separator as an array of characters. - * @return exponent separator as an array of characters + * + * @return exponent separator as an array of characters. */ char[] getExponentSeparatorChars(); /** * Gets the character used to separate thousands groupings. - * @return character used to separate thousands groupings + * + * @return character used to separate thousands groupings. */ char getGroupingSeparator(); /** * Gets the minus sign character. - * @return minus sign character + * + * @return minus sign character. */ char getMinusSign(); /** - * Return {@code true} if exponent values should always be included in - * formatted output, even if the value is zero. - * @return {@code true} if exponent values should always be included + * Return {@code true} if exponent values should always be included in formatted output, even if the value is zero. + * + * @return {@code true} if exponent values should always be included. */ boolean isAlwaysIncludeExponent(); /** * Return {@code true} if thousands should be grouped. - * @return {@code true} if thousand should be grouped + * + * @return {@code true} if thousand should be grouped. */ boolean isGroupThousands(); /** - * Return {@code true} if fraction placeholders (e.g., {@code ".0"} in {@code "1.0"}) - * should be included. - * @return {@code true} if fraction placeholders should be included + * Return {@code true} if fraction placeholders (e.g., {@code ".0"} in {@code "1.0"}) should be included. + * + * @return {@code true} if fraction placeholders should be included. */ boolean isIncludeFractionPlaceholder(); /** - * Return {@code true} if the string zero should be prefixed with the minus sign - * for negative zero values. - * @return {@code true} if the minus zero string should be allowed + * Return {@code true} if the string zero should be prefixed with the minus sign for negative zero values. + * + * @return {@code true} if the minus zero string should be allowed. */ boolean isSignedZero(); } @@ -128,8 +133,9 @@ interface FormatOptions { /** * Gets the numeric value of the given digit character. No validation of the * character type is performed. - * @param ch digit character - * @return numeric value of the digit character, ex: '1' = 1 + * + * @param ch digit character. + * @return numeric value of the digit character, ex: '1' = 1. */ private static int digitValue(final char ch) { return ch - ZERO_CHAR; @@ -137,9 +143,10 @@ private static int digitValue(final char ch) { /** * Constructs a new instance from the given double value. - * @param d double value - * @return a new instance containing the parsed components of the given double value - * @throws IllegalArgumentException if {@code d} is {@code NaN} or infinite + * + * @param d double value. + * @return a new instance containing the parsed components of the given double value. + * @throws IllegalArgumentException if {@code d} is {@code NaN} or infinite. */ public static ParsedDecimal from(final double d) { if (!Double.isFinite(d)) { @@ -206,9 +213,10 @@ public static ParsedDecimal from(final double d) { /** * Parses a double exponent value from {@code chars}, starting at the {@code start} * index and continuing through the end of the array. - * @param chars character array to parse a double exponent value from - * @param start start index - * @return parsed exponent value + * + * @param chars character array to parse a double exponent value from. + * @param start start index. + * @return parsed exponent value. */ private static int parseExponent(final char[] chars, final int start) { int i = start; @@ -245,10 +253,11 @@ private static int parseExponent(final char[] chars, final int start) { /** * Constructs a new instance from its parts. - * @param negative {@code true} if the value is negative - * @param digits array containing significant digits - * @param digitCount number of digits used from the {@code digits} array - * @param exponent exponent value + * + * @param negative {@code true} if the value is negative. + * @param digits array containing significant digits. + * @param digitCount number of digits used from the {@code digits} array. + * @param exponent exponent value. */ private ParsedDecimal(final boolean negative, final int[] digits, final int digitCount, final int exponent) { @@ -260,7 +269,8 @@ private ParsedDecimal(final boolean negative, final int[] digits, final int digi /** * Appends the given character to the output buffer. - * @param ch character to append + * + * @param ch character to append. */ private void append(final char ch) { outputChars[outputIdx++] = ch; @@ -268,7 +278,8 @@ private void append(final char ch) { /** * Appends the given character array directly to the output buffer. - * @param chars characters to append + * + * @param chars characters to append. */ private void append(final char[] chars) { for (final char c : chars) { @@ -278,10 +289,10 @@ private void append(final char[] chars) { /** * Appends the fractional component of the number to the current output buffer. - * @param zeroCount number of zeros to add after the decimal point and before the - * first significant digit - * @param startIdx significant digit start index - * @param opts format options + * + * @param zeroCount number of zeros to add after the decimal point and before the first significant digit. + * @param startIdx significant digit start index. + * @param opts format options. */ private void appendFraction(final int zeroCount, final int startIdx, final FormatOptions opts) { final char[] localizedDigits = opts.getDigits(); @@ -307,20 +318,20 @@ private void appendFraction(final int zeroCount, final int startIdx, final Forma /** * Appends the localized representation of the digit {@code n} to the output buffer. - * @param n digit to append - * @param digitChars character array containing localized versions of the digits {@code 0-9} - * in that order + * + * @param n digit to append. + * @param digitChars character array containing localized versions of the digits {@code 0-9} in that order. */ private void appendLocalizedDigit(final int n, final char[] digitChars) { append(digitChars[n]); } /** - * Appends the whole number portion of this value to the output buffer. No thousands - * separators are added. - * @param wholeCount total number of digits required to the left of the decimal point - * @param opts format options - * @return number of digits from {@code digits} appended to the output buffer + * Appends the whole number portion of this value to the output buffer. No thousands separators are added. + * + * @param wholeCount total number of digits required to the left of the decimal point. + * @param opts format options. + * @return number of digits from {@code digits} appended to the output buffer. * @see #appendWholeGrouped(int, FormatOptions) */ private int appendWhole(final int wholeCount, final FormatOptions opts) { @@ -350,11 +361,11 @@ private int appendWhole(final int wholeCount, final FormatOptions opts) { } /** - * Appends the whole number portion of this value to the output buffer, adding thousands - * separators as needed. + * Appends the whole number portion of this value to the output buffer, adding thousands separators as needed. + * * @param wholeCount total number of digits required to the right of the decimal point - * @param opts format options - * @return number of digits from {@code digits} appended to the output buffer + * @param opts format options. + * @return number of digits from {@code digits} appended to the output buffer. * @see #appendWhole(int, FormatOptions) */ private int appendWholeGrouped(final int wholeCount, final FormatOptions opts) { @@ -392,12 +403,12 @@ private int appendWholeGrouped(final int wholeCount, final FormatOptions opts) { } /** - * Gets the number of characters required for the digit portion of a string representation of - * this value. This excludes any exponent or thousands groupings characters. - * @param decimalPos decimal point position relative to the {@code digits} array - * @param opts format options - * @return number of characters required for the digit portion of a string representation of - * this value + * Gets the number of characters required for the digit portion of a string representation of this value. This excludes any exponent or thousands groupings + * characters. + * + * @param decimalPos decimal point position relative to the {@code digits} array. + * @param opts format options. + * @return number of characters required for the digit portion of a string representation of this value. */ private int getDigitStringSize(final int decimalPos, final FormatOptions opts) { int size = digitCount; @@ -425,21 +436,20 @@ private int getDigitStringSize(final int decimalPos, final FormatOptions opts) { } /** - * Gets the exponent value. This exponent produces a floating point value with the - * correct magnitude when applied to the internal unsigned integer. - * @return exponent value + * Gets the exponent value. This exponent produces a floating point value with the correct magnitude when applied to the internal unsigned integer. + * + * @return exponent value. */ public int getExponent() { return exponent; } /** - * Gets the number of characters required to create a plain format representation - * of this value. - * @param decimalPos decimal position relative to the {@code digits} array - * @param opts format options - * @return number of characters in the plain string representation of this value, - * created using the given parameters + * Gets the number of characters required to create a plain format representation of this value. + * + * @param decimalPos decimal position relative to the {@code digits} array. + * @param opts format options. + * @return number of characters in the plain string representation of this value, created using the given parameters. */ private int getPlainStringSize(final int decimalPos, final FormatOptions opts) { int size = getDigitStringSize(decimalPos, opts); @@ -453,30 +463,31 @@ private int getPlainStringSize(final int decimalPos, final FormatOptions opts) { } /** - * Gets the exponent that would be used when representing this number in scientific - * notation (i.e., with a single non-zero digit in front of the decimal point). - * @return the exponent that would be used when representing this number in scientific - * notation + * Gets the exponent that would be used when representing this number in scientific notation (i.e., with a single non-zero digit in front of the decimal + * point). + * + * @return the exponent that would be used when representing this number in scientific notation. */ public int getScientificExponent() { return digitCount + exponent - 1; } /** - * Tests {@code true} if this value is equal to zero. The sign field is ignored, - * meaning that this method will return {@code true} for both {@code +0} and {@code -0}. - * @return {@code true} if the value is equal to zero + * Tests {@code true} if this value is equal to zero. The sign field is ignored, meaning that this method will return {@code true} for both {@code +0} and + * {@code -0}. + * + * @return {@code true} if the value is equal to zero. */ boolean isZero() { return digits[0] == 0; } /** - * Ensures that this instance has at most the given number of significant digits - * (i.e. precision). If this instance already has a precision less than or equal - * to the argument, nothing is done. If the given precision requires a reduction in the number - * of digits, then the value is rounded using {@link java.math.RoundingMode#HALF_EVEN half-even rounding}. - * @param precision maximum number of significant digits to include + * Ensures that this instance has at most the given number of significant digits (i.e. precision). If this instance already has a precision less + * than or equal to the argument, nothing is done. If the given precision requires a reduction in the number of digits, then the value is rounded using + * {@link java.math.RoundingMode#HALF_EVEN half-even rounding}. + * + * @param precision maximum number of significant digits to include. */ public void maxPrecision(final int precision) { if (precision > 0 && precision < digitCount) { @@ -490,6 +501,7 @@ public void maxPrecision(final int precision) { /** * Gets the output buffer as a string. + * * @return output buffer as a string */ private String outputString() { @@ -500,7 +512,8 @@ private String outputString() { /** * Prepares the output buffer for a string of the given size. - * @param size buffer size + * + * @param size buffer size. */ private void prepareOutput(final int size) { outputChars = new char[size]; @@ -508,21 +521,20 @@ private void prepareOutput(final int size) { } /** - * Returns {@code true} if a grouping separator should be added after the whole digit - * character at the given position. - * @param pos whole digit character position, with values starting at 1 and increasing - * from right to left. - * @return {@code true} if a grouping separator should be added + * Returns {@code true} if a grouping separator should be added after the whole digit character at the given position. + * + * @param pos whole digit character position, with values starting at 1 and increasing from right to left. + * @return {@code true} if a grouping separator should be added. */ private boolean requiresGroupingSeparatorAfterPosition(final int pos) { return pos > 1 && pos % THOUSANDS_GROUP_SIZE == 1; } /** - * Rounds the instance to the given decimal exponent position using - * {@link java.math.RoundingMode#HALF_EVEN half-even rounding}. For example, a value of {@code -2} - * will round the instance to the digit at the position 10^-2 (i.e. to the closest multiple of 0.01). - * @param roundExponent exponent defining the decimal place to round to + * Rounds the instance to the given decimal exponent position using {@link java.math.RoundingMode#HALF_EVEN half-even rounding}. For example, a value of + * {@code -2} will round the instance to the digit at the position 10^-2 (i.e. to the closest multiple of 0.01). + * + * @param roundExponent exponent defining the decimal place to round to. */ public void round(final int roundExponent) { if (roundExponent > exponent) { @@ -543,8 +555,8 @@ public void round(final int roundExponent) { /** * Rounds the value up to the given number of digits. - * @param count target number of digits; must be greater than zero and - * less than the current number of digits + * + * @param count target number of digits; must be greater than zero and less than the current number of digits. */ private void roundUp(final int count) { int removedDigits = digitCount - count; @@ -572,10 +584,10 @@ private void roundUp(final int count) { } /** - * Sets the value of this instance to a single digit with the given exponent. - * The sign of the value is retained. - * @param digit digit value - * @param newExponent new exponent value + * Sets the value of this instance to a single digit with the given exponent. The sign of the value is retained. + * + * @param digit digit value. + * @param newExponent new exponent value. */ private void setSingleDigitValue(final int digit, final int newExponent) { digits[0] = digit; @@ -584,33 +596,31 @@ private void setSingleDigitValue(final int digit, final int newExponent) { } /** - * Returns {@code true} if a formatted string with the given target exponent should include - * the exponent field. - * @param targetExponent exponent of the formatted result - * @param opts format options - * @return {@code true} if the formatted string should include the exponent field + * Returns {@code true} if a formatted string with the given target exponent should include the exponent field. + * + * @param targetExponent exponent of the formatted result. + * @param opts format options. + * @return {@code true} if the formatted string should include the exponent field. */ private boolean shouldIncludeExponent(final int targetExponent, final FormatOptions opts) { return targetExponent != 0 || opts.isAlwaysIncludeExponent(); } /** - * Returns {@code true} if formatted strings should include the minus sign, considering - * the value of this instance and the given format options. - * @param opts format options - * @return {@code true} if a minus sign should be included in the output + * Returns {@code true} if formatted strings should include the minus sign, considering the value of this instance and the given format options. + * + * @param opts format options. + * @return {@code true} if a minus sign should be included in the output. */ private boolean shouldIncludeMinus(final FormatOptions opts) { return negative && (opts.isSignedZero() || !isZero()); } /** - * Returns {@code true} if a rounding operation for the given number of digits should - * round up. - * @param count number of digits to round to; must be greater than zero and less - * than the current number of digits - * @return {@code true} if a rounding operation for the given number of digits should - * round up + * Returns {@code true} if a rounding operation for the given number of digits should round up. + * + * @param count number of digits to round to; must be greater than zero and less than the current number of digits. + * @return {@code true} if a rounding operation for the given number of digits should round up. */ private boolean shouldRoundUp(final int count) { // Round up in the following cases: @@ -639,8 +649,8 @@ private boolean shouldRoundUp(final int count) { * 1e11 = "100.0E9" *

- - - + + + - - - + + +

commons-text-1.14.0-bin.tar.gz	sha512	pgp	commons-text-1.15.0-bin.tar.gz	sha512	pgp
commons-text-1.14.0-bin.zip	sha512	pgp	commons-text-1.15.0-bin.zip	sha512	pgp

- - - + + + - - - + + +

commons-text-1.14.0-src.tar.gz	sha512	pgp	commons-text-1.15.0-src.tar.gz	sha512	pgp
commons-text-1.14.0-src.zip	sha512	pgp	commons-text-1.15.0-src.zip	sha512	pgp

diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml index 9ef2de7e3f..83219a0dd5 100644 --- a/src/site/xdoc/issue-tracking.xml +++ b/src/site/xdoc/issue-tracking.xml @@ -43,7 +43,7 @@ limitations under the License. --> + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd"> Apache Commons Text Issue tracking Apache Commons Team diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index c8734db5fb..806e21bb19 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -41,7 +41,7 @@ limitations under the License. --> + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd"> Apache Commons Text Mailing Lists Apache Commons Team From 04e937470d3679cc163df85d82d5b6d2e3e71128 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 4 Dec 2025 15:55:50 +0000 Subject: [PATCH 131/188] Prepare for the release candidate 1.15.0 RC1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bcab4f571a..325a76ce79 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 93 commons-text - 1.15.0-SNAPSHOT + 1.15.0 Apache Commons Text Apache Commons Text is a set of utility functions and reusable components for processing and manipulating text in a Java environment. @@ -33,7 +33,7 @@ ISO-8859-1 UTF-8 - 2025-07-24T12:03:40Z + 2025-12-04T15:53:46Z 1.8 1.8 text From e680120e74a56e51ecff52713cb5167cbcc47867 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 5 Dec 2025 07:33:40 -0500 Subject: [PATCH 132/188] Fix benchmarks --- pom.xml | 36 +++++++++++++++++-- .../LongestCommonSubsequencePerformance.java | 8 ++--- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index bcab4f571a..f159e87218 100644 --- a/pom.xml +++ b/pom.xml @@ -598,13 +598,45 @@ + benchmark true org.apache + + + org.openjdk.jmh + jmh-core + ${commons.jmh.version} + test + + + org.openjdk.jmh + jmh-generator-annprocess + ${commons.jmh.version} + test + + + org.apache.commons + commons-collections4 + 4.5.0 + test + + + + + maven-compiler-plugin + ${commons.compiler.version} + + + **/* + + + + org.codehaus.mojo exec-maven-plugin @@ -620,12 +652,12 @@ java -classpath - + org.openjdk.jmh.Main -rf json -rff - target/jmh-result.${benchmark}.json + target/jmh-result.json ${benchmark} diff --git a/src/test/java/org/apache/commons/text/jmh/LongestCommonSubsequencePerformance.java b/src/test/java/org/apache/commons/text/jmh/LongestCommonSubsequencePerformance.java index a810e1167c..eef5f9d30e 100644 --- a/src/test/java/org/apache/commons/text/jmh/LongestCommonSubsequencePerformance.java +++ b/src/test/java/org/apache/commons/text/jmh/LongestCommonSubsequencePerformance.java @@ -134,7 +134,7 @@ public void setup() { } @Benchmark - void testLCS(final InputData data) { + public void testLCS(final InputData data) { final LongestCommonSubsequence lcs = new LongestCommonSubsequence(); for (final Pair input : data.inputs) { lcs.longestCommonSubsequence(input.getLeft(), input.getRight()); @@ -142,7 +142,7 @@ void testLCS(final InputData data) { } @Benchmark - void testLCSBaseline(final InputData data) { + public void testLCSBaseline(final InputData data) { final BaselineLongestCommonSubsequence lcs = new BaselineLongestCommonSubsequence(); for (final Pair input : data.inputs) { lcs.longestCommonSubsequence(input.getLeft(), input.getRight()); @@ -150,7 +150,7 @@ void testLCSBaseline(final InputData data) { } @Benchmark - void testLCSLen(final InputData data) { + public void testLCSLen(final InputData data) { final LongestCommonSubsequence lcs = new LongestCommonSubsequence(); for (final Pair input : data.inputs) { lcs.apply(input.getLeft(), input.getRight()); @@ -158,7 +158,7 @@ void testLCSLen(final InputData data) { } @Benchmark - void testLCSLenBaseline(final InputData data) { + public void testLCSLenBaseline(final InputData data) { final BaselineLongestCommonSubsequence lcs = new BaselineLongestCommonSubsequence(); for (final Pair input : data.inputs) { lcs.apply(input.getLeft(), input.getRight()); From d6d521ad37e07e0a71fb4170f7be468287cc0229 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 5 Dec 2025 08:19:57 -0500 Subject: [PATCH 133/188] Fix benchmark Add license header --- pom.xml | 7 +++- .../LongestCommonSubsequencePerformance.java | 33 +++++++++---------- .../commons/text/lcs-perf-analysis-inputs.csv | 16 ++++++++- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index f159e87218..8790371545 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,12 @@ ${jmh.version} test + + org.apache.commons + commons-csv + 1.14.1 + test + clean verify apache-rat:check japicmp:cmp checkstyle:check pmd:check spotbugs:check javadoc:javadoc @@ -149,7 +155,6 @@ src/site/resources/download_text.cgi src/site/resources/release-notes/RELEASE-NOTES-*.txt src/test/resources/org/apache/commons/text/stringEscapeUtilsTestData.txt - src/test/resources/org/apache/commons/text/lcs-perf-analysis-inputs.csv src/test/resources/org/apache/commons/text/oss-fuzz/** diff --git a/src/test/java/org/apache/commons/text/jmh/LongestCommonSubsequencePerformance.java b/src/test/java/org/apache/commons/text/jmh/LongestCommonSubsequencePerformance.java index eef5f9d30e..49d1318ed3 100644 --- a/src/test/java/org/apache/commons/text/jmh/LongestCommonSubsequencePerformance.java +++ b/src/test/java/org/apache/commons/text/jmh/LongestCommonSubsequencePerformance.java @@ -16,16 +16,14 @@ */ package org.apache.commons.text.jmh; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; -import java.io.UncheckedIOException; import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; +import org.apache.commons.csv.CSVFormat; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.text.similarity.LongestCommonSubsequence; @@ -114,22 +112,21 @@ public static class InputData { final List> inputs = new ArrayList<>(); @Setup(Level.Trial) - public void setup() { + public void setup() throws IOException { final ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - try (InputStream is = classLoader.getResourceAsStream("org/apache/commons/text/lcs-perf-analysis-inputs.csv"); - InputStreamReader isr = new InputStreamReader(Objects.requireNonNull(is)); - BufferedReader br = new BufferedReader(isr)) { - String line; - while ((line = br.readLine()) != null && !line.trim().isEmpty()) { - line = line.trim(); - final int indexOfComma = line.indexOf(','); - final String inputA = line.substring(0, indexOfComma); - final String inputB = line.substring(1 + indexOfComma); - this.inputs.add(ImmutablePair.of(inputA, inputB)); - } - } catch (final IOException exception) { - throw new UncheckedIOException(exception.getMessage(), exception); - } + CSVFormat.DEFAULT.builder().setCommentMarker('#').setTrim(true).get() + .parse(new InputStreamReader( + Objects.requireNonNull(classLoader.getResourceAsStream("org/apache/commons/text/lcs-perf-analysis-inputs.csv")))) + .forEach(record -> { + final String line = record.get(0); + final int indexOfComma = line.indexOf(','); + if (indexOfComma < 0) { + throw new IllegalStateException("Invalid input line: " + line); + } + final String inputA = line.substring(0, indexOfComma); + final String inputB = line.substring(1 + indexOfComma); + this.inputs.add(ImmutablePair.of(inputA, inputB)); + }); } } diff --git a/src/test/resources/org/apache/commons/text/lcs-perf-analysis-inputs.csv b/src/test/resources/org/apache/commons/text/lcs-perf-analysis-inputs.csv index 53610d3579..8253e4f6be 100644 --- a/src/test/resources/org/apache/commons/text/lcs-perf-analysis-inputs.csv +++ b/src/test/resources/org/apache/commons/text/lcs-perf-analysis-inputs.csv @@ -1,4 +1,18 @@ -"This is test data for a JMH (the Java Microbenchmark Harness) which is used from the class org.apache.commons.text.jmh.LongestCommonSubsequencePerformance." +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"This is test data for a JMH (the Java Microbenchmark Harness), which is used from the class org.apache.commons.text.jmh.LongestCommonSubsequencePerformance." "The quick brown fox jumps over the lazy dog. A man, a plan, a canal, Panama. Was it a car or a cat I saw? Step on no pets. Rats live on no evil star." "Here, the field iterations will be populated with appropriate values from the @Param annotation by the JMH when it is passed to the benchmark method. The @Setup annotated method is invoked before each invocation of the benchmark and creates a new Hasher ensuring isolation. When the execution is finished, we'll get a result similar to the one below: When running microbenchmarks, it's very important to be aware of optimizations. Otherwise, they may affect the","benchmark results in a very misleading way. To make matters a bit more concrete, let's consider an example: We expect object allocation costs more than doing nothing at all. However, if we run the benchmarks: Apparently finding a place in the TLAB, creating and initializing an object is almost free! Just by looking at these numbers, we should know that something does not quite add up here." "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. This code is free software; you can redistribute it and/or modify it published by the Free Software Foundation. Oracle designates this This code is distributed in the hope that it will be useful, but WITHOUT FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License You should have received a copy of the GNU General Public License version","Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? under the terms of the GNU General Public License version 2 only, as particular file as subject to the *Classpath* exception as provided ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or version 2 for more details (a copy is included in the LICENSE file that 2 along with this work; if not, write to the Free Software Foundation," From d98c3d74640f737d08bf13c105bba19611e97f80 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 5 Dec 2025 15:06:23 -0500 Subject: [PATCH 134/188] Bump github/codeql-action from 4.31.6 to 4.31.7 --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b47769e0ee..c928d7b1b4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6 + uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6 + uses: github/codeql-action/autobuild@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6 + uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index bcb94cd7f5..cefcc23f34 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6 + uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7 with: sarif_file: results.sarif From 6ffa7c2703ebf069e0df2cbb0ca9aafab4274ff9 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 5 Dec 2025 17:03:18 -0500 Subject: [PATCH 135/188] Ask for details on AI usage in creating a pull request --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 4cbe168c3e..9ff35c83e7 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -23,7 +23,7 @@ Before you push a pull request, review this list: - [ ] Read the [contribution guidelines](CONTRIBUTING.md) for this project. - [ ] Read the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) if you use Artificial Intelligence (AI). -- [ ] I used AI to create any part of, or all of, this pull request. +- [ ] I used AI to create any part of, or all of, this pull request. Which AI tool was used to create this pull request, and to what extent did it contribute? - [ ] Run a successful build using the default [Maven](https://maven.apache.org/) goal with `mvn`; that's `mvn` on the command line by itself. - [ ] Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied. This may not always be possible, but it is a best practice. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. From d38b9c23e1dcd1682ce37c90466a7fda40882aad Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 6 Dec 2025 11:40:24 -0500 Subject: [PATCH 136/188] Add NetBean IDE metadata files to .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 03ca919d66..c5860d17e9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,7 @@ site-content .externalToolBuilders /.checkstyle /.DS_Store + +# NetBeans files +nb-configuration.xml +nbactions.xml From df4916e11b96662c99dfca61fb1e31f5c1e715c7 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 7 Dec 2025 07:17:34 -0500 Subject: [PATCH 137/188] Normalize spelling --- .../java/org/apache/commons/text/similarity/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/text/similarity/package-info.java b/src/main/java/org/apache/commons/text/similarity/package-info.java index 3a2273ff1b..a0cdec2daa 100644 --- a/src/main/java/org/apache/commons/text/similarity/package-info.java +++ b/src/main/java/org/apache/commons/text/similarity/package-info.java @@ -37,7 +37,7 @@ * * *

The {@link org.apache.commons.text.similarity.CosineDistance Cosine Distance} - * utilises a {@link org.apache.commons.text.similarity.RegexTokenizer regular expression tokenizer (\w+)}. + * utilizes a {@link org.apache.commons.text.similarity.RegexTokenizer regular expression tokenizer (\w+)}. * And the {@link org.apache.commons.text.similarity.LevenshteinDistance Levenshtein Distance}'s * behavior can be changed to take into consideration a maximum throughput.

* From 001fc65a0c5c4e2fdc337094243db517ac1bbf8f Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 7 Dec 2025 22:18:19 +0000 Subject: [PATCH 138/188] Bump to next development version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 325a76ce79..a3e1315e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 93 commons-text - 1.15.0 + 1.15.1-SNAPSHOT Apache Commons Text Apache Commons Text is a set of utility functions and reusable components for processing and manipulating text in a Java environment. @@ -33,7 +33,7 @@ ISO-8859-1 UTF-8 - 2025-12-04T15:53:46Z + 2025-12-07T22:18:14Z 1.8 1.8 text From 8b2c08751d4b8838ebbee7ad91f53c1f2ef0e677 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 7 Dec 2025 22:19:24 +0000 Subject: [PATCH 139/188] Updates for the next release --- src/changes/changes.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 3f2071af29..547a6d5f1d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,6 +45,11 @@ The type attribute can be add,update,fix,remove. Apache Commons Text Changes + + + + + Fix exception message typo in XmlStringLookup.XmlStringLookup(Map, Path...). From e7ab51e35c30af2f668ccd504bcee7301668614f Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 7 Dec 2025 23:02:27 +0000 Subject: [PATCH 140/188] Updates for the next release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 42cbea80c3..f795a65026 100644 --- a/pom.xml +++ b/pom.xml @@ -39,8 +39,8 @@ text text org.apache.commons.text - 1.15.0 - 1.15.1 + 1.15.01 + 1.15.2 (Java 8+) TEXT 12318221 @@ -61,7 +61,7 @@ - 1.14.0 + 1.15.0 RC1 true scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} From 3d40bb3765f3f9838de4fe0321325d0438affae1 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 9 Dec 2025 10:12:23 -0500 Subject: [PATCH 141/188] Fix spelling in comments --- src/test/java/org/apache/commons/text/StrBuilderTest.java | 2 +- .../java/org/apache/commons/text/TextStringBuilderTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/commons/text/StrBuilderTest.java b/src/test/java/org/apache/commons/text/StrBuilderTest.java index 338768f4f5..c27cf469fc 100644 --- a/src/test/java/org/apache/commons/text/StrBuilderTest.java +++ b/src/test/java/org/apache/commons/text/StrBuilderTest.java @@ -1894,7 +1894,7 @@ void testSubSequenceIntInt() { // End index greater than length() assertThrows(IndexOutOfBoundsException.class, () -> sb.subSequence(2, sb.length() + 1)); - // Start index greater then end index + // Start index greater than end index assertThrows(IndexOutOfBoundsException.class, () -> sb.subSequence(3, 2)); // Normal cases diff --git a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java index 3317543f73..ff2cc7d00b 100644 --- a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java +++ b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java @@ -2190,7 +2190,7 @@ void testSubSequenceIntInt() { // End index greater than length() assertThrows(IndexOutOfBoundsException.class, () -> sb.subSequence(2, sb.length() + 1)); - // Start index greater then end index + // Start index greater than end index assertThrows(IndexOutOfBoundsException.class, () -> sb.subSequence(3, 2)); // Normal cases From 9e34d3d2b2f58c35937477d859042920cdaf3a00 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Fri, 12 Dec 2025 13:49:13 +0100 Subject: [PATCH 142/188] Add more test coverage (#732) * Enable test which can be enabled now * Ensure test does not fail on non-US default locale * Cover a few lines/branches Add some more tests to cover a bit more. Also apply some IDE-suggestions, assert-order, simplify assertions. * Adjust based on review comments Remove added @Deprecated Remove comments which silence warnings in IDEs Inline local variables * Revert "Ensure test does not fail on non-US default locale" This reverts commit 5a6af9ed28cc7523044150a5b57b109fbfc28cd8. * Some more minor adjustments of added tests based on code review --- .../org/apache/commons/text/OssFuzzTest.java | Bin 16930 -> 16771 bytes .../commons/text/StringSubstitutorTest.java | 8 ++++- .../commons/text/TextStringBuilderTest.java | 7 ++++ .../apache/commons/text/WordUtilsTest.java | 28 +++++++++++++++- .../text/lookup/StringLookupFactoryTest.java | 13 ++++++++ .../similarity/IntersectionResultTest.java | 5 ++- .../similarity/LevenshteinResultsTest.java | 16 +++++++++ .../LongestCommonSubsequenceTest.java | 4 +++ .../translate/CharSequenceTranslatorTest.java | 18 ++++++++-- .../text/translate/OctalUnescaperTest.java | 31 ++++++++++++++++++ .../translate/SinglePassTranslatorTest.java | 14 ++++++-- .../text/translate/UnicodeUnescaperTest.java | 5 +++ 12 files changed, 142 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/apache/commons/text/OssFuzzTest.java b/src/test/java/org/apache/commons/text/OssFuzzTest.java index 0b4e1a555ab1e9c074ea7fcebda4e188184551da..c3772e5a372d8e65be74c83afeb17071e84024fa 100644 GIT binary patch delta 30 mcmZ3~!r0u*xFMN&au@UE$p(&+n^&;-*i6=R44XW`aS{Nt5etO? delta 89 zcmZo}W?a<5xFMOD(U%%PKaJD5!lV)2@+< results.length; i++) { @@ -45,6 +45,9 @@ void testEquals() { for (int j = 0; j < results.length; j++) { Assertions.assertEquals(results[i].equals(results[j]), i == j); } + + Assertions.assertFalse(results[i].equals(null), "Should not be Equal to null"); + Assertions.assertNotEquals("Test", results[i], "Should not be Equal to a different type of object"); } } diff --git a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java index af8f5d92ba..ac93db0605 100644 --- a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java +++ b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java @@ -40,6 +40,15 @@ void testEqualsReturningFalse() { assertFalse(levenshteinResults.equals(levenshteinResultsTwo)); } + @Test + void testEqualsDifferentDistance() { + final Integer integerOne = 1662; + final Integer integerTwo = 1164; + final LevenshteinResults levenshteinResults = new LevenshteinResults(integerOne, integerOne, integerOne, integerOne); + final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integerTwo, integerOne, integerOne, integerOne); + assertFalse(levenshteinResults.equals(levenshteinResultsTwo)); + } + @Test void testEqualsSameObject() { final Integer integer = 1662; @@ -62,4 +71,11 @@ void testEqualsWithNull() { assertFalse(levenshteinResults.equals(null)); } + @Test + void testEqualsWithDifferentObject() { + final Integer integer = -647; + final LevenshteinResults levenshteinResults = new LevenshteinResults(integer, null, null, integer); + assertFalse(levenshteinResults.equals("Test")); + } + } diff --git a/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java b/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java index 2ca0a4b994..8063c911e7 100644 --- a/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java +++ b/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java @@ -89,6 +89,8 @@ void testLogestCommonSubsequence() { assertEquals("", subject.logestCommonSubsequence("", "")); assertEquals("", subject.logestCommonSubsequence("left", "")); assertEquals("", subject.logestCommonSubsequence("", "right")); + assertEquals("", subject.logestCommonSubsequence("l", "a")); + assertEquals("", subject.logestCommonSubsequence("left", "a")); assertEquals("fog", subject.logestCommonSubsequence("frog", "fog")); assertEquals("", subject.logestCommonSubsequence("fly", "ant")); assertEquals("h", subject.logestCommonSubsequence("elephant", "hippo")); @@ -106,6 +108,8 @@ void testLongestCommonSubsequence() { assertEquals("", subject.longestCommonSubsequence("", "")); assertEquals("", subject.longestCommonSubsequence("left", "")); assertEquals("", subject.longestCommonSubsequence("", "right")); + assertEquals("", subject.longestCommonSubsequence("l", "a")); + assertEquals("", subject.longestCommonSubsequence("left", "a")); assertEquals("fog", subject.longestCommonSubsequence("frog", "fog")); assertEquals("", subject.longestCommonSubsequence("fly", "ant")); assertEquals("h", subject.longestCommonSubsequence("elephant", "hippo")); diff --git a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java index 7585f71df1..3bb3328377 100644 --- a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java +++ b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java @@ -17,9 +17,11 @@ package org.apache.commons.text.translate; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.IOException; +import java.io.UncheckedIOException; import java.io.Writer; import org.junit.jupiter.api.Test; @@ -46,8 +48,20 @@ void testWith() throws IOException { final CharSequenceTranslator charSequenceTranslatorThree = new TestCharSequenceTranslator(); final CharSequenceTranslator aggregatedTranslator = charSequenceTranslatorOne.with(charSequenceTranslatorTwo, charSequenceTranslatorThree); aggregatedTranslator.translate("", 0, null); - assertTrue(aggregatedTranslator instanceof AggregateTranslator); + assertInstanceOf(AggregateTranslator.class, aggregatedTranslator); assertEquals(3, translateInvocationCounter); } + @Test + void testIOException() { + final CharSequenceTranslator translator = new CharSequenceTranslator() { + @Override + public int translate(CharSequence input, int index, Writer writer) throws IOException { + throw new IOException("Test exception"); + } + }; + + assertThrows(UncheckedIOException.class, + () -> translator.translate(".")); + } } diff --git a/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java b/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java index e9b78b44b7..1f7d4b7be3 100644 --- a/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java +++ b/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java @@ -38,6 +38,10 @@ void testBetween() { result = oue.translate(input); assertEquals("\377", result, "Failed to unescape octal characters via the between method"); + input = "\\777"; + result = oue.translate(input); + assertEquals("\777", result, "Failed to unescape octal characters via the between method"); + input = "\\377 and"; result = oue.translate(input); assertEquals("\377 and", result, "Failed to unescape octal characters via the between method"); @@ -79,4 +83,31 @@ void testBetween() { assertEquals("\\999", result, "Failed to ignore an out of range octal character via the between method"); } + @Test + void testInvalid() { + final OctalUnescaper oue = new OctalUnescaper(); + final String input = "\\4a"; + final String result = oue.translate(input); + assertEquals("\4a", result, "Failed to unescape octal characters via the between method"); + } + + @Test + void testHighLowSurrogate() { + final OctalUnescaper oue = new OctalUnescaper(); + String input = "\\377\uD800and"; + String result = oue.translate(input); + assertEquals("\377\uD800and", result, "Failed to unescape octal characters via the between method"); + + input = "\\377\uD83D\uDE80and"; + result = oue.translate(input); + assertEquals("\377\uD83D\uDE80and", result, "Failed to unescape octal characters via the between method"); + + input = "\\377\uD83D\uDC00and"; + result = oue.translate(input); + assertEquals("\377\uD83D\uDC00and", result, "Failed to unescape octal characters via the between method"); + + input = "\\377\uD83D"; + result = oue.translate(input); + assertEquals("\377\uD83D", result, "Failed to unescape octal characters via the between method"); + } } diff --git a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java index 37e6fdebd0..12ade3f325 100644 --- a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java +++ b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java @@ -19,7 +19,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -34,7 +33,7 @@ class SinglePassTranslatorTest { private final SinglePassTranslator dummyTranslator = new SinglePassTranslator() { @Override - void translateWhole(final CharSequence input, final Writer writer) throws IOException { + void translateWhole(final CharSequence input, final Writer writer) { // noop } }; @@ -63,4 +62,15 @@ void testTranslateThrowsIllegalArgumentException() { assertThrows(IllegalArgumentException.class, () -> dummyTranslator.translate("(,Fk", 647, null)); } + @Test + void testTranslateThrowsIllegalArgumentExceptionWithNonAnonymousClass() { + assertThrows(IllegalArgumentException.class, () -> new TestTranslator().translate("(,Fk", 647, null)); + } + + private static final class TestTranslator extends SinglePassTranslator { + @Override + void translateWhole(final CharSequence input, final Writer writer) { + // noop + } + } } diff --git a/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java b/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java index cd106c66c4..f20d710678 100644 --- a/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java +++ b/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java @@ -49,4 +49,9 @@ void testUuuuu() { final String result = escaper.translate(input); assertEquals("G", result, "Failed to unescape Unicode characters with many 'u' characters"); } + + @Test + void testTooShort() { + assertThrows(IllegalArgumentException.class, () -> new UnicodeUnescaper().translate("\\u")); + } } From 94200bc822aa17d93d07286672ed3aaa96a0fe24 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 12 Dec 2025 07:58:33 -0500 Subject: [PATCH 143/188] Bump the level of test coverage checks. See: Improve test coverage #732. --- pom.xml | 9 +++++---- src/changes/changes.xml | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f795a65026..17345d6bdc 100644 --- a/pom.xml +++ b/pom.xml @@ -72,13 +72,14 @@ commons.releaseManagerKey --> + true 1.00 - 0.97 - 0.98 + 0.99 + 0.99 0.95 - 0.94 - 0.98 + 0.99 + 0.97 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 547a6d5f1d..5be0355c4b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -47,8 +47,10 @@ The type attribute can be add,update,fix,remove. + Improve test coverage #732. + Bump the level of test coverage checks. From 2f36f016a3ff14523ab66f1ec4137d02c9e4f193 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 12 Dec 2025 08:17:31 -0500 Subject: [PATCH 144/188] Bump github/codeql-action from 4.31.7 to 4.31.8 --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c928d7b1b4..8223940b02 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7 + uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7 + uses: github/codeql-action/autobuild@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7 + uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index cefcc23f34..217e1d4180 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7 + uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8 with: sarif_file: results.sarif From f63330b8c6dae451199242168abb282078b519ab Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 12 Dec 2025 14:17:18 -0500 Subject: [PATCH 145/188] Sort members --- .../text/lookup/StringLookupFactoryTest.java | 28 +++++++++---------- .../similarity/LevenshteinResultsTest.java | 22 +++++++-------- .../translate/CharSequenceTranslatorTest.java | 22 +++++++-------- .../text/translate/OctalUnescaperTest.java | 16 +++++------ .../translate/SinglePassTranslatorTest.java | 14 +++++----- .../text/translate/UnicodeUnescaperTest.java | 10 +++---- 6 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java b/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java index 43e6f237f1..caeccd8289 100644 --- a/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java +++ b/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java @@ -103,6 +103,12 @@ void testAddDefaultStringLookupsNull() { StringLookupFactory.INSTANCE.addDefaultStringLookups(null); } + @Test + void testClear() { + // this will clear out the global cache in ConstantStringLookup + StringLookupFactory.clear(); + } + /** * Tests that we return the singleton. */ @@ -229,6 +235,14 @@ void testDefaultStringLookupsHolder_multipleLookups() { // @formatter:on } + /** + * Tests that we return the singleton. + */ + @Test + void testDeprecatedSingletons() { + assertSame(StringLookupFactory.INSTANCE_BASE64_DECODER, StringLookupFactory.INSTANCE.base64StringLookup()); + } + /** * Tests that we return the singleton. */ @@ -257,14 +271,6 @@ void testSingletons() { assertSame(XmlEncoderStringLookup.INSTANCE, stringLookupFactory.xmlEncoderStringLookup()); } - /** - * Tests that we return the singleton. - */ - @Test - void testDeprecatedSingletons() { - assertSame(StringLookupFactory.INSTANCE_BASE64_DECODER, StringLookupFactory.INSTANCE.base64StringLookup()); - } - @Test void testXmlStringLookup() { final StringLookupFactory stringLookupFactory = StringLookupFactory.INSTANCE; @@ -286,10 +292,4 @@ void testXmlStringLookupExternalEntityOn() { final String key = XmlStringLookupTest.DOC_DIR + "document-entity-ref.xml:/document/content"; assertEquals(XmlStringLookupTest.DATA, StringLookupFactory.INSTANCE.xmlStringLookup(XmlStringLookupTest.EMPTY_MAP).apply(key).trim()); } - - @Test - void testClear() { - // this will clear out the global cache in ConstantStringLookup - StringLookupFactory.clear(); - } } diff --git a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java index ac93db0605..d72f91f9c4 100644 --- a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java +++ b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java @@ -32,20 +32,20 @@ void testEqualsDifferenceInSubstitutionCount() { } @Test - void testEqualsReturningFalse() { + void testEqualsDifferentDistance() { final Integer integerOne = 1662; final Integer integerTwo = 1164; final LevenshteinResults levenshteinResults = new LevenshteinResults(integerOne, integerOne, integerOne, integerOne); - final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integerOne, integerOne, integerTwo, integerTwo); + final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integerTwo, integerOne, integerOne, integerOne); assertFalse(levenshteinResults.equals(levenshteinResultsTwo)); } @Test - void testEqualsDifferentDistance() { + void testEqualsReturningFalse() { final Integer integerOne = 1662; final Integer integerTwo = 1164; final LevenshteinResults levenshteinResults = new LevenshteinResults(integerOne, integerOne, integerOne, integerOne); - final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integerTwo, integerOne, integerOne, integerOne); + final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integerOne, integerOne, integerTwo, integerTwo); assertFalse(levenshteinResults.equals(levenshteinResultsTwo)); } @@ -56,6 +56,13 @@ void testEqualsSameObject() { assertTrue(levenshteinResults.equals(levenshteinResults)); } + @Test + void testEqualsWithDifferentObject() { + final Integer integer = -647; + final LevenshteinResults levenshteinResults = new LevenshteinResults(integer, null, null, integer); + assertFalse(levenshteinResults.equals("Test")); + } + @Test void testEqualsWithNonNull() { final Integer integer = 1; @@ -71,11 +78,4 @@ void testEqualsWithNull() { assertFalse(levenshteinResults.equals(null)); } - @Test - void testEqualsWithDifferentObject() { - final Integer integer = -647; - final LevenshteinResults levenshteinResults = new LevenshteinResults(integer, null, null, integer); - assertFalse(levenshteinResults.equals("Test")); - } - } diff --git a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java index 3bb3328377..894fc877b1 100644 --- a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java +++ b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java @@ -41,17 +41,6 @@ public int translate(final CharSequence input, final int index, final Writer wri //Used to count translate invocations private int translateInvocationCounter; - @Test - void testWith() throws IOException { - final CharSequenceTranslator charSequenceTranslatorOne = new TestCharSequenceTranslator(); - final CharSequenceTranslator charSequenceTranslatorTwo = new TestCharSequenceTranslator(); - final CharSequenceTranslator charSequenceTranslatorThree = new TestCharSequenceTranslator(); - final CharSequenceTranslator aggregatedTranslator = charSequenceTranslatorOne.with(charSequenceTranslatorTwo, charSequenceTranslatorThree); - aggregatedTranslator.translate("", 0, null); - assertInstanceOf(AggregateTranslator.class, aggregatedTranslator); - assertEquals(3, translateInvocationCounter); - } - @Test void testIOException() { final CharSequenceTranslator translator = new CharSequenceTranslator() { @@ -64,4 +53,15 @@ public int translate(CharSequence input, int index, Writer writer) throws IOExce assertThrows(UncheckedIOException.class, () -> translator.translate(".")); } + + @Test + void testWith() throws IOException { + final CharSequenceTranslator charSequenceTranslatorOne = new TestCharSequenceTranslator(); + final CharSequenceTranslator charSequenceTranslatorTwo = new TestCharSequenceTranslator(); + final CharSequenceTranslator charSequenceTranslatorThree = new TestCharSequenceTranslator(); + final CharSequenceTranslator aggregatedTranslator = charSequenceTranslatorOne.with(charSequenceTranslatorTwo, charSequenceTranslatorThree); + aggregatedTranslator.translate("", 0, null); + assertInstanceOf(AggregateTranslator.class, aggregatedTranslator); + assertEquals(3, translateInvocationCounter); + } } diff --git a/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java b/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java index 1f7d4b7be3..2dd9cefa3a 100644 --- a/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java +++ b/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java @@ -83,14 +83,6 @@ void testBetween() { assertEquals("\\999", result, "Failed to ignore an out of range octal character via the between method"); } - @Test - void testInvalid() { - final OctalUnescaper oue = new OctalUnescaper(); - final String input = "\\4a"; - final String result = oue.translate(input); - assertEquals("\4a", result, "Failed to unescape octal characters via the between method"); - } - @Test void testHighLowSurrogate() { final OctalUnescaper oue = new OctalUnescaper(); @@ -110,4 +102,12 @@ void testHighLowSurrogate() { result = oue.translate(input); assertEquals("\377\uD83D", result, "Failed to unescape octal characters via the between method"); } + + @Test + void testInvalid() { + final OctalUnescaper oue = new OctalUnescaper(); + final String input = "\\4a"; + final String result = oue.translate(input); + assertEquals("\4a", result, "Failed to unescape octal characters via the between method"); + } } diff --git a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java index 12ade3f325..1a66bc1973 100644 --- a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java +++ b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java @@ -30,6 +30,13 @@ */ class SinglePassTranslatorTest { + private static final class TestTranslator extends SinglePassTranslator { + @Override + void translateWhole(final CharSequence input, final Writer writer) { + // noop + } + } + private final SinglePassTranslator dummyTranslator = new SinglePassTranslator() { @Override @@ -66,11 +73,4 @@ void testTranslateThrowsIllegalArgumentException() { void testTranslateThrowsIllegalArgumentExceptionWithNonAnonymousClass() { assertThrows(IllegalArgumentException.class, () -> new TestTranslator().translate("(,Fk", 647, null)); } - - private static final class TestTranslator extends SinglePassTranslator { - @Override - void translateWhole(final CharSequence input, final Writer writer) { - // noop - } - } } diff --git a/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java b/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java index f20d710678..2879f56c1e 100644 --- a/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java +++ b/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java @@ -34,6 +34,11 @@ void testLessThanFour() { assertThrows(IllegalArgumentException.class, () -> escaper.translate(input)); } + @Test + void testTooShort() { + assertThrows(IllegalArgumentException.class, () -> new UnicodeUnescaper().translate("\\u")); + } + // Requested in LANG-507 @Test void testUPlus() { @@ -49,9 +54,4 @@ void testUuuuu() { final String result = escaper.translate(input); assertEquals("G", result, "Failed to unescape Unicode characters with many 'u' characters"); } - - @Test - void testTooShort() { - assertThrows(IllegalArgumentException.class, () -> new UnicodeUnescaper().translate("\\u")); - } } From 1e8c3f704d2f15d343a910c6192985a59d4b664f Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 12 Dec 2025 14:19:45 -0500 Subject: [PATCH 146/188] Use final --- .../java/org/apache/commons/text/StringSubstitutorTest.java | 2 +- .../commons/text/translate/CharSequenceTranslatorTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/commons/text/StringSubstitutorTest.java b/src/test/java/org/apache/commons/text/StringSubstitutorTest.java index 4022fc3da1..83544c9490 100644 --- a/src/test/java/org/apache/commons/text/StringSubstitutorTest.java +++ b/src/test/java/org/apache/commons/text/StringSubstitutorTest.java @@ -1088,7 +1088,7 @@ void testSubstitutePreserveEscape() throws IOException { @Test void testToString() { final StringSubstitutor s = new StringSubstitutor(null, "prefix", "suffix"); - String str = s.toString(); + final String str = s.toString(); assertTrue(str.contains("\"prefix\""), "Had: " + str); } } diff --git a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java index 894fc877b1..cd16956cd3 100644 --- a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java +++ b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java @@ -45,7 +45,7 @@ public int translate(final CharSequence input, final int index, final Writer wri void testIOException() { final CharSequenceTranslator translator = new CharSequenceTranslator() { @Override - public int translate(CharSequence input, int index, Writer writer) throws IOException { + public int translate(final CharSequence input, final int index, final Writer writer) throws IOException { throw new IOException("Test exception"); } }; From 70e527e723307dd26b790382632fb152d45cd1fb Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 12 Dec 2025 14:21:16 -0500 Subject: [PATCH 147/188] Don't use @Deprecated on test methods --- .../java/org/apache/commons/text/StrBuilderAppendInsertTest.java | 1 - src/test/java/org/apache/commons/text/StrBuilderTest.java | 1 - src/test/java/org/apache/commons/text/StrLookupTest.java | 1 - src/test/java/org/apache/commons/text/StrMatcherTest.java | 1 - src/test/java/org/apache/commons/text/StrSubstitutorTest.java | 1 - src/test/java/org/apache/commons/text/StrTokenizerTest.java | 1 - .../commons/text/similarity/LongestCommonSubsequenceTest.java | 1 - 7 files changed, 7 deletions(-) diff --git a/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java b/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java index 15a8313e97..05e64ae8df 100644 --- a/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java +++ b/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java @@ -35,7 +35,6 @@ * * @deprecated This class will be removed in 2.0. */ -@Deprecated class StrBuilderAppendInsertTest { /** The system line separator. */ diff --git a/src/test/java/org/apache/commons/text/StrBuilderTest.java b/src/test/java/org/apache/commons/text/StrBuilderTest.java index c27cf469fc..6ae331e931 100644 --- a/src/test/java/org/apache/commons/text/StrBuilderTest.java +++ b/src/test/java/org/apache/commons/text/StrBuilderTest.java @@ -45,7 +45,6 @@ * * @deprecated This class will be removed in 2.0. */ -@Deprecated class StrBuilderTest { private static final class MockReadable implements Readable { diff --git a/src/test/java/org/apache/commons/text/StrLookupTest.java b/src/test/java/org/apache/commons/text/StrLookupTest.java index 125737a4a6..3b74af62b8 100644 --- a/src/test/java/org/apache/commons/text/StrLookupTest.java +++ b/src/test/java/org/apache/commons/text/StrLookupTest.java @@ -32,7 +32,6 @@ * * @deprecated This class will be removed in 2.0. */ -@Deprecated class StrLookupTest { @Test diff --git a/src/test/java/org/apache/commons/text/StrMatcherTest.java b/src/test/java/org/apache/commons/text/StrMatcherTest.java index f20264aba2..43cd3163f5 100644 --- a/src/test/java/org/apache/commons/text/StrMatcherTest.java +++ b/src/test/java/org/apache/commons/text/StrMatcherTest.java @@ -26,7 +26,6 @@ * * @deprecated This class will be removed in 2.0. */ -@Deprecated class StrMatcherTest { private static final char[] BUFFER1 = "0,1\t2 3\n\r\f\u0000'\"".toCharArray(); diff --git a/src/test/java/org/apache/commons/text/StrSubstitutorTest.java b/src/test/java/org/apache/commons/text/StrSubstitutorTest.java index b4c3065033..ebefd2a568 100644 --- a/src/test/java/org/apache/commons/text/StrSubstitutorTest.java +++ b/src/test/java/org/apache/commons/text/StrSubstitutorTest.java @@ -39,7 +39,6 @@ * * @deprecated This class will be removed in 2.0. */ -@Deprecated class StrSubstitutorTest { private Map values; diff --git a/src/test/java/org/apache/commons/text/StrTokenizerTest.java b/src/test/java/org/apache/commons/text/StrTokenizerTest.java index 59ca3467f4..25731b0574 100644 --- a/src/test/java/org/apache/commons/text/StrTokenizerTest.java +++ b/src/test/java/org/apache/commons/text/StrTokenizerTest.java @@ -37,7 +37,6 @@ * * @deprecated This class will be removed in 2.0. */ -@Deprecated class StrTokenizerTest { private static final String CSV_SIMPLE_FIXTURE = "A,b,c"; diff --git a/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java b/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java index 8063c911e7..f7d64874de 100644 --- a/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java +++ b/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java @@ -84,7 +84,6 @@ void testGettingLongestCommonSubsequenceStringNull() { } @Test - @Deprecated void testLogestCommonSubsequence() { assertEquals("", subject.logestCommonSubsequence("", "")); assertEquals("", subject.logestCommonSubsequence("left", "")); From a78023d2782b40dd1f9b1fe719fe1f5eac5f8851 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 12 Dec 2025 14:23:11 -0500 Subject: [PATCH 148/188] Use static imports only for JUnit assertions --- .../lookup/Base64DecoderStringLookupTest.java | 11 ++++++---- .../lookup/Base64EncoderStringLookupTest.java | 11 ++++++---- .../lookup/BiFunctionStringLookupTest.java | 21 +++++++++++-------- .../text/lookup/BiStringLookupTest.java | 5 +++-- .../lookup/ConstantStringLookupBasicTest.java | 15 +++++++------ .../text/lookup/ConstantStringLookupTest.java | 20 ++++++++++-------- .../text/lookup/DateStringLookupTest.java | 4 ++-- .../text/lookup/DnsStringLookupTest.java | 20 +++++++++++------- .../EnvironmentVariableStringLookupTest.java | 13 +++++++----- .../text/lookup/FileStringLookupTest.java | 15 ++++++------- .../text/lookup/FunctionStringLookupTest.java | 15 +++++++------ .../InetAddressStringLookupLocalHostTest.java | 18 +++++++++------- ...ddressStringLookupLoopbackAddressTest.java | 18 +++++++++------- .../lookup/InterpolatorStringLookupTest.java | 5 ++--- .../lookup/JavaPlatformStringLookupTest.java | 7 ++++--- .../text/lookup/NullStringLookupTest.java | 10 +++++---- .../lookup/PropertiesStringLookupTest.java | 19 +++++++++-------- .../ResourceBundleStringLookupTest.java | 11 +++++----- .../text/lookup/ScriptStringLookupTest.java | 15 +++++++------ .../SystemPropertyStringLookupTest.java | 11 ++++++---- .../lookup/UrlDecoderStringLookupTest.java | 14 +++++++------ .../lookup/UrlEncoderStringLookupTest.java | 10 +++++---- .../text/lookup/UrlStringLookupTest.java | 15 +++++++------ .../lookup/XmlDecoderStringLookupTest.java | 11 ++++++---- .../lookup/XmlEncoderStringLookupTest.java | 11 ++++++---- 25 files changed, 191 insertions(+), 134 deletions(-) diff --git a/src/test/java/org/apache/commons/text/lookup/Base64DecoderStringLookupTest.java b/src/test/java/org/apache/commons/text/lookup/Base64DecoderStringLookupTest.java index c5eac76e24..99cbeeaad4 100644 --- a/src/test/java/org/apache/commons/text/lookup/Base64DecoderStringLookupTest.java +++ b/src/test/java/org/apache/commons/text/lookup/Base64DecoderStringLookupTest.java @@ -17,7 +17,10 @@ package org.apache.commons.text.lookup; -import org.junit.jupiter.api.Assertions; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.junit.jupiter.api.Test; /** @@ -27,18 +30,18 @@ class Base64DecoderStringLookupTest { @Test void test() { - Assertions.assertEquals("HelloWorld!", StringLookupFactory.INSTANCE_BASE64_DECODER.apply("SGVsbG9Xb3JsZCE=")); + assertEquals("HelloWorld!", StringLookupFactory.INSTANCE_BASE64_DECODER.apply("SGVsbG9Xb3JsZCE=")); } @Test void testNull() { - Assertions.assertNull(StringLookupFactory.INSTANCE_BASE64_DECODER.apply(null)); + assertNull(StringLookupFactory.INSTANCE_BASE64_DECODER.apply(null)); } @Test void testToString() { // does not blow up and gives some kind of string. - Assertions.assertFalse(StringLookupFactory.INSTANCE_BASE64_DECODER.toString().isEmpty()); + assertFalse(StringLookupFactory.INSTANCE_BASE64_DECODER.toString().isEmpty()); } } diff --git a/src/test/java/org/apache/commons/text/lookup/Base64EncoderStringLookupTest.java b/src/test/java/org/apache/commons/text/lookup/Base64EncoderStringLookupTest.java index df4d320df8..b6741bb074 100644 --- a/src/test/java/org/apache/commons/text/lookup/Base64EncoderStringLookupTest.java +++ b/src/test/java/org/apache/commons/text/lookup/Base64EncoderStringLookupTest.java @@ -17,7 +17,10 @@ package org.apache.commons.text.lookup; -import org.junit.jupiter.api.Assertions; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.junit.jupiter.api.Test; /** @@ -27,18 +30,18 @@ class Base64EncoderStringLookupTest { @Test void test() { - Assertions.assertEquals("SGVsbG9Xb3JsZCE=", StringLookupFactory.INSTANCE_BASE64_ENCODER.apply("HelloWorld!")); + assertEquals("SGVsbG9Xb3JsZCE=", StringLookupFactory.INSTANCE_BASE64_ENCODER.apply("HelloWorld!")); } @Test void testNull() { - Assertions.assertNull(StringLookupFactory.INSTANCE_BASE64_ENCODER.apply(null)); + assertNull(StringLookupFactory.INSTANCE_BASE64_ENCODER.apply(null)); } @Test void testToString() { // does not blow up and gives some kind of string. - Assertions.assertFalse(StringLookupFactory.INSTANCE_BASE64_ENCODER.toString().isEmpty()); + assertFalse(StringLookupFactory.INSTANCE_BASE64_ENCODER.toString().isEmpty()); } } diff --git a/src/test/java/org/apache/commons/text/lookup/BiFunctionStringLookupTest.java b/src/test/java/org/apache/commons/text/lookup/BiFunctionStringLookupTest.java index e6f9337a8b..e73f64f7ee 100644 --- a/src/test/java/org/apache/commons/text/lookup/BiFunctionStringLookupTest.java +++ b/src/test/java/org/apache/commons/text/lookup/BiFunctionStringLookupTest.java @@ -17,13 +17,16 @@ package org.apache.commons.text.lookup; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.BiFunction; import org.apache.commons.lang3.StringUtils; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -71,25 +74,25 @@ void testBiFunctionForNestedMap() { // Use map final BiStringLookup> stringLookup = StringLookupFactory.INSTANCE .biFunctionStringLookup(nestedMapBiFunction); - Assertions.assertEquals(rootValue2, stringLookup.lookup(rootKey2, rootMap)); - Assertions.assertEquals(subValue, stringLookup.lookup(rootKey + SEPARATOR + subKey, rootMap)); - Assertions.assertEquals(subSubValue, + assertEquals(rootValue2, stringLookup.lookup(rootKey2, rootMap)); + assertEquals(subValue, stringLookup.lookup(rootKey + SEPARATOR + subKey, rootMap)); + assertEquals(subSubValue, stringLookup.lookup(rootKey + SEPARATOR + subKeyMap + SEPARATOR + subSubKey, rootMap)); } @Test void testConcurrentHashMapNull() { - Assertions.assertNull(BiFunctionStringLookup.on(new ConcurrentHashMap<>()).apply(null)); + assertNull(BiFunctionStringLookup.on(new ConcurrentHashMap<>()).apply(null)); } @Test void testHashMapNull() { - Assertions.assertNull(BiFunctionStringLookup.on(new HashMap<>()).apply(null)); + assertNull(BiFunctionStringLookup.on(new HashMap<>()).apply(null)); } @Test void testNullBiFunction() { - Assertions.assertNull(BiFunctionStringLookup.on((BiFunction) null).apply(null)); + assertNull(BiFunctionStringLookup.on((BiFunction) null).apply(null)); } @Test @@ -98,13 +101,13 @@ void testOne() { final String value = "value"; final Map map = new HashMap<>(); map.put(key, value); - Assertions.assertEquals(value, FunctionStringLookup.on(map).apply(key)); + assertEquals(value, FunctionStringLookup.on(map).apply(key)); } @Test void testToString() { // does not blow up and gives some kind of string. - Assertions.assertFalse(BiFunctionStringLookup.on(new HashMap<>()).toString().isEmpty()); + assertFalse(BiFunctionStringLookup.on(new HashMap<>()).toString().isEmpty()); } } diff --git a/src/test/java/org/apache/commons/text/lookup/BiStringLookupTest.java b/src/test/java/org/apache/commons/text/lookup/BiStringLookupTest.java index 5aee02abb2..a54b35dbbf 100644 --- a/src/test/java/org/apache/commons/text/lookup/BiStringLookupTest.java +++ b/src/test/java/org/apache/commons/text/lookup/BiStringLookupTest.java @@ -17,7 +17,8 @@ package org.apache.commons.text.lookup; -import org.junit.jupiter.api.Assertions; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.Test; /** @@ -27,7 +28,7 @@ class BiStringLookupTest { @Test void testDefaultMethod() { - Assertions.assertEquals("a", ((BiStringLookup

+ Introducing Apache Commons Text +

Table of Contents

Description

Using the org.apache.commons.text package

Class StringEscapeUtils

Class StringSubstitutor

Similarity and Distance

Text diff'ing

Package org.apache.commons.text.diff

Using the org.apache.commons.text.lookup package

Using the org.apache.commons.text.similarity package

Using the org.apache.commons.text.translate package

+ Requirements +

The Commons Text Package -

Users Guide