Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use java.text.Normalizer directly into Jasypt substitutions instead of using reflection #181

Merged
merged 1 commit into from
Oct 24, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand Down
Loading