From 3ca327b7c285ecb1bd07df80100af3fcb0ac106e Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 4 Feb 2024 13:57:53 -0500 Subject: [PATCH] Remove variable assignment just before returning it Use final --- .../org/apache/commons/logging/LogSource.java | 2 +- .../commons/logging/impl/SimpleLog.java | 2 +- .../commons/logging/impl/Slf4jLogFactory.java | 48 +++++++++---------- .../commons/logging/PathableClassLoader.java | 3 +- .../logging/avalon/AvalonLoggerTestCase.java | 4 +- .../security/SecurityForbiddenTestCase.java | 3 +- .../slf4j/CallerInformationTestCase.java | 2 +- .../commons/logging/tccl/BadTCCLTestCase.java | 3 +- .../logging/tccl/NullTCCLTestCase.java | 3 +- 9 files changed, 32 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/apache/commons/logging/LogSource.java b/src/main/java/org/apache/commons/logging/LogSource.java index c13511e..c594ab6 100644 --- a/src/main/java/org/apache/commons/logging/LogSource.java +++ b/src/main/java/org/apache/commons/logging/LogSource.java @@ -155,7 +155,7 @@ public class LogSource { try { Class.forName(className); return true; - } catch (Throwable e) { + } catch (final Throwable e) { return false; } } diff --git a/src/main/java/org/apache/commons/logging/impl/SimpleLog.java b/src/main/java/org/apache/commons/logging/impl/SimpleLog.java index 511956d..376c076 100644 --- a/src/main/java/org/apache/commons/logging/impl/SimpleLog.java +++ b/src/main/java/org/apache/commons/logging/impl/SimpleLog.java @@ -136,7 +136,7 @@ public class SimpleLog implements Log, Serializable { if (null != in) { simpleLogProps.load(in); } - } catch (IOException ignore) { + } catch (final IOException ignore) { // Ignore } 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 adb8f81..2a985fd 100644 --- a/src/main/java/org/apache/commons/logging/impl/Slf4jLogFactory.java +++ b/src/main/java/org/apache/commons/logging/impl/Slf4jLogFactory.java @@ -53,42 +53,42 @@ public final class Slf4jLogFactory extends LogFactory { } @Override - public void debug(Object message) { + public void debug(final Object message) { log(DEBUG_INT, message, null); } @Override - public void debug(Object message, Throwable t) { + public void debug(final Object message, final Throwable t) { log(DEBUG_INT, message, t); } @Override - public void error(Object message) { + public void error(final Object message) { log(ERROR_INT, message, null); } @Override - public void error(Object message, Throwable t) { + public void error(final Object message, final Throwable t) { log(ERROR_INT, message, t); } @Override - public void fatal(Object message) { + public void fatal(final Object message) { error(message); } @Override - public void fatal(Object message, Throwable t) { + public void fatal(final Object message, final Throwable t) { error(message, t); } @Override - public void info(Object message) { + public void info(final Object message) { log(INFO_INT, message, null); } @Override - public void info(Object message, Throwable t) { + public void info(final Object message, final Throwable t) { log(INFO_INT, message, t); } @@ -127,22 +127,22 @@ public final class Slf4jLogFactory extends LogFactory { } @Override - public void trace(Object message) { + public void trace(final Object message) { log(TRACE_INT, message, null); } @Override - public void trace(Object message, Throwable t) { + public void trace(final Object message, final Throwable t) { log(TRACE_INT, message, t); } @Override - public void warn(Object message) { + public void warn(final Object message) { log(WARN_INT, message, null); } @Override - public void warn(Object message, Throwable t) { + public void warn(final Object message, final Throwable t) { log(WARN_INT, message, t); } } @@ -155,42 +155,42 @@ public final class Slf4jLogFactory extends LogFactory { } @Override - public void debug(Object message) { + public void debug(final Object message) { logger.debug(MARKER, String.valueOf(message)); } @Override - public void debug(Object message, Throwable t) { + public void debug(final Object message, final Throwable t) { logger.debug(MARKER, String.valueOf(message), t); } @Override - public void error(Object message) { + public void error(final Object message) { logger.error(MARKER, String.valueOf(message)); } @Override - public void error(Object message, Throwable t) { + public void error(final Object message, final Throwable t) { logger.debug(MARKER, String.valueOf(message), t); } @Override - public void fatal(Object message) { + public void fatal(final Object message) { error(message); } @Override - public void fatal(Object message, Throwable t) { + public void fatal(final Object message, final Throwable t) { error(message, t); } @Override - public void info(Object message) { + public void info(final Object message) { logger.info(MARKER, String.valueOf(message)); } @Override - public void info(Object message, Throwable t) { + public void info(final Object message, final Throwable t) { logger.info(MARKER, String.valueOf(message), t); } @@ -225,22 +225,22 @@ public final class Slf4jLogFactory extends LogFactory { } @Override - public void trace(Object message) { + public void trace(final Object message) { logger.trace(MARKER, String.valueOf(message)); } @Override - public void trace(Object message, Throwable t) { + public void trace(final Object message, final Throwable t) { logger.trace(MARKER, String.valueOf(message), t); } @Override - public void warn(Object message) { + public void warn(final Object message) { logger.warn(MARKER, String.valueOf(message)); } @Override - public void warn(Object message, Throwable t) { + public void warn(final Object message, final Throwable t) { logger.warn(MARKER, String.valueOf(message), t); } } diff --git a/src/test/java/org/apache/commons/logging/PathableClassLoader.java b/src/test/java/org/apache/commons/logging/PathableClassLoader.java index 53ec0e2..8900a5d 100644 --- a/src/test/java/org/apache/commons/logging/PathableClassLoader.java +++ b/src/test/java/org/apache/commons/logging/PathableClassLoader.java @@ -317,8 +317,7 @@ public class PathableClassLoader extends URLClassLoader { final String prefix = (String) entry.getKey(); if (name.startsWith(prefix)) { final ClassLoader loader = (ClassLoader) entry.getValue(); - final Class clazz = Class.forName(name, resolve, loader); - return clazz; + return Class.forName(name, resolve, loader); } } } diff --git a/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java b/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java index 8c2fb44..9156cc4 100644 --- a/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java +++ b/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java @@ -36,8 +36,6 @@ public class AvalonLoggerTestCase extends AbstractLogTest { @Override public Log getLogObject() { - // Output does not seem to be used, so don't display it. - final Log log = new AvalonLogger(new NullLogger()); - return log; + return new AvalonLogger(new NullLogger()); } } diff --git a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java index cdf50ca..04a96c1 100644 --- a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java +++ b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java @@ -82,8 +82,7 @@ public class SecurityForbiddenTestCase extends TestCase { private Object loadClass(final String name, final ClassLoader classLoader) { try { final Class clazz = classLoader.loadClass(name); - final Object obj = clazz.getConstructor().newInstance(); - return obj; + return clazz.getConstructor().newInstance(); } catch (final Exception e) { final StringWriter sw = new StringWriter(); final PrintWriter pw = new PrintWriter(sw); diff --git a/src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java b/src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java index f4537ce..fd36345 100644 --- a/src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java +++ b/src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java @@ -60,7 +60,7 @@ public class CallerInformationTestCase extends TestCase { appender.clearAllFilters(); appender.addFilter(new Filter() { @Override - public FilterReply decide(ILoggingEvent event) { + public FilterReply decide(final ILoggingEvent event) { // Force the registration of caller data event.getCallerData(); return FilterReply.NEUTRAL; diff --git a/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java b/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java index 084a7d7..f2d8dcb 100644 --- a/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java +++ b/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java @@ -32,8 +32,7 @@ public class BadTCCLTestCase extends TestCase { public static Test suite() throws Exception { final PathableClassLoader contextClassLoader = new PathableClassLoader(null); contextClassLoader.useExplicitLoader("junit.", Test.class.getClassLoader()); - final PathableTestSuite suite = new PathableTestSuite(BadTCCLTestCase.class, contextClassLoader); - return suite; + return new PathableTestSuite(BadTCCLTestCase.class, contextClassLoader); } // test methods diff --git a/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java b/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java index 271a1f3..75ca5cf 100644 --- a/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java +++ b/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java @@ -29,8 +29,7 @@ import junit.framework.TestCase; public class NullTCCLTestCase extends TestCase { public static Test suite() throws Exception { - final PathableTestSuite suite = new PathableTestSuite(NullTCCLTestCase.class, null); - return suite; + return new PathableTestSuite(NullTCCLTestCase.class, null); } // test methods