From 2039eeba6f6b6a165e5570f8a054bd2f7a647ff8 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 19 Nov 2023 16:33:27 -0500 Subject: [PATCH] Fix compiler warnings --- .../org/apache/commons/logging/LogSource.java | 2 +- .../logging/impl/Log4jApiLogFactory.java | 2 +- .../commons/logging/impl/LogFactoryImpl.java | 2 +- .../commons/logging/impl/Slf4jLogFactory.java | 2 +- .../logging/tccl/custom/MyLogFactoryImpl.java | 34 ++++++++++++++----- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/logging/LogSource.java b/src/main/java/org/apache/commons/logging/LogSource.java index 68f908c..5a02c34 100644 --- a/src/main/java/org/apache/commons/logging/LogSource.java +++ b/src/main/java/org/apache/commons/logging/LogSource.java @@ -136,7 +136,7 @@ public class LogSource { * @param clazz a Class. * @return a {@code Log} instance. */ - static public Log getInstance(final Class clazz) { + static public Log getInstance(final Class clazz) { return getInstance(clazz.getName()); } diff --git a/src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java b/src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java index 934e2c2..5400219 100644 --- a/src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java +++ b/src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java @@ -194,7 +194,7 @@ public final class Log4jApiLogFactory extends LogFactory { } @Override - public Log getInstance(final Class clazz) { + public Log getInstance(final Class clazz) { return getInstance(clazz.getName()); } diff --git a/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java index a03717b..1d2fc56 100644 --- a/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java +++ b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java @@ -823,7 +823,7 @@ public class LogFactoryImpl extends LogFactory { * instance cannot be returned */ @Override - public Log getInstance(final Class clazz) throws LogConfigurationException { + public Log getInstance(final Class clazz) throws LogConfigurationException { return getInstance(clazz.getName()); } diff --git a/src/main/java/org/apache/commons/logging/impl/Slf4jLogFactory.java b/src/main/java/org/apache/commons/logging/impl/Slf4jLogFactory.java index f7f2c8c..f80ba31 100644 --- a/src/main/java/org/apache/commons/logging/impl/Slf4jLogFactory.java +++ b/src/main/java/org/apache/commons/logging/impl/Slf4jLogFactory.java @@ -278,7 +278,7 @@ public final class Slf4jLogFactory extends LogFactory { } @Override - public Log getInstance(final Class clazz) throws LogConfigurationException { + public Log getInstance(final Class clazz) throws LogConfigurationException { return getInstance(clazz.getName()); } diff --git a/src/test/java/org/apache/commons/logging/tccl/custom/MyLogFactoryImpl.java b/src/test/java/org/apache/commons/logging/tccl/custom/MyLogFactoryImpl.java index 64e28bc..55ac04a 100644 --- a/src/test/java/org/apache/commons/logging/tccl/custom/MyLogFactoryImpl.java +++ b/src/test/java/org/apache/commons/logging/tccl/custom/MyLogFactoryImpl.java @@ -17,23 +17,41 @@ package org.apache.commons.logging.tccl.custom; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; public class MyLogFactoryImpl extends LogFactory { + @Override - public Object getAttribute(final String name) { return null; } + public Object getAttribute(final String name) { + return null; + } + @Override - public String[] getAttributeNames() { return null; } + public String[] getAttributeNames() { + return null; + } + @Override - public Log getInstance(final Class clazz) { return null; } + public Log getInstance(final Class clazz) { + return null; + } + @Override - public Log getInstance(final String name) { return null; } + public Log getInstance(final String name) { + return null; + } + @Override - public void release() {} + public void release() { + } + @Override - public void removeAttribute(final String name) {} + public void removeAttribute(final String name) { + } + @Override - public void setAttribute(final String name, final Object value) {} + public void setAttribute(final String name, final Object value) { + } + }