fix: synchronize with 2.x

Author: ppkarwasz

log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java

@@ -394,23 +394,4 @@ void copyAndRemoveAll_should_work() {
         actualMap = actualMap.copyAndRemoveAll(Collections.singleton("inner"));
         Assertions.assertThat(actualMap).isEqualTo(expectedMap);
     }
-
-    @Test
-    void copyAndRemoveAll_should_work() {
-
-        // Create the actual map
-        UnmodifiableArrayBackedMap actualMap = UnmodifiableArrayBackedMap.EMPTY_MAP;
-        actualMap = actualMap.copyAndPut("outer", "two");
-        actualMap = actualMap.copyAndPut("inner", "one");
-        actualMap = actualMap.copyAndPut("not-in-closeable", "true");
-
-        // Create the expected map
-        UnmodifiableArrayBackedMap expectedMap = UnmodifiableArrayBackedMap.EMPTY_MAP;
-        expectedMap = expectedMap.copyAndPut("outer", "two");
-        expectedMap = expectedMap.copyAndPut("not-in-closeable", "true");
-
-        // Remove the key and verify
-        actualMap = actualMap.copyAndRemoveAll(Collections.singleton("inner"));
-        Assertions.assertThat(actualMap).isEqualTo(expectedMap);
-    }
 }

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

@@ -19,7 +19,7 @@
  * Public Message Types used for Log4j 2. Users may implement their own Messages.
  */
 @Export
-@Version("2.24.1")
+@Version("2.24.2")
 package org.apache.logging.log4j.message;
 
 import org.osgi.annotation.bundle.Export;

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

@@ -168,7 +168,11 @@ private static MessageFactory2 adaptMessageFactory(final MessageFactory result)
      *
      * @param logger The logger to check
      * @param messageFactory The message factory to check.
