Fix code review problems #1961

Author: ppkarwasz

log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java

@@ -252,6 +252,7 @@ public StructuredDataId makeId(final String defaultId, final String anEnterprise
      * @deprecated Use {@link StructuredDataId#makeId(String, String)} instead
      */
     @Deprecated
+    @InlineMe(replacement = "this.makeId(defaultId, String.valueOf(anEnterpriseNumber))")
     public StructuredDataId makeId(final String defaultId, final int anEnterpriseNumber) {
         return makeId(defaultId, String.valueOf(anEnterpriseNumber));
     }

log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMapFactory.java

@@ -53,6 +53,10 @@ public final class ThreadContextMapFactory {
 
     private static boolean GcFreeThreadContextKey;
     private static String ThreadContextMapName;
+    private static final String GARBAGE_FREE_CONTEXT_MAP = "org.apache.logging.log4j.spi" +
+            ".GarbageFreeSortedArrayThreadContextMap";
+    private static final String COPY_ON_WRITE_CONTEXT_MAP = "org.apache.logging.log4j.spi" +
+            ".CopyOnWriteSortedArrayThreadContextMap";
 
     static {
         initPrivate();
@@ -86,15 +90,25 @@ public static ThreadContextMap createThreadContextMap() {
         final ClassLoader cl = ProviderUtil.findClassLoader();
         ThreadContextMap result = null;
         if (ThreadContextMapName != null) {
-            try {
-                final Class<?> clazz = cl.loadClass(ThreadContextMapName);
-                if (ThreadContextMap.class.isAssignableFrom(clazz)) {
-                    result = (ThreadContextMap) clazz.getDeclaredConstructor().newInstance();
-                }
-            } catch (final ClassNotFoundException cnfe) {
-                LOGGER.error("Unable to locate configured ThreadContextMap {}", ThreadContextMapName);
-            } catch (final Exception ex) {
-                LOGGER.error("Unable to create configured ThreadContextMap {}", ThreadContextMapName, ex);
+            /*
+             * Two implementation are package-private classes, so we instantiate them directly.
+             * Other implementation must be publicly accessible (through `LoaderUtil`).
+             */
+            switch (ThreadContextMapName) {
+                case GARBAGE_FREE_CONTEXT_MAP:
+                    result = new GarbageFreeSortedArrayThreadContextMap();
+                    break;
+                case COPY_ON_WRITE_CONTEXT_MAP:
+                    result = new CopyOnWriteSortedArrayThreadContextMap();
+                    break;
+                default:
+                    try {
+                        result = LoaderUtil.newCheckedInstanceOf(ThreadContextMapName, ThreadContextMap.class);
+                    } catch (final ClassNotFoundException cnfe) {
+                        LOGGER.error("Unable to locate configured ThreadContextMap {}", ThreadContextMapName);
+                    } catch (final Exception ex) {
+                        LOGGER.error("Unable to create configured ThreadContextMap {}", ThreadContextMapName, ex);
+                    }
             }
         }
         if (result == null && ProviderUtil.hasProviders() && LogManager.getFactory() != null) { //LOG4J2-1658

log4j-api/src/main/java/org/apache/logging/log4j/util/Base64Util.java

@@ -50,6 +50,10 @@ public final class Base64Util {
     private Base64Util() {
     }
 
+    /**
+     * This method does not specify an encoding for the {@code str} parameter and should not be used.
+     */
+    @Deprecated
     public static String encode(final String str) {
         if (str == null) {
             return null;

log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java

@@ -107,7 +107,8 @@ private static int getMajorVersion() {
     }
 
     static int getMajorVersion(final String version) {
-        final String[] parts = version.split("-|\\.", -1);
+        // Split into `major.minor.rest`
+        final String[] parts = version.split("-|\\.", 3);
         boolean isJEP223;
         try {
             final int token = Integer.parseInt(parts[0]);

log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java

@@ -39,8 +39,8 @@ public static String getProcessId() {
 
             final Object runtimeMXBean = getRuntimeMXBean.invoke(null);
             final String name = (String) getName.invoke(runtimeMXBean);
-            //String name = ManagementFactory.getRuntimeMXBean().getName(); //JMX not allowed on Android
-            return name.split("@", -1)[0]; // likely works on most platforms
+            // Split into first@rest
+            return name.split("@", 2)[0]; // likely works on most platforms
         } catch (final Exception ex) {
             try {
                 return new File("/proc/self").getCanonicalFile().getName(); // try a Linux-specific way