This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ce2091db233b5323481ffb9e95d662ca07ab6d9b Author: Matt Sicker <[email protected]> AuthorDate: Sun May 22 13:44:05 2022 -0500 Extract NetUtils::toURIs method Signed-off-by: Matt Sicker <[email protected]> --- .../logging/log4j/core/config/Configurator.java | 27 ++++++---------------- .../apache/logging/log4j/core/util/NetUtils.java | 22 ++++++++++++++---- 2 files changed, 25 insertions(+), 24 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 af8a48706c..966d339180 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 @@ -16,12 +16,6 @@ */ package org.apache.logging.log4j.core.config; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,6 +27,11 @@ import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.StackLocatorUtil; import org.apache.logging.log4j.util.Strings; +import java.net.URI; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + /** * Initializes and configure the Logging system. This class provides several ways to construct a LoggerContext using * the location of a configuration file, a context name, and various optional parameters. @@ -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 4c257c826c..37b3335548 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.Inet4Address; import java.net.InetAddress; @@ -31,10 +35,6 @@ import java.util.Arrays; import java.util.Enumeration; import java.util.List; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.status.StatusLogger; -import org.apache.logging.log4j.util.Strings; - /** * Networking-related convenience methods. */ @@ -211,4 +211,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; + } + }