+     * @deprecated As of version {@code 2.25.0}, planned to be removed!
+     * Instead, in {@link LoggerContext#getLogger(String, MessageFactory)} implementations, namespace loggers with message factories.
+     * If your implementation uses {@link LoggerRegistry}, you are already covered.
      */
+    @Deprecated
     public static void checkMessageFactory(final ExtendedLogger logger, final MessageFactory messageFactory) {
         final String name = logger.getName();
         final MessageFactory loggerMessageFactory = logger.getMessageFactory();

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

@@ -18,6 +18,7 @@
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.MessageFactory;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Anchor point for logging implementations.
@@ -55,7 +56,7 @@ default ExtendedLogger getLogger(Class<?> cls) {
      * @return The logger.
      * @since 2.14.0
      */
-    default ExtendedLogger getLogger(Class<?> cls, MessageFactory messageFactory) {
+    default ExtendedLogger getLogger(Class<?> cls, @Nullable MessageFactory messageFactory) {
         final String canonicalName = cls.getCanonicalName();
         return getLogger(canonicalName != null ? canonicalName : cls.getName(), messageFactory);
     }
@@ -74,7 +75,7 @@ default ExtendedLogger getLogger(Class<?> cls, MessageFactory messageFactory) {
      *                       the logger but will log a warning if mismatched.
      * @return The logger with the specified name.
      */
-    ExtendedLogger getLogger(String name, MessageFactory messageFactory);
+    ExtendedLogger getLogger(String name, @Nullable MessageFactory messageFactory);
 
     /**
      * Gets the LoggerRegistry.
@@ -119,7 +120,7 @@ default Object getObject(String key) {
      * @return true if the Logger exists, false otherwise.
      * @since 2.5
      */
-    boolean hasLogger(String name, MessageFactory messageFactory);
+    boolean hasLogger(String name, @Nullable MessageFactory messageFactory);
 
     /**
      * Associates an object into the LoggerContext by name for later use.

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

@@ -19,7 +19,7 @@
  * API classes.
  */
 @Export
-@Version("2.24.2")
+@Version("2.25.0")
 package org.apache.logging.log4j.spi;
 
 import org.osgi.annotation.bundle.Export;

log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java

@@ -172,7 +172,7 @@ public static int parseInt(final String s, final int defaultValue) {
     private final boolean ignoreExceptions;
     private final Layout<? extends Serializable> layout;
 
-    private ErrorHandler handler = new DefaultErrorHandler(this);
+    private volatile ErrorHandler handler = new DefaultErrorHandler(this);
 
     @Override
     public boolean requiresLocation() {
@@ -316,10 +316,6 @@ public void setHandler(final ErrorHandler handler) {
             LOGGER.error("The handler cannot be set to null");
             return;
         }
-        if (isStarted()) {
-            LOGGER.error("The handler cannot be changed once the appender is started");
-            return;
-        }
         this.handler = handler;
     }
 

log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java

@@ -100,7 +100,8 @@ public void send(final Layout<?> layout, final LogEvent event) throws IOExceptio
                     header.getName(), header.evaluate(getConfiguration().getStrSubstitutor()));
         }
         if (sslConfiguration != null) {
-            ((HttpsURLConnection) urlConnection).setSSLSocketFactory(sslConfiguration.getSslSocketFactory());
+            ((HttpsURLConnection) urlConnection)
+                    .setSSLSocketFactory(sslConfiguration.getSslContext().getSocketFactory());
         }
         if (isHttps && !verifyHostname) {
             ((HttpsURLConnection) urlConnection).setHostnameVerifier(LaxHostnameVerifier.INSTANCE);

log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java

@@ -17,9 +17,11 @@
 package org.apache.logging.log4j.core.config;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -279,9 +281,10 @@ protected void initializeWatchers(
         if (configSource != null && (configSource.getFile() != null || configSource.getURL() != null)) {
             if (monitorIntervalSeconds > 0) {
                 watchManager.setIntervalSeconds(monitorIntervalSeconds);
-                if (configSource.getFile() != null) {
-                    final Source cfgSource = new Source(configSource);
-                    final long lastModified = configSource.getFile().lastModified();
+                File file = configSource.getFile();
+                if (file != null) {
+                    final Source cfgSource = new Source(file);
+                    final long lastModified = file.lastModified();
                     final ConfigurationFileWatcher watcher =
                             new ConfigurationFileWatcher(this, reconfigurable, listeners, lastModified);
                     watchManager.watch(cfgSource, watcher);
@@ -297,8 +300,10 @@ protected void initializeWatchers(
     }
 
     private void monitorSource(final Reconfigurable reconfigurable, final ConfigurationSource configSource) {
-        if (configSource.getLastModified() > 0) {
-            final Source cfgSource = new Source(configSource);
+        URI uri = configSource.getURI();
+        if (uri != null && configSource.getLastModified() > 0) {
+            File file = configSource.getFile();
+            final Source cfgSource = file != null ? new Source(file) : new Source(uri);
             final Watcher watcher = WatcherFactory.getInstance(pluginPackages)
                     .newWatcher(cfgSource, this, reconfigurable, listeners, configSource.getLastModified());
             if (watcher != null) {

log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java

@@ -142,7 +142,7 @@ public ConfigurationSource(final InputStream stream, final URL url, final long l
      * @param stream the input stream, the caller is responsible for closing this resource.
      * @throws IOException if an exception occurred reading from the specified stream
      */
-    public ConfigurationSource(final InputStream stream) throws IOException {
+    public ConfigurationSource(InputStream stream) throws IOException {
         this(toByteArray(stream), null, 0);
     }
 
@@ -298,20 +298,21 @@ public InputStream getInputStream() {
 
     @Override
     public String toString() {
-        if (isLocation()) {
-            return getLocation();
+        if (source != null) {
+            return source.getLocation();
         }
         if (this == NULL_SOURCE) {
             return "NULL_SOURCE";
         }
+        byte[] data = this.data;
         final int length = data == null ? -1 : data.length;
         return "stream (" + length + " bytes, unknown location)";
     }
 
     /**
      * Loads the configuration from a URI.
      * @param configLocation A URI representing the location of the configuration.
-     * @return The ConfigurationSource for the configuration.
+     * @return The ConfigurationSource for the configuration or {@code null}.
      */
     public static /*@Nullable*/ ConfigurationSource fromUri(final URI configLocation) {
         final File configFile = FileUtils.fileFromUri(configLocation);

log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java

@@ -308,7 +308,8 @@ public SmtpManager createManager(final String name, final FactoryData data) {
             if (smtpProtocol.equals("smtps")) {
                 final SslConfiguration sslConfiguration = data.getSslConfiguration();
                 if (sslConfiguration != null) {
-                    final SSLSocketFactory sslSocketFactory = sslConfiguration.getSslSocketFactory();
+                    final SSLSocketFactory sslSocketFactory =
+                            sslConfiguration.getSslContext().getSocketFactory();
                     properties.put(prefix + ".ssl.socketFactory", sslSocketFactory);
                     properties.setProperty(
                             prefix + ".ssl.checkserveridentity", Boolean.toString(sslConfiguration.isVerifyHostName()));