This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 9f88fe588424a95b8add17cc844157f0b7c37f50 Author: Matt Sicker <[email protected]> AuthorDate: Sun Oct 1 14:29:02 2023 -0500 Clean up more warnings Signed-off-by: Matt Sicker <[email protected]> --- .../apache/logging/log4j/core/config/AppenderControl.java | 2 +- .../logging/log4j/core/config/ConfigurationSource.java | 14 +++----------- .../logging/log4j/core/config/CronScheduledFuture.java | 10 +++++----- .../logging/log4j/core/config/DefaultAdvertiser.java | 2 +- .../logging/log4j/core/net/UrlConnectionFactory.java | 4 ++-- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java index ccf85f291a..8a2b27eb8a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java @@ -119,7 +119,7 @@ public class AppenderControl extends AbstractFilterable { recursive.set(this); callAppender0(event); } finally { - recursive.set(null); + recursive.remove(); } } diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java index 409faaae50..73ee81c508 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java @@ -177,15 +177,15 @@ public class ConfigurationSource { } private boolean isFile() { - return source == null ? false : source.getFile() != null; + return source != null && source.getFile() != null; } private boolean isURL() { - return source == null ? false : source.getURI() != null; + return source != null && source.getURI() != null; } private boolean isLocation() { - return source == null ? false : source.getLocation() != null; + return source != null && source.getLocation() != null; } /** @@ -198,14 +198,6 @@ public class ConfigurationSource { return source == null ? null : source.getURL(); } - /** - * @deprecated Not used internally, no replacement. TODO remove and make source final. - */ - @Deprecated - public void setSource(final Source source) { - this.source = source; - } - public void setData(final byte[] data) { this.data = data; } diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java index 63f060be64..a48b3fa7a8 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java @@ -23,6 +23,8 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.apache.logging.log4j.util.Cast; + /** * */ @@ -68,19 +70,17 @@ public class CronScheduledFuture<V> implements ScheduledFuture<V> { } @Override - @SuppressWarnings("unchecked") public V get() throws InterruptedException, ExecutionException { - return (V) futureData.scheduledFuture.get(); + return Cast.cast(futureData.scheduledFuture.get()); } @Override - @SuppressWarnings("unchecked") public V get(final long timeout, final TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { - return (V) futureData.scheduledFuture.get(timeout, unit); + return Cast.cast(futureData.scheduledFuture.get(timeout, unit)); } - private class FutureData { + private static class FutureData { private final ScheduledFuture<?> scheduledFuture; private final Date runDate; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java index 94951c2338..21e6ec99fb 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java @@ -41,7 +41,7 @@ public class DefaultAdvertiser implements Advertiser { /** * Does nothing. - * @param advertisedObject + * @param advertisedObject ignored */ @Override public void unadvertise(final Object advertisedObject) { diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/UrlConnectionFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/UrlConnectionFactory.java index c37315e784..79e3f5c00a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/UrlConnectionFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/UrlConnectionFactory.java @@ -32,6 +32,7 @@ import org.apache.logging.log4j.core.net.ssl.LaxHostnameVerifier; import org.apache.logging.log4j.core.net.ssl.SslConfiguration; import org.apache.logging.log4j.core.net.ssl.SslConfigurationFactory; import org.apache.logging.log4j.core.util.AuthorizationProvider; +import org.apache.logging.log4j.util.Cast; import org.apache.logging.log4j.util.PropertiesUtil; import org.apache.logging.log4j.util.PropertyEnvironment; import org.apache.logging.log4j.util.Strings; @@ -57,7 +58,6 @@ public class UrlConnectionFactory { private static final String NO_PROTOCOLS = "_none"; public static final String ALLOWED_PROTOCOLS = "log4j2.Configuration.allowedProtocols"; - @SuppressWarnings("unchecked") public static <T extends URLConnection> T createConnection(final URL url, final long lastModifiedMillis, final SslConfiguration sslConfiguration, final AuthorizationProvider authorizationProvider) throws IOException { @@ -110,7 +110,7 @@ public class UrlConnectionFactory { } else { urlConnection = url.openConnection(); } - return (T) urlConnection; + return Cast.cast(urlConnection); } public static URLConnection createConnection(final URL url) throws IOException {
