[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.0-38-gcc3ed1a
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via cc3ed1a36afc3070ac23c57ad02b3ddbb4dc8cd3 (commit) via 90ae7a93d0aa60b87f3926022ae7fd52608c7e2c (commit) via f0d6bc500761b104b9f947cafa2d5b3753ae5639 (commit) via 6c0b65493bdd41513a6f8be58f0bbf313725de8d (commit) via 7f28864991abd0643640bf5664ec7df08293e2ca (commit) via 7fba75491fc15a3424062d5228126312258f070f (commit) via 8cd1a0ef2bcfd92ea2fbdd678d15323fed614f3a (commit) from 58de50e302d443c0d9d0d9a8e2fbcadba14f5391 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=cc3ed1a36afc3070ac23c57ad... http://github.com/ceki/logback/commit/cc3ed1a36afc3070ac23c57ad02b3ddbb4dc8c... commit cc3ed1a36afc3070ac23c57ad02b3ddbb4dc8cd3 Merge: 58de50e 90ae7a9 Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Nov 8 13:43:01 2011 +0100 Merge branch 'master' of github.com:ceki/logback http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=90ae7a93d0aa60b87f3926022... http://github.com/ceki/logback/commit/90ae7a93d0aa60b87f3926022ae7fd52608c7e... commit 90ae7a93d0aa60b87f3926022ae7fd52608c7e2c Merge: f0d6bc5 8cd1a0e Author: Jörn Huxhorn <jhuxhorn@googlemail.com> Date: Tue Nov 8 02:11:20 2011 -0800 Merge pull request #28 from nurkiewicz/LBCLASSIC-217-fix Correct 0.9.30 version in @since tag http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=f0d6bc500761b104b9f947caf... http://github.com/ceki/logback/commit/f0d6bc500761b104b9f947cafa2d5b3753ae56... commit f0d6bc500761b104b9f947cafa2d5b3753ae5639 Merge: a2f83e8 6c0b654 Author: Jörn Huxhorn <jhuxhorn@googlemail.com> Date: Tue Nov 8 02:07:13 2011 -0800 Merge pull request #34 from motlin/master Three fixes from static-analysis tools. Reviewed changes. http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=6c0b65493bdd41513a6f8be58... http://github.com/ceki/logback/commit/6c0b65493bdd41513a6f8be58f0bbf313725de... commit 6c0b65493bdd41513a6f8be58f0bbf313725de8d Author: Craig P. Motlin <cmotlin@gmail.com> Date: Mon Nov 7 23:10:40 2011 -0500 Remove redundant 'final' method in 'final' class. diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/Level.java b/logback-classic/src/main/java/ch/qos/logback/classic/Level.java index acd5750..354f4e6 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/Level.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/Level.java @@ -95,14 +95,14 @@ public final class Level implements java.io.Serializable { /** * Returns the string representation of this Level. */ - public final String toString() { + public String toString() { return levelStr; } /** * Returns the integer representation of this Level. */ - public final int toInt() { + public int toInt() { return levelInt; } @@ -111,7 +111,7 @@ public final class Level implements java.io.Serializable { * * @return This level's Integer mapping. */ - public final Integer toInteger() { + public Integer toInteger() { switch (levelInt) { case ALL_INT: return ALL_INTEGER; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java b/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java index 500a9d3..8301c3b 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java @@ -114,7 +114,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, buildRemoteView(); } - public final Level getEffectiveLevel() { + public Level getEffectiveLevel() { return Level.toLevel(effectiveLevelInt); } @@ -474,7 +474,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, filterAndLog_0_Or3Plus(FQCN, null, Level.TRACE, msg, null, null); } - public final void trace(String format, Object arg) { + public void trace(String format, Object arg) { filterAndLog_1(FQCN, null, Level.TRACE, format, arg, null); } @@ -490,7 +490,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, filterAndLog_0_Or3Plus(FQCN, null, Level.TRACE, msg, null, t); } - public final void trace(Marker marker, String msg) { + public void trace(Marker marker, String msg) { filterAndLog_0_Or3Plus(FQCN, marker, Level.TRACE, msg, null, null); } @@ -510,11 +510,11 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, filterAndLog_0_Or3Plus(FQCN, marker, Level.TRACE, msg, null, t); } - public final boolean isDebugEnabled() { + public boolean isDebugEnabled() { return isDebugEnabled(null); } - public final boolean isDebugEnabled(Marker marker) { + public boolean isDebugEnabled(Marker marker) { final FilterReply decision = callTurboFilters(marker, Level.DEBUG); if (decision == FilterReply.NEUTRAL) { return effectiveLevelInt <= Level.DEBUG_INT; @@ -527,19 +527,19 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, } } - public final void debug(String msg) { + public void debug(String msg) { filterAndLog_0_Or3Plus(FQCN, null, Level.DEBUG, msg, null, null); } - public final void debug(String format, Object arg) { + public void debug(String format, Object arg) { filterAndLog_1(FQCN, null, Level.DEBUG, format, arg, null); } - public final void debug(String format, Object arg1, Object arg2) { + public void debug(String format, Object arg1, Object arg2) { filterAndLog_2(FQCN, null, Level.DEBUG, format, arg1, arg2, null); } - public final void debug(String format, Object[] argArray) { + public void debug(String format, Object[] argArray) { filterAndLog_0_Or3Plus(FQCN, null, Level.DEBUG, format, argArray, null); } @@ -547,7 +547,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, filterAndLog_0_Or3Plus(FQCN, null, Level.DEBUG, msg, null, t); } - public final void debug(Marker marker, String msg) { + public void debug(Marker marker, String msg) { filterAndLog_0_Or3Plus(FQCN, marker, Level.DEBUG, msg, null, null); } @@ -664,7 +664,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, filterAndLog_0_Or3Plus(FQCN, marker, Level.INFO, msg, null, t); } - public final boolean isTraceEnabled() { + public boolean isTraceEnabled() { return isTraceEnabled(null); } @@ -681,7 +681,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, } } - public final boolean isErrorEnabled() { + public boolean isErrorEnabled() { return isErrorEnabled(null); } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterList.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterList.java index c0f41a5..df1de73 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterList.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/TurboFilterList.java @@ -36,7 +36,7 @@ final public class TurboFilterList extends CopyOnWriteArrayList<TurboFilter> { * ACCEPT or DENY, then that value is returned. If all of the filters return * NEUTRAL, then NEUTRAL is returned. */ - public final FilterReply getTurboFilterChainDecision(final Marker marker, + public FilterReply getTurboFilterChainDecision(final Marker marker, final Logger logger, final Level level, final String format, final Object[] params, final Throwable t) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/helpers/NOPAppender.java b/logback-core/src/main/java/ch/qos/logback/core/helpers/NOPAppender.java index 2be5f93..ebda3d1 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/helpers/NOPAppender.java +++ b/logback-core/src/main/java/ch/qos/logback/core/helpers/NOPAppender.java @@ -18,7 +18,6 @@ import ch.qos.logback.core.AppenderBase; final public class NOPAppender<E> extends AppenderBase<E> { @Override - final protected void append(E eventObject) { + protected void append(E eventObject) { } } - \ No newline at end of file http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=7f28864991abd0643640bf566... http://github.com/ceki/logback/commit/7f28864991abd0643640bf5664ec7df08293e2... commit 7f28864991abd0643640bf5664ec7df08293e2ca Author: Craig P. Motlin <cmotlin@gmail.com> Date: Mon Nov 7 22:47:51 2011 -0500 Remove redundant local variables. diff --git a/logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java b/logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java index 6bae974..e3a25bc 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java +++ b/logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java @@ -29,9 +29,8 @@ public class ViewStatusMessagesServlet extends ViewStatusMessagesServletBase { HttpServletResponse resp) { ServletContext sc = getServletContext(); - StatusManager result = (StatusManager) sc + return (StatusManager) sc .getAttribute(AccessConstants.LOGBACK_STATUS_MANAGER_KEY); - return result; // if (result != null) { // System.out.println("from ServletContext"); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java b/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java index 011699f..e5d121a 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java @@ -49,8 +49,7 @@ public class GafferUtil { try { Class gcClass = Class.forName(ClassicConstants.GAFFER_CONFIGURATOR_FQCN); Constructor c = gcClass.getConstructor(LoggerContext.class); - GafferConfigurator gafferConfigurator = (GafferConfigurator) c.newInstance(loggerContext); - return gafferConfigurator; + return (GafferConfigurator) c.newInstance(loggerContext); } catch (ClassNotFoundException e) { addError(loggerContext, origin, ERROR_MSG, e); } catch (NoSuchMethodException e) { diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/jmx/MBeanUtil.java b/logback-classic/src/main/java/ch/qos/logback/classic/jmx/MBeanUtil.java index 5047087..07d0ba7 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/jmx/MBeanUtil.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/jmx/MBeanUtil.java @@ -28,9 +28,8 @@ public class MBeanUtil { static final String DOMAIN = "ch.qos.logback.classic"; static public String getObjectNameFor(String contextName, Class type) { - String objectNameAsStr = DOMAIN + ":Name=" + contextName + ",Type=" + return DOMAIN + ":Name=" + contextName + ",Type=" + type.getName(); - return objectNameAsStr; } public static ObjectName string2ObjectName(Context context, Object caller, diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java index 7a98dfd..920e689 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java @@ -44,10 +44,9 @@ public class RootCauseFirstThrowableProxyConverter extends ExtendedThrowableProx int commonFrames = tp.getCommonFrames(); boolean unrestrictedPrinting = lengthOption > stepArray.length; - int length = (unrestrictedPrinting) ? stepArray.length : lengthOption; - int maxIndex = length; + int maxIndex = (unrestrictedPrinting) ? stepArray.length : lengthOption; if (commonFrames > 0 && unrestrictedPrinting) { maxIndex -= commonFrames; } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java index ba71f6d..593b30e 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java @@ -154,10 +154,9 @@ public class ThrowableProxyConverter extends ThrowableHandlingConverter { int commonFrames = tp.getCommonFrames(); boolean unrestrictedPrinting = lengthOption > stepArray.length; - int length = (unrestrictedPrinting) ? stepArray.length : lengthOption; - int maxIndex = length; + int maxIndex = (unrestrictedPrinting) ? stepArray.length : lengthOption; if (commonFrames > 0 && unrestrictedPrinting) { maxIndex -= commonFrames; } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/CopyOnInheritThreadLocal.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/CopyOnInheritThreadLocal.java index c7e034f..689195d 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/util/CopyOnInheritThreadLocal.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/util/CopyOnInheritThreadLocal.java @@ -33,8 +33,7 @@ public class CopyOnInheritThreadLocal extends if (parentValue == null) { return null; } else { - HashMap<String, String> hm = new HashMap<String, String>(parentValue); - return hm; + return new HashMap<String, String>(parentValue); } } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java index 02e5ba7..b04cf69 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java @@ -59,10 +59,9 @@ public class JaninoEventEvaluatorTest { } LoggingEvent makeLoggingEvent(Exception ex) { - LoggingEvent e = new LoggingEvent( + return new LoggingEvent( ch.qos.logback.core.pattern.FormattingConverter.class.getName(), logger, Level.INFO, "Some message", ex, null); - return e; } @Test diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/corpus/CorpusModel.java b/logback-classic/src/test/java/ch/qos/logback/classic/corpus/CorpusModel.java index dbac6ac..5abe4fc 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/corpus/CorpusModel.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/corpus/CorpusModel.java @@ -242,9 +242,8 @@ public class CorpusModel { throwableProxy = ThrowableProxyVO.build(new ThrowableProxy(t)); pupulateWithPackagingData(throwableProxy.getStackTraceElementProxyArray()); } - LogStatement logStatement = new LogStatement(loggerName, randomLevel, mat, + return new LogStatement(loggerName, randomLevel, mat, throwableProxy); - return logStatement; } private Throwable getRandomThrowable(Level level) { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java index ff13db7..b90a616 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java @@ -202,9 +202,8 @@ public class DBAppenderH2Test { private ILoggingEvent createLoggingEvent(String msg, Object[] args) { - ILoggingEvent le = new LoggingEvent(this.getClass().getName(), logger, + return new LoggingEvent(this.getClass().getName(), logger, Level.DEBUG, msg, new Exception("test Ex"), args); - return le; } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTest.java index ce00928..8da98af 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTest.java @@ -178,11 +178,10 @@ public class DBAppenderHSQLTest { rs.close(); stmt.close(); } - + private ILoggingEvent createLoggingEvent() { - ILoggingEvent le = new LoggingEvent(this.getClass().getName(), logger, - Level.DEBUG, "test message", new Exception("test Ex"), new Integer[] {diff}); - return le; + return new LoggingEvent(this.getClass().getName(), logger, + Level.DEBUG, "test message", new Exception("test Ex"), new Integer[]{diff}); } } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java index 955970d..a881c48 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java @@ -215,9 +215,8 @@ public class HTMLLayoutTest { } private LoggingEvent createLoggingEvent() { - LoggingEvent le = new LoggingEvent(this.getClass().getName(), root, + return new LoggingEvent(this.getClass().getName(), root, Level.DEBUG, "test message", null, null); - return le; } Document parseOutput(String output) throws Exception { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverterTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverterTest.java index 37ce6f7..3baa23a 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverterTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverterTest.java @@ -50,10 +50,9 @@ public class ExtendedThrowableProxyConverterTest { } private ILoggingEvent createLoggingEvent(Throwable t) { - ILoggingEvent le = new LoggingEvent(this.getClass().getName(), lc + return new LoggingEvent(this.getClass().getName(), lc .getLogger(Logger.ROOT_LOGGER_NAME), Level.DEBUG, "test message", t, null); - return le; } @Test diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java index febe9d5..5881e4f 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/MDCConverterTest.java @@ -70,9 +70,8 @@ public class MDCConverterTest { } private ILoggingEvent createLoggingEvent() { - ILoggingEvent le = new LoggingEvent(this.getClass().getName(), lc + return new LoggingEvent(this.getClass().getName(), lc .getLogger(Logger.ROOT_LOGGER_NAME), Level.DEBUG, "test message", null, null); - return le; } } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ThrowableProxyConverterTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ThrowableProxyConverterTest.java index cbe18df..4b63b98 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ThrowableProxyConverterTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ThrowableProxyConverterTest.java @@ -47,10 +47,9 @@ public class ThrowableProxyConverterTest { } private ILoggingEvent createLoggingEvent(Throwable t) { - ILoggingEvent le = new LoggingEvent(this.getClass().getName(), lc + return new LoggingEvent(this.getClass().getName(), lc .getLogger(Logger.ROOT_LOGGER_NAME), Level.DEBUG, "test message", t, null); - return le; } @Test diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java index 3f2bdb9..2d73426 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java @@ -184,9 +184,8 @@ public class LoggingEventSerializationTest { } private LoggingEvent createLoggingEvent() { - LoggingEvent le = new LoggingEvent(this.getClass().getName(), logger, + return new LoggingEvent(this.getClass().getName(), logger, Level.DEBUG, "test message", null, null); - return le; } private void checkForEquality(ILoggingEvent original, diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackagingDataCalculatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackagingDataCalculatorTest.java index c7b1fc9..385dcfd 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackagingDataCalculatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackagingDataCalculatorTest.java @@ -101,9 +101,8 @@ public class PackagingDataCalculatorTest { private ClassLoader makeBogusClassLoader() throws MalformedURLException { ClassLoader currentClassLoader = this.getClass().getClassLoader(); - BogusClassLoader bcl = new BogusClassLoader(new URL[] {}, + return new BogusClassLoader(new URL[] {}, currentClassLoader); - return bcl; } @Test diff --git a/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java b/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java index 3ec7234..b8c425d 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java +++ b/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java @@ -55,8 +55,7 @@ public class FileAppender<E> extends OutputStreamAppender<E> { } else { // Trim spaces from both ends. The users probably does not want // trailing spaces in file names. - String val = file.trim(); - fileName = val; + fileName = file.trim(); } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java index c863e33..5089a47 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java @@ -22,18 +22,18 @@ import ch.qos.logback.core.joran.spi.Interpreter; import ch.qos.logback.core.spi.ContextAwareBase; /** - * + * * Most of the work for configuring logback is done by Actions. - * + * * <p>Action methods are invoked as the XML file is parsed. - * + * * <p>This class is largely inspired from the relevant class in the * commons-digester project of the Apache Software Foundation. - * + * * @author Craig McClanahan * @author Christopher Lenz * @author Ceki Gülcü - * + * */ public abstract class Action extends ContextAwareBase { @@ -96,8 +96,7 @@ public abstract class Action extends ContextAwareBase { } protected String getLineColStr(InterpretationContext ic) { - String line = "line: " + getLineNumber(ic) + ", column: " + return "line: " + getLineNumber(ic) + ", column: " + getColumnNumber(ic); - return line; } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java index c134ecc..6e70d22 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java @@ -85,8 +85,7 @@ public class ConfigurationWatchList extends ContextAwareBase { File convertToFile(URL url) { String protocol = url.getProtocol(); if ("file".equals(protocol)) { - File file = new File(URLDecoder.decode(url.getFile())); - return file; + return new File(URLDecoder.decode(url.getFile())); } else { addInfo("URL [" + url + "] is not of type file"); return null; diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java b/logback-core/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java index 3ab2be7..3adc7a0 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/util/PropertySetter.java @@ -200,8 +200,7 @@ public class PropertySetter extends ContextAwareBase { private Method findAdderMethod(String name) { name = capitalizeFirstLetter(name); - Method adderMethod = getMethod("add" + name); - return adderMethod; + return getMethod("add" + name); } private Method findSetterMethod(String name) { @@ -451,8 +450,7 @@ public class PropertySetter extends ContextAwareBase { DefaultClass defaultClassAnnon = getAnnotation(name, DefaultClass.class, relevantMethod); if (defaultClassAnnon != null) { - Class defaultClass = defaultClassAnnon.value(); - return defaultClass; + return defaultClassAnnon.value(); } return null; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java index 329ba8b..7e5da7b 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java @@ -80,12 +80,11 @@ public class FileFilterUtil { if (!file.exists() || !file.isDirectory()) { return new File[0]; } - File[] matchingFileArray = file.listFiles(new FilenameFilter() { + return file.listFiles(new FilenameFilter() { public boolean accept(File dir, String name) { return name.matches(stemRegex); } }); - return matchingFileArray; } static public int findHighestCounter(File[] matchingFileArray, final String stemRegex) { @@ -108,8 +107,7 @@ public class FileFilterUtil { + "] should match [" + lastFileName + "]"); } String counterAsStr = m.group(1); - int counter = new Integer(counterAsStr).intValue(); - return counter; + return new Integer(counterAsStr).intValue(); } public static String slashify(String in) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/spi/CyclicBufferTrackerImpl.java b/logback-core/src/main/java/ch/qos/logback/core/spi/CyclicBufferTrackerImpl.java index 855eb33..17df862 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/spi/CyclicBufferTrackerImpl.java +++ b/logback-core/src/main/java/ch/qos/logback/core/spi/CyclicBufferTrackerImpl.java @@ -67,8 +67,7 @@ public class CyclicBufferTrackerImpl<E> implements CyclicBufferTracker<E> { public CyclicBuffer<E> getOrCreate(String key, long timestamp) { Entry existing = map.get(key); if (existing == null) { - CyclicBuffer<E> cb = processNewEntry(key, timestamp); - return cb; + return processNewEntry(key, timestamp); } else { existing.setTimestamp(timestamp); moveToTail(existing); diff --git a/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilience_AS_ROOT_Test.java b/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilience_AS_ROOT_Test.java index ec65198..9b778ca 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilience_AS_ROOT_Test.java +++ b/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilience_AS_ROOT_Test.java @@ -132,7 +132,6 @@ public class FileAppenderResilience_AS_ROOT_Test { } ProcessBuilder pb = new ProcessBuilder(); pb.command("/usr/bin/sudo", PATH_LOOPFS_SCRIPT, cmd.toString()); - Process process = pb.start(); - return process; + return pb.start(); } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinator.java b/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinator.java index 0602b6e..fce697c 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinator.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinator.java @@ -69,8 +69,7 @@ public class CaseCombinator { return c; } if ('a' <= c && c <= 'z') { - int ci = c; - return (char) (ci + 'A' - 'a'); + return (char) ((int) c + 'A' - 'a'); } // code should never reach this point return c; @@ -81,8 +80,7 @@ public class CaseCombinator { return c; } if ('A' <= c && c <= 'Z') { - int ci = c; - return (char) (ci + 'a' - 'A'); + return (char) ((int) c + 'a' - 'A'); } // code should never reach this point return c; diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java index 8e056e2..8144137 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java @@ -131,8 +131,7 @@ public class MultiThreadedRollingTest { } OutputStream openScript() throws IOException { - FileOutputStream fos = new FileOutputStream(outputDirStr + VERIFY_SH); - return fos; + return new FileOutputStream(outputDirStr + VERIFY_SH); } @Test diff --git a/logback-core/src/test/java/ch/qos/logback/core/sift/Simulator.java b/logback-core/src/test/java/ch/qos/logback/core/sift/Simulator.java index 207cea5..745b865 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/sift/Simulator.java +++ b/logback-core/src/test/java/ch/qos/logback/core/sift/Simulator.java @@ -63,8 +63,7 @@ public class Simulator { private String getRandomKeyStr() { int ri = randomKeyGen.nextInt(); - String s = String.format("%X", ri); - return s; + return String.format("%X", ri); } void buildScenario(int simLen) { diff --git a/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerSimulator.java b/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerSimulator.java index 847044c..e521295 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerSimulator.java +++ b/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerSimulator.java @@ -48,8 +48,7 @@ public class CyclicBufferTrackerSimulator { private String getRandomKeyStr() { int ri = randomKeyGen.nextInt(); - String s = String.format("%X", ri); - return s; + return String.format("%X", ri); } void buildScenario(int simLen) { diff --git a/logback-core/src/test/java/ch/qos/logback/core/util/Compare.java b/logback-core/src/test/java/ch/qos/logback/core/util/Compare.java index a9b890d..536c1ba 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/util/Compare.java +++ b/logback-core/src/test/java/ch/qos/logback/core/util/Compare.java @@ -37,8 +37,7 @@ public class Compare { static BufferedReader gzFileToBufferedReader(String file) throws IOException { FileInputStream fis = new FileInputStream(file); GZIPInputStream gzis = new GZIPInputStream(fis); - BufferedReader br = new BufferedReader(new InputStreamReader(gzis)); - return br; + return new BufferedReader(new InputStreamReader(gzis)); } public static boolean gzFileCompare(String file1, String file2) throws IOException { http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=7fba75491fc15a3424062d522... http://github.com/ceki/logback/commit/7fba75491fc15a3424062d5228126312258f07... commit 7fba75491fc15a3424062d5228126312258f070f Author: Craig P. Motlin <cmotlin@gmail.com> Date: Mon Nov 7 22:15:56 2011 -0500 Remove redundant no-arg constructors. diff --git a/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java b/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java index 4e5f7c0..674889a 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java +++ b/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java @@ -32,10 +32,6 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<IAccessEvent> } - public JaninoEventEvaluator() { - - } - protected String getDecoratedExpression() { String expression = getExpression(); if (!expression.contains("return")) { diff --git a/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java b/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java index 3008d70..0e91dc7 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java +++ b/logback-access/src/main/java/ch/qos/logback/access/db/DBAppender.java @@ -66,9 +66,6 @@ public class DBAppender extends DBAppenderBase<IAccessEvent> { GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod; } - public DBAppender() { - } - @Override protected void subAppend(IAccessEvent event, Connection connection, PreparedStatement insertStatement) throws Throwable { diff --git a/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java b/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java index 3979fd7..bec5c28 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java +++ b/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java @@ -25,9 +25,6 @@ import ch.qos.logback.core.html.CssBuilder; */ public class DefaultCssBuilder implements CssBuilder { - public DefaultCssBuilder() { - } - public void addCss(StringBuilder sbuf) { sbuf.append("<style type=\"text/css\">"); sbuf.append("table{ "); diff --git a/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java b/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java index 3a89525..aea01f6 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java +++ b/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java @@ -27,9 +27,6 @@ public class UrlCssBuilder implements CssBuilder { String url = "http://logback.qos.ch/css/access.css"; - public UrlCssBuilder() { - } - public String getUrl() { return url; } diff --git a/logback-access/src/main/java/ch/qos/logback/access/net/URLEvaluator.java b/logback-access/src/main/java/ch/qos/logback/access/net/URLEvaluator.java index d60ba37..e638a8f 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/net/URLEvaluator.java +++ b/logback-access/src/main/java/ch/qos/logback/access/net/URLEvaluator.java @@ -28,9 +28,6 @@ public class URLEvaluator extends ContextAwareBase implements EventEvaluator, Li String name; private List<String> URLList = new ArrayList<String>(); - public URLEvaluator() { - } - public void addURL(String url) { URLList.add(url); } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java index ea2c904..af911a0 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java @@ -73,10 +73,6 @@ public class JaninoEventEvaluator extends DEFAULT_PARAM_TYPE_LIST.add(Throwable.class); } - public JaninoEventEvaluator() { - - } - protected String getDecoratedExpression() { String expression = getExpression(); if(!expression.contains("return")) { diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java index 5842d93..5e8baae 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java @@ -79,9 +79,6 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod; } - public DBAppender() { - } - public void setDbNameResolver(DBNameResolver dbNameResolver) { this.dbNameResolver = dbNameResolver; } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java b/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java index 8afbc63..f81ddb4 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java @@ -27,9 +27,6 @@ import ch.qos.logback.core.html.CssBuilder; */ public class DefaultCssBuilder implements CssBuilder { - public DefaultCssBuilder() { - } - public void addCss(StringBuilder sbuf) { sbuf.append("<style type=\"text/css\">"); sbuf.append(LINE_SEPARATOR); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java b/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java index 742cbc6..c2ec351 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultThrowableRenderer.java @@ -25,9 +25,6 @@ public class DefaultThrowableRenderer implements static final String TRACE_PREFIX = "<br /> "; - public DefaultThrowableRenderer() { - } - public void render(StringBuilder sbuf, ILoggingEvent event) { IThrowableProxy tp = event.getThrowableProxy(); sbuf.append("<tr><td class=\"Exception\" colspan=\"6\">"); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java b/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java index 911f319..2ddf8c6 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java @@ -27,9 +27,6 @@ public class UrlCssBuilder implements CssBuilder { String url = "http://logback.qos.ch/css/classic.css"; - public UrlCssBuilder() { - } - public String getUrl() { return url; } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java index 46c8f73..8a34efc 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java @@ -35,9 +35,6 @@ import ch.qos.logback.core.joran.spi.RuleStore; */ public class JoranConfigurator extends JoranConfiguratorBase { - public JoranConfigurator() { - } - @Override public void addInstanceRules(RuleStore rs) { // parent rules already added diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSQueueAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSQueueAppender.java index 70c456c..90de734 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSQueueAppender.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSQueueAppender.java @@ -53,9 +53,6 @@ public class JMSQueueAppender extends JMSAppenderBase<ILoggingEvent> { private PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer(); - public JMSQueueAppender() { - } - /** * The <b>QueueConnectionFactoryBindingName</b> option takes a string value. * Its value will be used to lookup the appropriate diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSTopicAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSTopicAppender.java index 43fd790..c88e696 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSTopicAppender.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/JMSTopicAppender.java @@ -53,9 +53,6 @@ public class JMSTopicAppender extends JMSAppenderBase<ILoggingEvent> { private PreSerializationTransformer<ILoggingEvent> pst = new LoggingEventPreSerializationTransformer(); - public JMSTopicAppender() { - } - /** * The <b>TopicConnectionFactoryBindingName</b> option takes a string value. * Its value will be used to lookup the appropriate diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java index 4174215..e184610 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java @@ -24,9 +24,6 @@ public class MDCConverter extends ClassicConverter { String key; private static final String EMPTY_STRING = ""; - public MDCConverter() { - } - @Override public void start() { key = getFirstOption(); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java b/logback-classic/src/main/java/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java index 5d428f2..619fb3f 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/sift/ContextBasedDiscriminator.java @@ -34,9 +34,6 @@ public class ContextBasedDiscriminator extends ContextAwareBase implements private String defaultValue; private boolean started = false; - public ContextBasedDiscriminator() { - } - /** * Return the name of the current context name as found in the logging event. */ diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/sift/JNDIBasedContextDiscriminator.java b/logback-classic/src/main/java/ch/qos/logback/classic/sift/JNDIBasedContextDiscriminator.java index aaf8cbd..39375ca 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/sift/JNDIBasedContextDiscriminator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/sift/JNDIBasedContextDiscriminator.java @@ -37,9 +37,6 @@ public class JNDIBasedContextDiscriminator extends ContextAwareBase implements private String defaultValue; private boolean started = false; - public JNDIBasedContextDiscriminator() { - } - /** * Return the name of the current context name as found in the logging event. */ diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java b/logback-classic/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java index 38eb045..7e15f5b 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java @@ -35,9 +35,6 @@ public class MDCBasedDiscriminator extends ContextAwareBase implements private String defaultValue; private boolean started = false; - public MDCBasedDiscriminator() { - } - /** * Return the value associated with an MDC entry designated by the Key * property. If that value is null, then return the value assigned to the diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java index 0e0ed63..f9fff78 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java @@ -50,9 +50,6 @@ public class PackagingDataCalculator { } - public PackagingDataCalculator() { - } - public void calculate(IThrowableProxy tp) { while (tp != null) { populateFrames(tp.getStackTraceElementProxyArray()); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java index c41673c..7b752d1 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java @@ -59,9 +59,6 @@ public final class LogbackMDCAdapter implements MDCAdapter { // keeps track of the last operation performed final ThreadLocal<Integer> lastOperation = new ThreadLocal<Integer>(); - public LogbackMDCAdapter() { - } - private Integer getAndSetLastOperation(int op) { Integer lastOp = lastOperation.get(); lastOperation.set(op); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2TestFixture.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2TestFixture.java index 13b4747..f6c4a87 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2TestFixture.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2TestFixture.java @@ -40,9 +40,6 @@ public class DBAppenderH2TestFixture { int diff = RandomUtil.getPositiveInt(); - public DBAppenderH2TestFixture() { - } - Connection connection; public void setUp() throws SQLException { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTestFixture.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTestFixture.java index 46853d4..951f1dd 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTestFixture.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderHSQLTestFixture.java @@ -37,9 +37,6 @@ public class DBAppenderHSQLTestFixture { // boolean isNetwork = true; HsqlMode mode = HsqlMode.MEM; - public DBAppenderHSQLTestFixture() { - } - public void setUp() throws SQLException { switch (mode) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java b/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java index 38b3b9b..3ec7234 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java +++ b/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java @@ -46,12 +46,6 @@ public class FileAppender<E> extends OutputStreamAppender<E> { private boolean prudent = false; /** - * As in most cases, the default constructor does nothing. - */ - public FileAppender() { - } - - /** * The <b>File</b> property takes a string value which should be the name of * the file to append to. */ diff --git a/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java b/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java index ac7924b..8afd2ee 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java +++ b/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java @@ -52,12 +52,6 @@ public class OutputStreamAppender<E> extends UnsynchronizedAppenderBase<E> { private OutputStream outputStream; /** - * The default constructor does nothing. - */ - public OutputStreamAppender() { - } - - /** * The underlying output stream used by this appender. * * @return diff --git a/logback-core/src/main/java/ch/qos/logback/core/encoder/EchoEncoder.java b/logback-core/src/main/java/ch/qos/logback/core/encoder/EchoEncoder.java index 0a44086..7e72707 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/encoder/EchoEncoder.java +++ b/logback-core/src/main/java/ch/qos/logback/core/encoder/EchoEncoder.java @@ -23,9 +23,6 @@ public class EchoEncoder<E> extends EncoderBase<E> { String fileHeader; String fileFooter; - public EchoEncoder() { - } - public void doEncode(E event) throws IOException { String val = event + CoreConstants.LINE_SEPARATOR; outputStream.write(val.getBytes()); diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java index 203bef9..9f277b3 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java @@ -35,13 +35,6 @@ public class RollingFileAppender<E> extends FileAppender<E> { TriggeringPolicy<E> triggeringPolicy; RollingPolicy rollingPolicy; - /** - * The default constructor simply calls its {@link FileAppender#FileAppender - * parents constructor}. - */ - public RollingFileAppender() { - } - public void start() { if (triggeringPolicy == null) { addWarn("No TriggeringPolicy was set for the RollingFileAppender named " diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java index 5e6fa2a..582336d 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java @@ -35,9 +35,6 @@ public class DateTokenConverter<E> extends DynamicConverter<E> implements MonoTy private String datePattern; private CachingDateFormatter cdf; - public DateTokenConverter() { - } - public void start() { this.datePattern = getFirstOption(); if (this.datePattern == null) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java index c61a7b7..d914b5d 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/IntegerTokenConverter.java @@ -25,9 +25,6 @@ public class IntegerTokenConverter extends DynamicConverter implements MonoTyped public final static String CONVERTER_KEY = "i"; - public IntegerTokenConverter() { - } - public String convert(int i) { return Integer.toString(i); } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java index 8f17c18..831b836 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/BadBeginAction.java @@ -30,9 +30,6 @@ public class BadBeginAction extends Action { int type; - public BadBeginAction() { - } - public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException { String exType = attributes.getValue(EXCEPTION_TYPE); diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java index 0d37112..3e81d4b 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/HelloAction.java @@ -25,8 +25,6 @@ public class HelloAction extends Action { static final public String PROPERTY_KEY = "name"; - public HelloAction() { - } /** * Instantiates an layout of the given class and sets its name. * diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java index 034832e..7a59aca 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/TouchAction.java @@ -25,8 +25,6 @@ public class TouchAction extends Action { public static final String KEY = "touched"; - public TouchAction() { - } /** * Instantiates an layout of the given class and sets its name. * diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java b/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java index 3bdddaa..759a84f 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/Fruit.java @@ -22,9 +22,6 @@ public class Fruit { List<String> textList = new ArrayList<String>(); List<Cake> cakeList = new ArrayList<Cake>(); - public Fruit() { - } - public void setName(String n) { this.name = n; } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java index 28f00c5..cab29ef 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java @@ -36,9 +36,6 @@ public class ImplicitActionTest { FruitContext fruitContext = new FruitContext(); SimpleConfigurator simpleConfigurator; - public ImplicitActionTest() { - } - @Before public void setUp() throws Exception { fruitContext.setName("fruits"); diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/replay/Fruit.java b/logback-core/src/test/java/ch/qos/logback/core/joran/replay/Fruit.java index 6d9d92d..50aab75 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/replay/Fruit.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/replay/Fruit.java @@ -21,10 +21,6 @@ public class Fruit { String name; List<String> textList = new ArrayList<String>(); - public Fruit() { - // System.out.println("Fruit constructor called"); - } - public void setName(String name) { this.name = name; } diff --git a/logback-core/src/test/java/ch/qos/logback/core/sift/tracker/AppenderTrackerTImpl.java b/logback-core/src/test/java/ch/qos/logback/core/sift/tracker/AppenderTrackerTImpl.java index 2dd5c51..4e118d3 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/sift/tracker/AppenderTrackerTImpl.java +++ b/logback-core/src/test/java/ch/qos/logback/core/sift/tracker/AppenderTrackerTImpl.java @@ -33,9 +33,6 @@ public class AppenderTrackerTImpl implements AppenderTracker<Object> { List<TEntry> entryList = new LinkedList<TEntry>(); long lastCheck = 0; - public AppenderTrackerTImpl() { - } - @SuppressWarnings("unchecked") synchronized public void put(String k, Appender<Object> appender, long timestamp) { diff --git a/logback-core/src/test/java/ch/qos/logback/core/testUtil/StringListAppender.java b/logback-core/src/test/java/ch/qos/logback/core/testUtil/StringListAppender.java index ad2ff08..a0487fb 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/testUtil/StringListAppender.java +++ b/logback-core/src/test/java/ch/qos/logback/core/testUtil/StringListAppender.java @@ -24,10 +24,6 @@ public class StringListAppender<E> extends AppenderBase<E> { Layout<E> layout; public List<String> strList = new ArrayList<String>(); - public StringListAppender() { - - } - public void start() { strList.clear(); diff --git a/logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java b/logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java index a18ec74..1054dbe 100644 --- a/logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java +++ b/logback-examples/src/main/java/chapters/appenders/CountingConsoleAppender.java @@ -27,9 +27,6 @@ public class CountingConsoleAppender extends AppenderBase<ILoggingEvent> { PatternLayoutEncoder encoder; - public CountingConsoleAppender() { - } - public void setLimit(int limit) { this.limit = limit; } http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=8cd1a0ef2bcfd92ea2fbdd678... http://github.com/ceki/logback/commit/8cd1a0ef2bcfd92ea2fbdd678d15323fed614f... commit 8cd1a0ef2bcfd92ea2fbdd678d15323fed614f3a Author: Tomasz Nurkiewicz <nurkiewicz@gmail.com> Date: Sat Sep 24 09:53:28 2011 +0200 Correct 0.9.30 version in @since tag diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java index 7a98dfd..09fb525 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java @@ -20,7 +20,7 @@ import ch.qos.logback.core.CoreConstants; /** * @author Tomasz Nurkiewicz - * @since 2010-08-07, 14:07:10 + * @since 0.9.30 */ public class RootCauseFirstThrowableProxyConverter extends ExtendedThrowableProxyConverter { ----------------------------------------------------------------------- Summary of changes: .../logback/access/ViewStatusMessagesServlet.java | 3 +- .../access/boolex/JaninoEventEvaluator.java | 4 --- .../java/ch/qos/logback/access/db/DBAppender.java | 3 -- .../qos/logback/access/html/DefaultCssBuilder.java | 3 -- .../ch/qos/logback/access/html/UrlCssBuilder.java | 3 -- .../ch/qos/logback/access/net/URLEvaluator.java | 3 -- .../main/java/ch/qos/logback/classic/Level.java | 6 ++-- .../main/java/ch/qos/logback/classic/Logger.java | 24 ++++++++++---------- .../classic/boolex/JaninoEventEvaluator.java | 4 --- .../java/ch/qos/logback/classic/db/DBAppender.java | 3 -- .../ch/qos/logback/classic/gaffer/GafferUtil.java | 3 +- .../logback/classic/html/DefaultCssBuilder.java | 3 -- .../classic/html/DefaultThrowableRenderer.java | 3 -- .../ch/qos/logback/classic/html/UrlCssBuilder.java | 3 -- .../java/ch/qos/logback/classic/jmx/MBeanUtil.java | 3 +- .../logback/classic/joran/JoranConfigurator.java | 3 -- .../qos/logback/classic/net/JMSQueueAppender.java | 3 -- .../qos/logback/classic/net/JMSTopicAppender.java | 3 -- .../qos/logback/classic/pattern/MDCConverter.java | 3 -- .../RootCauseFirstThrowableProxyConverter.java | 5 +-- .../classic/pattern/ThrowableProxyConverter.java | 3 +- .../classic/sift/ContextBasedDiscriminator.java | 3 -- .../sift/JNDIBasedContextDiscriminator.java | 3 -- .../classic/sift/MDCBasedDiscriminator.java | 3 -- .../classic/spi/PackagingDataCalculator.java | 3 -- .../qos/logback/classic/spi/TurboFilterList.java | 2 +- .../classic/util/CopyOnInheritThreadLocal.java | 3 +- .../logback/classic/util/LogbackMDCAdapter.java | 3 -- .../classic/boolex/JaninoEventEvaluatorTest.java | 3 +- .../ch/qos/logback/classic/corpus/CorpusModel.java | 3 +- .../qos/logback/classic/db/DBAppenderH2Test.java | 3 +- .../classic/db/DBAppenderH2TestFixture.java | 3 -- .../qos/logback/classic/db/DBAppenderHSQLTest.java | 7 ++--- .../classic/db/DBAppenderHSQLTestFixture.java | 3 -- .../qos/logback/classic/html/HTMLLayoutTest.java | 3 +- .../ExtendedThrowableProxyConverterTest.java | 3 +- .../logback/classic/pattern/MDCConverterTest.java | 3 +- .../pattern/ThrowableProxyConverterTest.java | 3 +- .../classic/spi/LoggingEventSerializationTest.java | 3 +- .../classic/spi/PackagingDataCalculatorTest.java | 3 +- .../java/ch/qos/logback/core/FileAppender.java | 9 +------ .../ch/qos/logback/core/OutputStreamAppender.java | 6 ----- .../ch/qos/logback/core/encoder/EchoEncoder.java | 3 -- .../ch/qos/logback/core/helpers/NOPAppender.java | 3 +- .../ch/qos/logback/core/joran/action/Action.java | 13 +++++----- .../core/joran/spi/ConfigurationWatchList.java | 3 +- .../logback/core/joran/util/PropertySetter.java | 6 +--- .../logback/core/rolling/RollingFileAppender.java | 7 ----- .../core/rolling/helper/DateTokenConverter.java | 3 -- .../core/rolling/helper/FileFilterUtil.java | 6 +--- .../core/rolling/helper/IntegerTokenConverter.java | 3 -- .../logback/core/spi/CyclicBufferTrackerImpl.java | 3 +- .../core/FileAppenderResilience_AS_ROOT_Test.java | 3 +- .../core/joran/action/ext/BadBeginAction.java | 3 -- .../logback/core/joran/action/ext/HelloAction.java | 2 - .../logback/core/joran/action/ext/TouchAction.java | 2 - .../logback/core/joran/implicitAction/Fruit.java | 3 -- .../joran/implicitAction/ImplicitActionTest.java | 3 -- .../ch/qos/logback/core/joran/replay/Fruit.java | 4 --- .../qos/logback/core/joran/spi/CaseCombinator.java | 6 +--- .../core/rolling/MultiThreadedRollingTest.java | 3 +- .../java/ch/qos/logback/core/sift/Simulator.java | 3 +- .../core/sift/tracker/AppenderTrackerTImpl.java | 3 -- .../core/spi/CyclicBufferTrackerSimulator.java | 3 +- .../logback/core/testUtil/StringListAppender.java | 4 --- .../java/ch/qos/logback/core/util/Compare.java | 3 +- .../appenders/CountingConsoleAppender.java | 3 -- 67 files changed, 56 insertions(+), 208 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.
participants (1)
-
git-noreply＠pixie.qos.ch