Revert "Single constructor for ConfigurationSource"

This reverts commit 35973f7.

Author: ppkarwasz

log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/WatchManagerTest.java

@@ -36,6 +36,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.core.config.ConfigurationScheduler;
+import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -143,10 +144,9 @@ void testWatchManagerResetFile() throws Exception {
      */
     @Test
     void testWatchManagerCallsWatcher() {
-        Source source = mock(Source.class);
         Watcher watcher = mock(Watcher.class);
         when(watcher.isModified()).thenReturn(false);
-        watchManager.watch(source, watcher);
+        watchManager.watch(new Source(ConfigurationSource.NULL_SOURCE), watcher);
         verify(watcher, timeout(2000)).isModified();
         verify(watcher, never()).modified();
         when(watcher.isModified()).thenReturn(true);

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

@@ -17,12 +17,10 @@
 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.io.Serializable;
 import java.lang.ref.WeakReference;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -281,10 +279,9 @@ protected void initializeWatchers(
         if (configSource != null && (configSource.getFile() != null || configSource.getURL() != null)) {
             if (monitorIntervalSeconds > 0) {
                 watchManager.setIntervalSeconds(monitorIntervalSeconds);
-                File file = configSource.getFile();
-                if (file != null) {
-                    final Source cfgSource = new Source(file);
-                    final long lastModified = file.lastModified();
+                if (configSource.getFile() != null) {
+                    final Source cfgSource = new Source(configSource);
+                    final long lastModified = configSource.getFile().lastModified();
                     final ConfigurationFileWatcher watcher =
                             new ConfigurationFileWatcher(this, reconfigurable, listeners, lastModified);
                     watchManager.watch(cfgSource, watcher);
@@ -300,10 +297,8 @@ protected void initializeWatchers(
     }
 
     private void monitorSource(final Reconfigurable reconfigurable, final ConfigurationSource 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);
+        if (configSource.getLastModified() > 0) {
+            final Source cfgSource = new Source(configSource);
             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

@@ -16,8 +16,6 @@
  */
 package org.apache.logging.log4j.core.config;
 
-import static java.util.Objects.requireNonNull;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -34,6 +32,7 @@
 import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Objects;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.net.UrlConnectionFactory;
 import org.apache.logging.log4j.core.util.FileUtils;
@@ -78,7 +77,16 @@ public class ConfigurationSource {
      * @param file the file where the input stream originated
      */
     public ConfigurationSource(final InputStream stream, final File file) {
-        this(null, new Source(file), stream, getLastModified(file.toPath()));
+        this.stream = Objects.requireNonNull(stream, "stream is null");
+        this.data = null;
+        this.source = new Source(file);
+        long modified = 0;
+        try {
+            modified = file.lastModified();
+        } catch (Exception ex) {
+            // There is a problem with the file. It will be handled somewhere else.
+        }
+        this.currentLastModified = this.initialLastModified = modified;
     }
 
     /**
@@ -89,16 +97,16 @@ public ConfigurationSource(final InputStream stream, final File file) {
      * @param path the path where the input stream originated.
      */
     public ConfigurationSource(final InputStream stream, final Path path) {
-        this(null, new Source(path), stream, getLastModified(path));
-    }
-
-    private static long getLastModified(Path path) {
+        this.stream = Objects.requireNonNull(stream, "stream is null");
+        this.data = null;
+        this.source = new Source(path);
+        long modified = 0;
         try {
-            return Files.getLastModifiedTime(path).toMillis();
-        } catch (Exception ignored) {
+            modified = Files.getLastModifiedTime(path).toMillis();
+        } catch (Exception ex) {
             // There is a problem with the file. It will be handled somewhere else.
         }
-        return 0L;
+        this.currentLastModified = this.initialLastModified = modified;
     }
 
     /**
@@ -120,8 +128,11 @@ public ConfigurationSource(final InputStream stream, final URL url) {
      * @param url the URL where the input stream originated
      * @param lastModified when the source was last modified.
      */
-    public ConfigurationSource(InputStream stream, final URL url, final long lastModified) {
-        this(null, new Source(url), stream, lastModified);
+    public ConfigurationSource(final InputStream stream, final URL url, final long lastModified) {
+        this.stream = Objects.requireNonNull(stream, "stream is null");
+        this.data = null;
+        this.currentLastModified = this.initialLastModified = lastModified;
+        this.source = new Source(url);
     }
 
     /**
@@ -131,7 +142,7 @@ public ConfigurationSource(InputStream stream, final URL url, final long lastMod
      * @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(InputStream stream) throws IOException {
+    public ConfigurationSource(final InputStream stream) throws IOException {
         this(toByteArray(stream), null, 0);
     }
 
@@ -142,26 +153,19 @@ public ConfigurationSource(InputStream stream) throws IOException {
      * @param data data from the source
      * @param lastModified when the source was last modified.
      */
-    public ConfigurationSource(Source source, byte[] data, long lastModified) {
-        this(data, requireNonNull(source, "source is null"), lastModified);
-    }
-
-    private ConfigurationSource(byte[] data, /*@Nullable*/ Source source, long lastModified) {
-        this(requireNonNull(data, "data is null"), source, new ByteArrayInputStream(data), lastModified);
+    public ConfigurationSource(final Source source, final byte[] data, final long lastModified) {
+        Objects.requireNonNull(source, "source is null");
+        this.data = Objects.requireNonNull(data, "data is null");
+        this.stream = new ByteArrayInputStream(data);
+        this.currentLastModified = this.initialLastModified = lastModified;
+        this.source = source;
     }
 
-    /**
-     * @throws NullPointerException if both {@code stream} and {@code data} are {@code null}.
-     */
-    private ConfigurationSource(
-            byte /*@Nullable*/[] data, /*@Nullable*/ Source source, InputStream stream, long lastModified) {
-        if (data == null && source == null) {
-            throw new NullPointerException("both `data` and `source` are null");
-        }
-        this.stream = stream;
-        this.data = data;
-        this.source = source;
+    private ConfigurationSource(final byte[] data, final URL url, final long lastModified) {
+        this.data = Objects.requireNonNull(data, "data is null");
+        this.stream = new ByteArrayInputStream(data);
         this.currentLastModified = this.initialLastModified = lastModified;
+        this.source = url == null ? null : new Source(url);
     }
 
     /**
@@ -194,6 +198,10 @@ private static byte[] toByteArray(final InputStream inputStream) throws IOExcept
         return source == null ? null : source.getFile();
     }
 
+    private boolean isLocation() {
+        return source != null && source.getLocation() != null;
+    }
+
     /**
      * Returns the configuration source URL, or {@code null} if this configuration source is based on a file or has
      * neither a file nor an URL.
@@ -279,32 +287,31 @@ public InputStream getInputStream() {
         URL url = getURL();
         if (url != null && data != null) {
             // Creates a ConfigurationSource without accessing the URL since the data was provided.
-            return new ConfigurationSource(data, new Source(url), currentLastModified);
+            return new ConfigurationSource(data, url, currentLastModified);
         }
         URI uri = getURI();
         if (uri != null) {
             return fromUri(uri);
         }
-        return data == null ? null : new ConfigurationSource(data, null, currentLastModified);
+        return data != null ? new ConfigurationSource(data, null, currentLastModified) : null;
     }
 
     @Override
     public String toString() {
-        if (source != null) {
-            return source.getLocation();
+        if (isLocation()) {
+            return 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 or {@code null}.
+     * @return The ConfigurationSource for the configuration.
      */
     public static /*@Nullable*/ ConfigurationSource fromUri(final URI configLocation) {
         final File configFile = FileUtils.fileFromUri(configLocation);

log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java

@@ -23,7 +23,6 @@
 import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.util.LoaderUtil;
 import org.apache.logging.log4j.util.PropertiesUtil;
-import org.jspecify.annotations.Nullable;
 
 /**
  * Load resources (or images) from various sources.
@@ -85,9 +84,9 @@ public static ClassLoader getClassLoader(final Class<?> class1, final Class<?> c
      * </ol>
      * @param resource The resource to load.
      * @param defaultLoader The default ClassLoader.
-     * @return A URL to the resource or {@code null}.
+     * @return A URL to the resource.
      */
-    public static @Nullable URL getResource(final String resource, final ClassLoader defaultLoader) {
+    public static URL getResource(final String resource, final ClassLoader defaultLoader) {
         try {
             ClassLoader classLoader = getThreadContextClassLoader();
             if (classLoader != null) {