You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/04/07 17:44:40 UTC
(commons-text) branch master updated (191abef9 -> 53b3550e)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
from 191abef9 Bump actions/dependency-review-action from 4.5.0 to 4.6.0 (#661)
new 3859d4e9 Sort members
new caef5309 Add missing @Deprecated
new 53b3550e Use better Map API
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/text/translate/EntityArrays.java | 1 +
.../text/lookup/StringLookupFactoryTest.java | 54 +++++++++++-----------
.../commons/text/translate/EntityArraysTest.java | 10 ++--
3 files changed, 33 insertions(+), 32 deletions(-)
(commons-text) 02/03: Add missing @Deprecated
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
commit caef53092b79e2ed1f8777d60e47682645c82b5c
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Mon Apr 7 13:42:28 2025 -0400
Add missing @Deprecated
---
src/main/java/org/apache/commons/text/translate/EntityArrays.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/apache/commons/text/translate/EntityArrays.java b/src/main/java/org/apache/commons/text/translate/EntityArrays.java
index 1cc266aa..3b9d3ab9 100644
--- a/src/main/java/org/apache/commons/text/translate/EntityArrays.java
+++ b/src/main/java/org/apache/commons/text/translate/EntityArrays.java
@@ -452,6 +452,7 @@ public class EntityArrays {
*
* @deprecated Will be private.
*/
+ @Deprecated
public EntityArrays() {
// empty
}
(commons-text) 03/03: Use better Map API
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
commit 53b3550e15f89e8991751b940ad73e553abc7e38
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Mon Apr 7 13:44:17 2025 -0400
Use better Map API
---
.../org/apache/commons/text/translate/EntityArraysTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/test/java/org/apache/commons/text/translate/EntityArraysTest.java b/src/test/java/org/apache/commons/text/translate/EntityArraysTest.java
index 991ce292..c32b5b62 100644
--- a/src/test/java/org/apache/commons/text/translate/EntityArraysTest.java
+++ b/src/test/java/org/apache/commons/text/translate/EntityArraysTest.java
@@ -82,27 +82,27 @@ public class EntityArraysTest {
@Test
public void testForDuplicateDeclaredMapValuesAposMap() {
- assertEquals(EntityArrays.APOS_UNESCAPE.keySet().size(), EntityArrays.APOS_ESCAPE.keySet().size());
+ assertEquals(EntityArrays.APOS_UNESCAPE.size(), EntityArrays.APOS_ESCAPE.size());
}
@Test
public void testForDuplicateDeclaredMapValuesBasicMap() {
- assertEquals(EntityArrays.BASIC_ESCAPE.keySet().size(), EntityArrays.BASIC_UNESCAPE.keySet().size());
+ assertEquals(EntityArrays.BASIC_ESCAPE.size(), EntityArrays.BASIC_UNESCAPE.size());
}
@Test
public void testForDuplicateDeclaredMapValuesHtml40ExtendedMap() {
- assertEquals(EntityArrays.HTML40_EXTENDED_ESCAPE.keySet().size(), EntityArrays.HTML40_EXTENDED_UNESCAPE.keySet().size());
+ assertEquals(EntityArrays.HTML40_EXTENDED_ESCAPE.size(), EntityArrays.HTML40_EXTENDED_UNESCAPE.size());
}
@Test
public void testForDuplicateDeclaredMapValuesISO8859Map() {
- assertEquals(EntityArrays.ISO8859_1_ESCAPE.keySet().size(), EntityArrays.ISO8859_1_UNESCAPE.keySet().size());
+ assertEquals(EntityArrays.ISO8859_1_ESCAPE.size(), EntityArrays.ISO8859_1_UNESCAPE.size());
}
@Test
public void testForDuplicateDeclaredMapValuesJavaCtrlCharsMap() {
- assertEquals(EntityArrays.JAVA_CTRL_CHARS_ESCAPE.keySet().size(), EntityArrays.JAVA_CTRL_CHARS_UNESCAPE.keySet().size());
+ assertEquals(EntityArrays.JAVA_CTRL_CHARS_ESCAPE.size(), EntityArrays.JAVA_CTRL_CHARS_UNESCAPE.size());
}
@Test
(commons-text) 01/03: Sort members
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
commit 3859d4e9a86f8e63e95ef09d271d82eece98ab2b
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Mon Apr 7 13:41:54 2025 -0400
Sort members
---
.../text/lookup/StringLookupFactoryTest.java | 54 +++++++++++-----------
1 file changed, 27 insertions(+), 27 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 34bf7aa5..115e3a01 100644
--- a/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java
+++ b/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java
@@ -109,6 +109,33 @@ public class StringLookupFactoryTest {
StringLookupFactory.INSTANCE.addDefaultStringLookups(null);
}
+ /**
+ * Tests that we return the singleton.
+ */
+ @Test
+ public void testDefault() {
+ final StringLookupFactory stringLookupFactory = StringLookupFactory.INSTANCE;
+ final Map<String, StringLookup> stringLookupMap = new HashMap<>();
+ stringLookupFactory.addDefaultStringLookups(stringLookupMap);
+ assertTrue(stringLookupMap.containsKey("base64"));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_BASE64_ENCODER.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_CONST.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_DATE));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_ENV.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_FILE.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_JAVA.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_LOCALHOST.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_LOOPBACK_ADDRESS.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_PROPERTIES.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_RESOURCE_BUNDLE.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_SYS.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_URL_DECODER.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_URL_ENCODER.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_XML.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_XML_DECODER.toLowerCase(Locale.ROOT)));
+ assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_XML_ENCODER.toLowerCase(Locale.ROOT)));
+ }
+
@Test
public void testDefaultStringLookupsHolder_allLookups() {
final Properties props = new Properties();
@@ -247,33 +274,6 @@ public class StringLookupFactoryTest {
assertSame(XmlEncoderStringLookup.INSTANCE, stringLookupFactory.xmlEncoderStringLookup());
}
- /**
- * Tests that we return the singleton.
- */
- @Test
- public void testDefault() {
- final StringLookupFactory stringLookupFactory = StringLookupFactory.INSTANCE;
- final Map<String, StringLookup> stringLookupMap = new HashMap<>();
- stringLookupFactory.addDefaultStringLookups(stringLookupMap);
- assertTrue(stringLookupMap.containsKey("base64"));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_BASE64_ENCODER.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_CONST.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_DATE));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_ENV.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_FILE.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_JAVA.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_LOCALHOST.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_LOOPBACK_ADDRESS.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_PROPERTIES.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_RESOURCE_BUNDLE.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_SYS.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_URL_DECODER.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_URL_ENCODER.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_XML.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_XML_DECODER.toLowerCase(Locale.ROOT)));
- assertTrue(stringLookupMap.containsKey(StringLookupFactory.KEY_XML_ENCODER.toLowerCase(Locale.ROOT)));
- }
-
@Test
public void testXmlStringLookup() {
final StringLookupFactory stringLookupFactory = StringLookupFactory.INSTANCE;