Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Remove variable assignment just before returning it

Browse Source 
Use final
This commit is contained in:
Gary Gregory
2024-02-04 13:57:53 -05:00
parent 98f576cd33
commit 3ca327b7c2
9 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/logging/LogSource.java
View File

@@ -155,7 +155,7 @@ public class LogSource {
try { try {
Class.forName(className); Class.forName(className);
return true; return true;
} catch (Throwable e) { } catch (final Throwable e) {
return false; return false;
} }
} }

2
src/main/java/org/apache/commons/logging/impl/SimpleLog.java
View File

@@ -136,7 +136,7 @@ public class SimpleLog implements Log, Serializable {
if (null != in) { if (null != in) {
simpleLogProps.load(in); simpleLogProps.load(in);
} }
} catch (IOException ignore) { } catch (final IOException ignore) {
// Ignore // Ignore
} }

48
src/main/java/org/apache/commons/logging/impl/Slf4jLogFactory.java
View File

@@ -53,42 +53,42 @@ public final class Slf4jLogFactory extends LogFactory {
} }
@Override @Override
public void debug(Object message) { public void debug(final Object message) {
log(DEBUG_INT, message, null); log(DEBUG_INT, message, null);
} }
@Override @Override
public void debug(Object message, Throwable t) { public void debug(final Object message, final Throwable t) {
log(DEBUG_INT, message, t); log(DEBUG_INT, message, t);
} }
@Override @Override
public void error(Object message) { public void error(final Object message) {
log(ERROR_INT, message, null); log(ERROR_INT, message, null);
} }
@Override @Override
public void error(Object message, Throwable t) { public void error(final Object message, final Throwable t) {
log(ERROR_INT, message, t); log(ERROR_INT, message, t);
} }
@Override @Override
public void fatal(Object message) { public void fatal(final Object message) {
error(message); error(message);
} }
@Override @Override
public void fatal(Object message, Throwable t) { public void fatal(final Object message, final Throwable t) {
error(message, t); error(message, t);
} }
@Override @Override
public void info(Object message) { public void info(final Object message) {
log(INFO_INT, message, null); log(INFO_INT, message, null);
} }
@Override @Override
public void info(Object message, Throwable t) { public void info(final Object message, final Throwable t) {
log(INFO_INT, message, t); log(INFO_INT, message, t);
} }
@@ -127,22 +127,22 @@ public final class Slf4jLogFactory extends LogFactory {
} }
@Override @Override
public void trace(Object message) { public void trace(final Object message) {
log(TRACE_INT, message, null); log(TRACE_INT, message, null);
} }
@Override @Override
public void trace(Object message, Throwable t) { public void trace(final Object message, final Throwable t) {
log(TRACE_INT, message, t); log(TRACE_INT, message, t);
} }
@Override @Override
public void warn(Object message) { public void warn(final Object message) {
log(WARN_INT, message, null); log(WARN_INT, message, null);
} }
@Override @Override
public void warn(Object message, Throwable t) { public void warn(final Object message, final Throwable t) {
log(WARN_INT, message, t); log(WARN_INT, message, t);
} }
} }
@@ -155,42 +155,42 @@ public final class Slf4jLogFactory extends LogFactory {
} }
@Override @Override
public void debug(Object message) { public void debug(final Object message) {
logger.debug(MARKER, String.valueOf(message)); logger.debug(MARKER, String.valueOf(message));
} }
@Override @Override
public void debug(Object message, Throwable t) { public void debug(final Object message, final Throwable t) {
logger.debug(MARKER, String.valueOf(message), t); logger.debug(MARKER, String.valueOf(message), t);
} }
@Override @Override
public void error(Object message) { public void error(final Object message) {
logger.error(MARKER, String.valueOf(message)); logger.error(MARKER, String.valueOf(message));
} }
@Override @Override
public void error(Object message, Throwable t) { public void error(final Object message, final Throwable t) {
logger.debug(MARKER, String.valueOf(message), t); logger.debug(MARKER, String.valueOf(message), t);
} }
@Override @Override
public void fatal(Object message) { public void fatal(final Object message) {
error(message); error(message);
} }
@Override @Override
public void fatal(Object message, Throwable t) { public void fatal(final Object message, final Throwable t) {
error(message, t); error(message, t);
} }
@Override @Override
public void info(Object message) { public void info(final Object message) {
logger.info(MARKER, String.valueOf(message)); logger.info(MARKER, String.valueOf(message));
} }
@Override @Override
public void info(Object message, Throwable t) { public void info(final Object message, final Throwable t) {
logger.info(MARKER, String.valueOf(message), t); logger.info(MARKER, String.valueOf(message), t);
} }
@@ -225,22 +225,22 @@ public final class Slf4jLogFactory extends LogFactory {
} }
@Override @Override
public void trace(Object message) { public void trace(final Object message) {
logger.trace(MARKER, String.valueOf(message)); logger.trace(MARKER, String.valueOf(message));
} }
@Override @Override
public void trace(Object message, Throwable t) { public void trace(final Object message, final Throwable t) {
logger.trace(MARKER, String.valueOf(message), t); logger.trace(MARKER, String.valueOf(message), t);
} }
@Override @Override
public void warn(Object message) { public void warn(final Object message) {
logger.warn(MARKER, String.valueOf(message)); logger.warn(MARKER, String.valueOf(message));
} }
@Override @Override
public void warn(Object message, Throwable t) { public void warn(final Object message, final Throwable t) {
logger.warn(MARKER, String.valueOf(message), t); logger.warn(MARKER, String.valueOf(message), t);
} }
} }

