[logging-log4j2] branch release-2.x updated: Extract NetUtils::toURIs method

[pkarwasz]

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new cb68c6f8be Extract NetUtils::toURIs method
cb68c6f8be is described below

commit cb68c6f8be2fc144020a7c5269f8ba1a67d73c74
Author: Matt Sicker <mattsic...@apache.org>
AuthorDate: Sun May 22 13:44:05 2022 -0500

    Extract NetUtils::toURIs method
    
    Signed-off-by: Matt Sicker <mattsic...@apache.org>
---
 .../logging/log4j/core/config/Configurator.java     | 17 ++---------------
 .../apache/logging/log4j/core/util/NetUtils.java    | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
index 563b0f2d43..7c5ba49996 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
@@ -28,7 +28,6 @@ import org.apache.logging.log4j.util.StackLocatorUtil;
 import org.apache.logging.log4j.util.Strings;
 
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -116,20 +115,8 @@ public final class Configurator {
         if (Strings.isBlank(configLocation)) {
             return initialize(name, loader, (URI) null, externalContext);
         }
-        if (configLocation.contains(",")) {
-            final String[] parts = configLocation.split(",");
-            String scheme = null;
-            final List<URI> uris = new ArrayList<>(parts.length);
-            for (final String part : parts) {
-                final URI uri = NetUtils.toURI(scheme != null ? scheme + ":" + 
part.trim() : part.trim());
-                if (scheme == null && uri.getScheme() != null) {
-                    scheme = uri.getScheme();
-                }
-                uris.add(uri);
-            }
-            return initialize(name, loader, uris, externalContext);
-        }
-        return initialize(name, loader, NetUtils.toURI(configLocation), 
externalContext);
+        return configLocation.contains(",") ? initialize(name, loader, 
NetUtils.toURIs(configLocation), externalContext) :
+                initialize(name, loader, NetUtils.toURI(configLocation), 
externalContext);
     }
 
     /**
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java
index 8a8353e7f9..54e788b719 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java
@@ -16,6 +16,10 @@
  */
 package org.apache.logging.log4j.core.util;
 
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.util.Strings;
+
 import java.io.File;
 import java.net.InetAddress;
 import java.net.MalformedURLException;
@@ -28,9 +32,6 @@ import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Enumeration;
 
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.status.StatusLogger;
-
 /**
  * Networking-related convenience methods.
  */
@@ -163,4 +164,18 @@ public final class NetUtils {
         }
     }
 
+    public static List<URI> toURIs(final String path) {
+        final String[] parts = path.split(",");
+        String scheme = null;
+        final List<URI> uris = new ArrayList<>(parts.length);
+        for (final String part : parts) {
+            final URI uri = NetUtils.toURI(scheme != null ? scheme + ":" + 
part.trim() : part.trim());
+            if (scheme == null && uri.getScheme() != null) {
+                scheme = uri.getScheme();
+            }
+            uris.add(uri);
+        }
+        return uris;
+    }
+
 }