(nifi) 03/05: NIFI-13223 Replaced deprecated commons-lang3 classes with commons-text versions

[exceptionfactory]

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 92ed464f5dda1ede412f144928655494032e8734
Author: dan-s1 <dsti...@gmail.com>
AuthorDate: Mon May 13 19:07:44 2024 +0000

    NIFI-13223 Replaced deprecated commons-lang3 classes with commons-text 
versions
    
    Replaced commons-lang3 CharSequenceTranslator, AggregateTranslator, 
LookupTranslator and UnicodeUnpairedSurrogateRemover with commons-text 
replacements.
    
    This closes #8824
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../nifi-framework/nifi-framework-core-api/pom.xml        |  4 ++++
 .../java/org/apache/nifi/util/CharacterFilterUtils.java   | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml 
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
index e6b8c24349..56540b7854 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
@@ -76,6 +76,10 @@ language governing permissions and limitations under the 
License. -->
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-expression-language</artifactId>
diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/util/CharacterFilterUtils.java
 
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/util/CharacterFilterUtils.java
index e363cd841f..295dd101da 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/util/CharacterFilterUtils.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/util/CharacterFilterUtils.java
@@ -17,13 +17,15 @@
 package org.apache.nifi.util;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.text.translate.AggregateTranslator;
-import org.apache.commons.lang3.text.translate.CharSequenceTranslator;
-import org.apache.commons.lang3.text.translate.LookupTranslator;
-import org.apache.commons.lang3.text.translate.UnicodeUnpairedSurrogateRemover;
+import org.apache.commons.text.translate.AggregateTranslator;
+import org.apache.commons.text.translate.CharSequenceTranslator;
+import org.apache.commons.text.translate.LookupTranslator;
+import org.apache.commons.text.translate.UnicodeUnpairedSurrogateRemover;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class CharacterFilterUtils {
 
@@ -33,9 +35,8 @@ public class CharacterFilterUtils {
             "\u0017", "\u0018", "\u0019", "\u001a", "\u001b", "\u001c", 
"\u001d", "\u001e", "\u001f", "\ufffe",
             "\uffff");
 
-    private static final String[][] INVALID_XML_CHARACTER_MAPPING = 
INVALID_XML_CHARACTERS.stream()
-            .map(invalidCharacter -> new String[] { invalidCharacter, 
StringUtils.EMPTY })
-            .toArray(String[][]::new);
+    private static final Map<CharSequence, CharSequence> 
INVALID_XML_CHARACTER_MAPPING = INVALID_XML_CHARACTERS.stream()
+            .collect(Collectors.toMap(invalidXmlCharacter -> 
invalidXmlCharacter, invalidXmlCharacter -> StringUtils.EMPTY));
 
     private static final CharSequenceTranslator INVALID_XML_CHARACTER_FILTER = 
new AggregateTranslator(
             new LookupTranslator(INVALID_XML_CHARACTER_MAPPING),