3
src/test/java/org/apache/commons/logging/PathableClassLoader.java
View File

@@ -317,8 +317,7 @@ public class PathableClassLoader extends URLClassLoader {
final String prefix = (String) entry.getKey(); final String prefix = (String) entry.getKey();
if (name.startsWith(prefix)) { if (name.startsWith(prefix)) {
final ClassLoader loader = (ClassLoader) entry.getValue(); final ClassLoader loader = (ClassLoader) entry.getValue();
final Class clazz = Class.forName(name, resolve, loader); return Class.forName(name, resolve, loader);
return clazz;
} }
} }
} }

4
src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
View File

@@ -36,8 +36,6 @@ public class AvalonLoggerTestCase extends AbstractLogTest {
@Override @Override
public Log getLogObject() { public Log getLogObject() {
// Output does not seem to be used, so don't display it. return new AvalonLogger(new NullLogger());
final Log log = new AvalonLogger(new NullLogger());
return log;
} }
} }

3
src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
View File

@@ -82,8 +82,7 @@ public class SecurityForbiddenTestCase extends TestCase {
private Object loadClass(final String name, final ClassLoader classLoader) { private Object loadClass(final String name, final ClassLoader classLoader) {
try { try {
final Class clazz = classLoader.loadClass(name); final Class clazz = classLoader.loadClass(name);
final Object obj = clazz.getConstructor().newInstance(); return clazz.getConstructor().newInstance();
return obj;
} catch (final Exception e) { } catch (final Exception e) {
final StringWriter sw = new StringWriter(); final StringWriter sw = new StringWriter();
final PrintWriter pw = new PrintWriter(sw); final PrintWriter pw = new PrintWriter(sw);

2
src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java
View File

@@ -60,7 +60,7 @@ public class CallerInformationTestCase extends TestCase {
appender.clearAllFilters(); appender.clearAllFilters();
appender.addFilter(new Filter<ILoggingEvent>() { appender.addFilter(new Filter<ILoggingEvent>() {
@Override @Override
public FilterReply decide(ILoggingEvent event) { public FilterReply decide(final ILoggingEvent event) {
// Force the registration of caller data // Force the registration of caller data
event.getCallerData(); event.getCallerData();
return FilterReply.NEUTRAL; return FilterReply.NEUTRAL;

3
src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java
View File

@@ -32,8 +32,7 @@ public class BadTCCLTestCase extends TestCase {
public static Test suite() throws Exception { public static Test suite() throws Exception {
final PathableClassLoader contextClassLoader = new PathableClassLoader(null); final PathableClassLoader contextClassLoader = new PathableClassLoader(null);
contextClassLoader.useExplicitLoader("junit.", Test.class.getClassLoader()); contextClassLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
final PathableTestSuite suite = new PathableTestSuite(BadTCCLTestCase.class, contextClassLoader); return new PathableTestSuite(BadTCCLTestCase.class, contextClassLoader);
return suite;
} }
// test methods // test methods

3
src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java
View File

@@ -29,8 +29,7 @@ import junit.framework.TestCase;
public class NullTCCLTestCase extends TestCase { public class NullTCCLTestCase extends TestCase {
public static Test suite() throws Exception { public static Test suite() throws Exception {
final PathableTestSuite suite = new PathableTestSuite(NullTCCLTestCase.class, null); return new PathableTestSuite(NullTCCLTestCase.class, null);
return suite;
} }
// test methods // test methods