Have org.apache.logging.log4j.util.Base64Util invoke java.util.Base64 directly instead of reflectively (#3686)

Jan Luehe · Jan Luehe · commit 2c24be2e829f · 2025-05-24T11:29:13.000+02:00
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Base64Util.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Base64Util.java
@@ -27,7 +27,7 @@
  */
 public final class Base64Util {
 
-    private static final Base64.Encoder encoder = Base64.getEncoder();
+    private static final Base64.Encoder ENCODER = Base64.getEncoder();
 
     private Base64Util() {}
 
@@ -37,6 +37,6 @@ private Base64Util() {}
      */
     @Deprecated
     public static String encode(final String str) {
-        return str != null ? encoder.encodeToString(str.getBytes(Charset.defaultCharset())) : null;
+        return str != null ? ENCODER.encodeToString(str.getBytes(Charset.defaultCharset())) : null;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*/`
`28`	`28`	`public final class Base64Util {`
`29`	`29`
`30`		`- private static final Base64.Encoder encoder = Base64.getEncoder();`
	`30`	`+ private static final Base64.Encoder ENCODER = Base64.getEncoder();`
`31`	`31`
`32`	`32`	`private Base64Util() {}`
`33`	`33`
`@@ -37,6 +37,6 @@ private Base64Util() {}`
`37`	`37`	`*/`
`38`	`38`	`@Deprecated`
`39`	`39`	`public static String encode(final String str) {`
`40`		`- return str != null ? encoder.encodeToString(str.getBytes(Charset.defaultCharset())) : null;`
	`40`	`+ return str != null ? ENCODER.encodeToString(str.getBytes(Charset.defaultCharset())) : null;`
`41`	`41`	`}`
`42`	`42`	`}`