Use java.text.Normalizer directly into Jasypt substitutions instead o…

…f using reflection (#181)
quarkiverse · Oct 24, 2023 · 03d8e55 · 03d8e55
1 parent 7e1c0ef
commit 03d8e55
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/jasypt/runtime/src/main/java/io/quarkus/config/jasypt/runtime/JasyptSubstitutions.java b/jasypt/runtime/src/main/java/io/quarkus/config/jasypt/runtime/JasyptSubstitutions.java
@@ -19,18 +19,16 @@
 public class JasyptSubstitutions {
     @TargetClass(Normalizer.class)
     static final class Target_Normalizer {
-        @Alias
-        @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
-        private static Boolean useIcuNormalizer;
-
-        @Substitute
-        static void initializeIcu4j() throws ClassNotFoundException {
-            useIcuNormalizer = Boolean.FALSE;
-        }
-
         @Substitute
-        static char[] normalizeWithIcu4j(final char[] message) {
-            throw new UnsupportedOperationException();
+        public static char[] normalizeToNfc(final char[] message) {
+            final String messageStr = new String(message);
+            final String result;
+            try {
+                result = java.text.Normalizer.normalize(messageStr, java.text.Normalizer.Form.NFC);
+            } catch (final Exception e) {
+                throw new EncryptionInitializationException("Could not perform a valid UNICODE normalization", e);
+            }
+            return result.toCharArray();
         }
     }