diff --git a/integration/src/test/java/org/slf4j/issues/Issue324Test.java b/integration/src/test/java/org/slf4j/issues/Issue324Test.java index 2f7b51e20..a7c2d7ee8 100644 --- a/integration/src/test/java/org/slf4j/issues/Issue324Test.java +++ b/integration/src/test/java/org/slf4j/issues/Issue324Test.java @@ -7,10 +7,9 @@ public class Issue324Test extends TestCase { - public void testLoggerCreationInPresenseOfSecurityManager() { String currentDir = System.getProperty("user.dir"); - System.out.println("currentDir:"+currentDir); + System.out.println("currentDir:" + currentDir); Logger logger = LoggerFactory.getLogger(Issue324Test.class); logger.debug("hello"); } diff --git a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java b/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java index b89ab2ace..604ec1d12 100644 --- a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java +++ b/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java @@ -33,6 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.slf4j.LoggerFactory; + public class SLF4JBridgeHandlerPerfTest { static String LOGGER_NAME = "yay"; @@ -50,7 +51,6 @@ public class SLF4JBridgeHandlerPerfTest { Handler[] existingHandlers; - @Before public void setUp() throws Exception { fileAppender = new FileAppender(new PatternLayout("%r [%t] %p %c %x - %m%n"), "target/test-output/toto.log"); diff --git a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java b/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java index 1c7c46a2a..71e4bc5d4 100755 --- a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java +++ b/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java @@ -35,7 +35,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class SLF4JBridgeHandlerTest { + +public class SLF4JBridgeHandlerTest { static String LOGGER_NAME = "yay"; @@ -43,7 +44,6 @@ public class SLF4JBridgeHandlerTest { org.apache.log4j.Logger log4jRoot; java.util.logging.Logger julLogger = java.util.logging.Logger.getLogger("yay"); - @Before public void setUp() throws Exception { listAppender.extractLocationInfo = true; @@ -179,18 +179,18 @@ public void testLogWithPlaceholderNoParameters() { } // See http://jira.qos.ch/browse/SLF4J-337 - + @Test public void illFormattedInputShouldBeReturnedAsIs() { SLF4JBridgeHandler.install(); String msg = "foo {18=bad} {0}"; - + julLogger.log(Level.INFO, msg, "ignored parameter due to IllegalArgumentException"); assertEquals(1, listAppender.list.size()); LoggingEvent le = (LoggingEvent) listAppender.list.get(0); assertEquals(msg, le.getMessage()); } - + void assertLevel(int index, org.apache.log4j.Level expectedLevel) { LoggingEvent le = (LoggingEvent) listAppender.list.get(index); assertEquals(expectedLevel, le.getLevel()); diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java index 609011ff1..62407a5a5 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java @@ -346,13 +346,13 @@ public void addAppender(Appender newAppender) { public void setLevel(Level level) { // nothing to do } - + public boolean getAdditivity() { return false; } - + public void assertLog(boolean assertion, String msg) { - if(!assertion) + if (!assertion) error(msg); } diff --git a/log4j-over-slf4j/src/test/java/org/dummy/Bug131.java b/log4j-over-slf4j/src/test/java/org/dummy/Bug131.java index c89a31a7e..4453ac225 100644 --- a/log4j-over-slf4j/src/test/java/org/dummy/Bug131.java +++ b/log4j-over-slf4j/src/test/java/org/dummy/Bug131.java @@ -32,7 +32,8 @@ import org.apache.log4j.Category; import org.apache.log4j.Logger; import org.junit.Test; -public class Bug131 { + +public class Bug131 { @Test public void testBug131() { diff --git a/log4j-over-slf4j/src/test/java/org/dummy/Bug139.java b/log4j-over-slf4j/src/test/java/org/dummy/Bug139.java index de285644b..1bb280ceb 100644 --- a/log4j-over-slf4j/src/test/java/org/dummy/Bug139.java +++ b/log4j-over-slf4j/src/test/java/org/dummy/Bug139.java @@ -33,7 +33,7 @@ import org.apache.log4j.Logger; import org.junit.Test; -public class Bug139 { +public class Bug139 { @Test public void test() { diff --git a/slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerAdapter.java b/slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerAdapter.java index 18ca9ec2e..ed47f1fc3 100755 --- a/slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerAdapter.java +++ b/slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerAdapter.java @@ -81,7 +81,6 @@ class AndroidLoggerAdapter extends MarkerIgnoringBase { private static final long serialVersionUID = -1227274521521287937L; - /** * Package access allows only {@link AndroidLoggerFactory} to instantiate * SimpleLogger instances. diff --git a/slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerFactory.java b/slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerFactory.java index f27ff5519..d4ae5efc8 100755 --- a/slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerFactory.java +++ b/slf4j-android/src/main/java/org/slf4j/impl/AndroidLoggerFactory.java @@ -117,8 +117,7 @@ private static String getSimpleName(String loggerName) { // Take leading part and append '*' to indicate that it was truncated int length = loggerName.length(); int lastPeriodIndex = loggerName.lastIndexOf('.'); - return lastPeriodIndex != -1 && length - (lastPeriodIndex + 1) <= TAG_MAX_LENGTH - ? loggerName.substring(lastPeriodIndex + 1) - : '*' + loggerName.substring(length - TAG_MAX_LENGTH + 1); + return lastPeriodIndex != -1 && length - (lastPeriodIndex + 1) <= TAG_MAX_LENGTH ? loggerName.substring(lastPeriodIndex + 1) : '*' + loggerName + .substring(length - TAG_MAX_LENGTH + 1); } } \ No newline at end of file diff --git a/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 89d4addcc..e21eafeb3 100644 --- a/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -58,8 +58,6 @@ public static StaticLoggerBinder getSingleton() { // to avoid constant folding by the compiler, this field must *not* be final public static String REQUESTED_API_VERSION = "1.6.99"; // !final - - private static final String loggerFactoryClassStr = AndroidLoggerFactory.class.getName(); /** diff --git a/slf4j-android/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/slf4j-android/src/main/java/org/slf4j/impl/StaticMDCBinder.java index aa61bfa50..93f58fbcd 100644 --- a/slf4j-android/src/main/java/org/slf4j/impl/StaticMDCBinder.java +++ b/slf4j-android/src/main/java/org/slf4j/impl/StaticMDCBinder.java @@ -27,7 +27,6 @@ import org.slf4j.helpers.NOPMDCAdapter; import org.slf4j.spi.MDCAdapter; - /** * This implementation is bound to {@link NOPMDCAdapter}. * @@ -36,32 +35,33 @@ */ public class StaticMDCBinder { - /** - * The unique instance of this class. - */ - public static final StaticMDCBinder SINGLETON = new StaticMDCBinder(); + /** + * The unique instance of this class. + */ + public static final StaticMDCBinder SINGLETON = new StaticMDCBinder(); + + private StaticMDCBinder() { + } + + /** + * Return the singleton of this class. + * + * @return the StaticMDCBinder singleton + * @since 1.7.14 + */ + public static final StaticMDCBinder getSingleton() { + return SINGLETON; + } + + /** + * Currently this method always returns an instance of + * {@link NOPMDCAdapter}. + */ + public MDCAdapter getMDCA() { + return new NOPMDCAdapter(); + } - private StaticMDCBinder() { - } - - /** - * Return the singleton of this class. - * - * @return the StaticMDCBinder singleton - * @since 1.7.14 - */ - public static final StaticMDCBinder getSingleton() { - return SINGLETON; - } - /** - * Currently this method always returns an instance of - * {@link NOPMDCAdapter}. - */ - public MDCAdapter getMDCA() { - return new NOPMDCAdapter(); - } - - public String getMDCAdapterClassStr() { - return NOPMDCAdapter.class.getName(); - } + public String getMDCAdapterClassStr() { + return NOPMDCAdapter.class.getName(); + } } diff --git a/slf4j-android/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-android/src/main/java/org/slf4j/impl/StaticMarkerBinder.java index a25d39766..2c506622b 100644 --- a/slf4j-android/src/main/java/org/slf4j/impl/StaticMarkerBinder.java +++ b/slf4j-android/src/main/java/org/slf4j/impl/StaticMarkerBinder.java @@ -39,39 +39,39 @@ */ public class StaticMarkerBinder implements MarkerFactoryBinder { - /** - * The unique instance of this class. - */ - public static final StaticMarkerBinder SINGLETON = new StaticMarkerBinder(); - - final IMarkerFactory markerFactory = new BasicMarkerFactory(); - - private StaticMarkerBinder() { - } - - /** - * Return the singleton of this class. - * - * @return the StaticMarkerBinder singleton - * @since 1.7.14 - */ - public static StaticMarkerBinder getSingleton() { - return SINGLETON; - } - - /** - * Currently this method always returns an instance of - * {@link BasicMarkerFactory}. - */ - public IMarkerFactory getMarkerFactory() { - return markerFactory; - } - - /** - * Currently, this method returns the class name of - * {@link BasicMarkerFactory}. - */ - public String getMarkerFactoryClassStr() { - return BasicMarkerFactory.class.getName(); - } + /** + * The unique instance of this class. + */ + public static final StaticMarkerBinder SINGLETON = new StaticMarkerBinder(); + + final IMarkerFactory markerFactory = new BasicMarkerFactory(); + + private StaticMarkerBinder() { + } + + /** + * Return the singleton of this class. + * + * @return the StaticMarkerBinder singleton + * @since 1.7.14 + */ + public static StaticMarkerBinder getSingleton() { + return SINGLETON; + } + + /** + * Currently this method always returns an instance of + * {@link BasicMarkerFactory}. + */ + public IMarkerFactory getMarkerFactory() { + return markerFactory; + } + + /** + * Currently, this method returns the class name of + * {@link BasicMarkerFactory}. + */ + public String getMarkerFactoryClassStr() { + return BasicMarkerFactory.class.getName(); + } } diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index 0b990e462..445bd6bbe 100755 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -139,7 +139,7 @@ private final static void bind() { try { Set staticLoggerBinderPathSet = null; // skip check under android, see also http://jira.qos.ch/browse/SLF4J-328 - if(!isAndroid()) { + if (!isAndroid()) { staticLoggerBinderPathSet = findPossibleStaticLoggerBinderPathSet(); reportMultipleBindingAmbiguity(staticLoggerBinderPathSet); } @@ -191,15 +191,15 @@ private static void playRecordedEvents() { for (int i = 0; i < events.size(); i++) { SubstituteLoggingEvent event = events.get(i); SubstituteLogger substLogger = event.getLogger(); - if( substLogger.isDelegateNOP()) { + if (substLogger.isDelegateNOP()) { break; } else if (substLogger.isDelegateEventAware()) { if (i == 0) emitReplayWarning(events.size()); substLogger.log(event); } else { - if(i == 0) - emitSubstitutionWarning(); + if (i == 0) + emitSubstitutionWarning(); Util.report(substLogger.getName()); } } diff --git a/slf4j-api/src/main/java/org/slf4j/event/EventConstants.java b/slf4j-api/src/main/java/org/slf4j/event/EventConstants.java index 58a951950..00975da27 100755 --- a/slf4j-api/src/main/java/org/slf4j/event/EventConstants.java +++ b/slf4j-api/src/main/java/org/slf4j/event/EventConstants.java @@ -2,7 +2,6 @@ import org.slf4j.spi.LocationAwareLogger; - public class EventConstants { public static final int ERROR_INT = LocationAwareLogger.ERROR_INT; public static final int WARN_INT = LocationAwareLogger.WARN_INT; @@ -10,5 +9,5 @@ public class EventConstants { public static final int DEBUG_INT = LocationAwareLogger.DEBUG_INT; public static final int TRACE_INT = LocationAwareLogger.TRACE_INT; public static final String NA_SUBST = "NA/SubstituteLogger"; - + } diff --git a/slf4j-api/src/main/java/org/slf4j/event/EventRecodingLogger.java b/slf4j-api/src/main/java/org/slf4j/event/EventRecodingLogger.java index 0e1f0c5dd..23efafa12 100755 --- a/slf4j-api/src/main/java/org/slf4j/event/EventRecodingLogger.java +++ b/slf4j-api/src/main/java/org/slf4j/event/EventRecodingLogger.java @@ -13,9 +13,9 @@ public class EventRecodingLogger implements Logger { List eventList; public EventRecodingLogger(SubstituteLogger logger, List eventList) { - this.logger = logger; - this.name = logger.getName(); - this.eventList = eventList; + this.logger = logger; + this.name = logger.getName(); + this.eventList = eventList; } public String getName() { @@ -27,14 +27,13 @@ private void recordEvent(Level level, String msg, Object[] args, Throwable throw } private void recordEvent(Level level, Marker marker, String msg, Object[] args, Throwable throwable) { - //System.out.println("recording logger:"+name+", msg:"+msg); + // System.out.println("recording logger:"+name+", msg:"+msg); SubstituteLoggingEvent loggingEvent = new SubstituteLoggingEvent(); loggingEvent.setTimeStamp(System.currentTimeMillis()); loggingEvent.setLevel(level); loggingEvent.setLogger(logger); loggingEvent.setLoggerName(name); - - + loggingEvent.setMessage(msg); loggingEvent.setArgumentArray(args); loggingEvent.setThrowable(throwable); @@ -207,7 +206,7 @@ public void warn(String format, Object arg) { public void warn(String format, Object arg1, Object arg2) { recordEvent(Level.WARN, format, new Object[] { arg1, arg2 }, null); } - + public void warn(String format, Object... arguments) { recordEvent(Level.WARN, format, arguments, null); } diff --git a/slf4j-api/src/main/java/org/slf4j/event/Level.java b/slf4j-api/src/main/java/org/slf4j/event/Level.java index 0aed10995..5d4031c35 100755 --- a/slf4j-api/src/main/java/org/slf4j/event/Level.java +++ b/slf4j-api/src/main/java/org/slf4j/event/Level.java @@ -13,8 +13,7 @@ */ public enum Level { - ERROR(ERROR_INT, "ERROR"), WARN(WARN_INT, "WARN"), INFO(INFO_INT, "INFO"), - DEBUG(DEBUG_INT, "DEBUG"), TRACE(TRACE_INT, "TRACE"); + ERROR(ERROR_INT, "ERROR"), WARN(WARN_INT, "WARN"), INFO(INFO_INT, "INFO"), DEBUG(DEBUG_INT, "DEBUG"), TRACE(TRACE_INT, "TRACE"); private int levelInt; private String levelStr; diff --git a/slf4j-api/src/main/java/org/slf4j/event/LoggingEvent.java b/slf4j-api/src/main/java/org/slf4j/event/LoggingEvent.java index 4fd0d0b92..1e26c2d4e 100755 --- a/slf4j-api/src/main/java/org/slf4j/event/LoggingEvent.java +++ b/slf4j-api/src/main/java/org/slf4j/event/LoggingEvent.java @@ -2,7 +2,6 @@ import org.slf4j.Marker; - /** * * @author ceki @@ -11,12 +10,19 @@ public interface LoggingEvent { Level getLevel(); + Marker getMarker(); + String getLoggerName(); + String getMessage(); + String getThreadName(); + Object[] getArgumentArray(); + long getTimeStamp(); + Throwable getThrowable(); } diff --git a/slf4j-api/src/main/java/org/slf4j/event/SubstituteLoggingEvent.java b/slf4j-api/src/main/java/org/slf4j/event/SubstituteLoggingEvent.java index f2be6c684..8c7acbc2a 100755 --- a/slf4j-api/src/main/java/org/slf4j/event/SubstituteLoggingEvent.java +++ b/slf4j-api/src/main/java/org/slf4j/event/SubstituteLoggingEvent.java @@ -78,7 +78,7 @@ public String getThreadName() { public void setThreadName(String threadName) { this.threadName = threadName; } - + public Throwable getThrowable() { return throwable; } diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java index ebad7c4a1..027938d55 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java @@ -44,10 +44,9 @@ */ public class BasicMDCAdapter implements MDCAdapter { - private InheritableThreadLocal> inheritableThreadLocal = - new InheritableThreadLocal>() { + private InheritableThreadLocal> inheritableThreadLocal = new InheritableThreadLocal>() { @Override - protected Map childValue(Map parentValue) { + protected Map childValue(Map parentValue) { if (parentValue == null) { return null; } diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java index 69a4139c5..e45c12565 100755 --- a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java @@ -151,7 +151,6 @@ final public static FormattingTuple format(final String messagePattern, Object a return arrayFormat(messagePattern, new Object[] { arg1, arg2 }); } - static final Throwable getThrowableCandidate(Object[] argArray) { if (argArray == null || argArray.length == 0) { return null; @@ -167,7 +166,7 @@ static final Throwable getThrowableCandidate(Object[] argArray) { final public static FormattingTuple arrayFormat(final String messagePattern, final Object[] argArray) { Throwable throwableCandidate = getThrowableCandidate(argArray); Object[] args = argArray; - if(throwableCandidate != null) { + if (throwableCandidate != null) { args = trimmedCopy(argArray); } return arrayFormat(messagePattern, args, throwableCandidate); @@ -183,7 +182,6 @@ private static Object[] trimmedCopy(Object[] argArray) { return trimmed; } - final public static FormattingTuple arrayFormat(final String messagePattern, final Object[] argArray, Throwable throwable) { if (messagePattern == null) { @@ -412,5 +410,4 @@ private static void doubleArrayAppend(StringBuilder sbuf, double[] a) { sbuf.append(']'); } - } diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLogger.java b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLogger.java index 40f4251ce..04a28b368 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLogger.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLogger.java @@ -329,10 +329,9 @@ public int hashCode() { Logger delegate() { return _delegate != null ? _delegate : getEventRecordingLogger(); } - - + private Logger getEventRecordingLogger() { - if(eventRecodingLogger == null) { + if (eventRecodingLogger == null) { eventRecodingLogger = new EventRecodingLogger(this, eventList); } return eventRecodingLogger; @@ -349,7 +348,7 @@ public void setDelegate(Logger delegate) { public boolean isDelegateEventAware() { if (delegateEventAware != null) return delegateEventAware; - + try { logMethodCache = _delegate.getClass().getMethod("log", LoggingEvent.class); delegateEventAware = Boolean.TRUE; @@ -371,6 +370,6 @@ public void log(LoggingEvent event) { } public boolean isDelegateNOP() { - return _delegate instanceof NOPLogger; + return _delegate instanceof NOPLogger; } } diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java index 614bd523c..ecde8b615 100755 --- a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java @@ -45,7 +45,7 @@ public class SubstituteLoggerFactory implements ILoggerFactory { final ConcurrentMap loggers = new ConcurrentHashMap(); final List eventList = Collections.synchronizedList(new ArrayList()); - + public Logger getLogger(String name) { SubstituteLogger logger = loggers.get(name); if (logger == null) { @@ -68,7 +68,7 @@ public List getLoggers() { public List getEventList() { return eventList; } - + public void clear() { loggers.clear(); eventList.clear(); diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/Util.java b/slf4j-api/src/main/java/org/slf4j/helpers/Util.java index fb45ec26c..b4e4b71e1 100755 --- a/slf4j-api/src/main/java/org/slf4j/helpers/Util.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/Util.java @@ -69,19 +69,19 @@ protected Class[] getClassContext() { private static ClassContextSecurityManager SECURITY_MANAGER; private static boolean SECURITY_MANAGER_CREATION_ALREADY_ATTEMPTED = false; - + private static ClassContextSecurityManager getSecurityManager() { - if(SECURITY_MANAGER != null) + if (SECURITY_MANAGER != null) return SECURITY_MANAGER; - else if(SECURITY_MANAGER_CREATION_ALREADY_ATTEMPTED) + else if (SECURITY_MANAGER_CREATION_ALREADY_ATTEMPTED) return null; else { - SECURITY_MANAGER = safeCreateSecurityManager(); + SECURITY_MANAGER = safeCreateSecurityManager(); SECURITY_MANAGER_CREATION_ALREADY_ATTEMPTED = true; return SECURITY_MANAGER; } } - + private static ClassContextSecurityManager safeCreateSecurityManager() { try { return new ClassContextSecurityManager(); @@ -97,7 +97,7 @@ private static ClassContextSecurityManager safeCreateSecurityManager() { */ public static Class getCallingClass() { ClassContextSecurityManager securityManager = getSecurityManager(); - if(securityManager == null) + if (securityManager == null) return null; Class[] trace = securityManager.getClassContext(); String thisClassName = Util.class.getName(); diff --git a/slf4j-api/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/slf4j-api/src/main/java/org/slf4j/impl/StaticMDCBinder.java index 9c8acdb00..b9560d41c 100644 --- a/slf4j-api/src/main/java/org/slf4j/impl/StaticMDCBinder.java +++ b/slf4j-api/src/main/java/org/slf4j/impl/StaticMDCBinder.java @@ -42,7 +42,7 @@ public class StaticMDCBinder { private StaticMDCBinder() { throw new UnsupportedOperationException("This code should never make it into the jar"); } - + /** * Return the singleton of this class. * @@ -50,7 +50,7 @@ private StaticMDCBinder() { * @since 1.7.14 */ public static final StaticMDCBinder getSingleton() { - return SINGLETON; + return SINGLETON; } /** diff --git a/slf4j-api/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-api/src/main/java/org/slf4j/impl/StaticMarkerBinder.java index 24f4a616f..6669770f0 100644 --- a/slf4j-api/src/main/java/org/slf4j/impl/StaticMarkerBinder.java +++ b/slf4j-api/src/main/java/org/slf4j/impl/StaticMarkerBinder.java @@ -60,7 +60,7 @@ private StaticMarkerBinder() { public static StaticMarkerBinder getSingleton() { return SINGLETON; } - + /** * Currently this method always returns an instance of * {@link BasicMarkerFactory}. diff --git a/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java b/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java index 69697df76..473b57479 100644 --- a/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java +++ b/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java @@ -37,7 +37,7 @@ * @author Ceki Gülcü * @author Joern Huxhorn */ -public class BasicMarkerTest { +public class BasicMarkerTest { static final String BLUE_STR = "BLUE"; static final String RED_STR = "RED"; static final String GREEN_STR = "GREEN"; diff --git a/slf4j-api/src/test/java/org/slf4j/NoBindingTest.java b/slf4j-api/src/test/java/org/slf4j/NoBindingTest.java index 4cccffb23..b161e7e19 100644 --- a/slf4j-api/src/test/java/org/slf4j/NoBindingTest.java +++ b/slf4j-api/src/test/java/org/slf4j/NoBindingTest.java @@ -45,7 +45,7 @@ public void testLogger() { } @Test - public void testMDC() { + public void testMDC() { MDC.put("k" + diff, "v"); assertNull(MDC.get("k")); } diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/BasicMDCAdapterTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/BasicMDCAdapterTest.java index 366576483..1fbc823b1 100644 --- a/slf4j-api/src/test/java/org/slf4j/helpers/BasicMDCAdapterTest.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/BasicMDCAdapterTest.java @@ -41,7 +41,7 @@ * * @author Lukasz Cwik */ -public class BasicMDCAdapterTest { +public class BasicMDCAdapterTest { MDCAdapter mdc = new BasicMDCAdapter(); @After @@ -55,7 +55,7 @@ public void testSettingAndGettingWithMDC() { mdc.put("testKey", "testValue"); assertEquals(mdc.get("testKey"), "testValue"); } - + @Test public void testOverwritingAKeyInMDC() { assertNull(mdc.get("testKey")); diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java index e1784a697..bbdd07b41 100755 --- a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java @@ -30,7 +30,7 @@ import org.junit.Test; @Ignore -public class MessageFormatterPerfTest{ //extends TestCase { +public class MessageFormatterPerfTest { // extends TestCase { Integer i1 = new Integer(1); Integer i2 = new Integer(2); diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java index e9c201501..37f98a10c 100755 --- a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java @@ -320,11 +320,11 @@ public void testArrayThrowable() { assertEquals("123{}", ft.getMessage()); assertTrue(Arrays.equals(iaWitness, ft.getArgArray())); assertEquals(t, ft.getThrowable()); - - ft = MessageFormatter.arrayFormat("1={}", new Object[] {i1}, t); + + ft = MessageFormatter.arrayFormat("1={}", new Object[] { i1 }, t); assertEquals("1=1", ft.getMessage()); - assertTrue(Arrays.equals(new Object[] {i1}, ft.getArgArray())); + assertTrue(Arrays.equals(new Object[] { i1 }, ft.getArgArray())); assertEquals(t, ft.getThrowable()); - + } } diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java index 97f365f9d..9820f8b7e 100755 --- a/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java @@ -35,7 +35,7 @@ import java.util.HashSet; import java.util.Set; -public class SubstituteLoggerFactoryTest { +public class SubstituteLoggerFactoryTest { private SubstituteLoggerFactory factory = new SubstituteLoggerFactory(); @Test diff --git a/slf4j-ext/src/test/java/org/slf4j/NDCTest.java b/slf4j-ext/src/test/java/org/slf4j/NDCTest.java index 969aa5b6b..e25164ee6 100644 --- a/slf4j-ext/src/test/java/org/slf4j/NDCTest.java +++ b/slf4j-ext/src/test/java/org/slf4j/NDCTest.java @@ -41,7 +41,6 @@ public void testEmpty() { assertEquals("", NDC.pop()); } - @Test public void testSmoke() { NDC.push("a"); @@ -49,7 +48,6 @@ public void testSmoke() { assertEquals("a", result); } - @Test public void testSmoke2() { NDC.push("a"); diff --git a/slf4j-ext/src/test/java/org/slf4j/cal10n_dummy/LocLoggerTest.java b/slf4j-ext/src/test/java/org/slf4j/cal10n_dummy/LocLoggerTest.java index d88a2a366..becab6736 100644 --- a/slf4j-ext/src/test/java/org/slf4j/cal10n_dummy/LocLoggerTest.java +++ b/slf4j-ext/src/test/java/org/slf4j/cal10n_dummy/LocLoggerTest.java @@ -37,7 +37,8 @@ import ch.qos.cal10n.IMessageConveyor; import ch.qos.cal10n.MessageConveyor; -public class LocLoggerTest { + +public class LocLoggerTest { ListAppender listAppender; org.apache.log4j.Logger log4jRoot; @@ -47,7 +48,6 @@ public class LocLoggerTest { final static String EXPECTED_FILE_NAME = "LocLoggerTest.java"; - @Before public void setUp() throws Exception { // start from a clean slate for each test @@ -64,7 +64,6 @@ void verify(LoggingEvent le, String expectedMsg) { assertEquals(EXPECTED_FILE_NAME, le.getLocationInformation().getFileName()); } - @Test public void testSmoke() { LocLogger locLogger = llFactory_uk.getLocLogger(this.getClass()); diff --git a/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java b/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java index e544acc61..bb04f3f32 100644 --- a/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java +++ b/slf4j-ext/src/test/java/org/slf4j/dummyExt/EventLoggerTest.java @@ -38,14 +38,14 @@ import org.slf4j.MDC; import org.slf4j.ext.EventData; import org.slf4j.ext.EventLogger; -public class EventLoggerTest { + +public class EventLoggerTest { ListAppender listAppender; org.apache.log4j.Logger log4; final static String EXPECTED_FILE_NAME = "EventLoggerTest.java"; - @Before public void setUp() throws Exception { @@ -76,7 +76,7 @@ void verify(LoggingEvent le, String expectedMsg) { assertEquals(expectedMsg, le.getMessage()); assertEquals(EXPECTED_FILE_NAME, le.getLocationInformation().getFileName()); } - + @Test public void testEventLogger() { EventData data[] = new EventData[2]; diff --git a/slf4j-ext/src/test/java/org/slf4j/dummyExt/MDCStrLookupTest.java b/slf4j-ext/src/test/java/org/slf4j/dummyExt/MDCStrLookupTest.java index 567cc775d..aa035b91e 100644 --- a/slf4j-ext/src/test/java/org/slf4j/dummyExt/MDCStrLookupTest.java +++ b/slf4j-ext/src/test/java/org/slf4j/dummyExt/MDCStrLookupTest.java @@ -29,7 +29,8 @@ import org.junit.Test; import org.slf4j.MDC; import org.slf4j.ext.MDCStrLookup; -public class MDCStrLookupTest { + +public class MDCStrLookupTest { @Test public void testLookup() throws Exception { diff --git a/slf4j-ext/src/test/java/org/slf4j/instrumentation/ToStringHelperTest.java b/slf4j-ext/src/test/java/org/slf4j/instrumentation/ToStringHelperTest.java index b250912c7..81723c0c4 100644 --- a/slf4j-ext/src/test/java/org/slf4j/instrumentation/ToStringHelperTest.java +++ b/slf4j-ext/src/test/java/org/slf4j/instrumentation/ToStringHelperTest.java @@ -28,7 +28,7 @@ import org.junit.Test; -public class ToStringHelperTest { +public class ToStringHelperTest { @Test public void testRenderer() { diff --git a/slf4j-ext/src/test/java/org/slf4j/profiler/PackageTest.java b/slf4j-ext/src/test/java/org/slf4j/profiler/PackageTest.java index cffa1c664..40b8365ce 100644 --- a/slf4j-ext/src/test/java/org/slf4j/profiler/PackageTest.java +++ b/slf4j-ext/src/test/java/org/slf4j/profiler/PackageTest.java @@ -29,9 +29,7 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({UtilTest.class, - ProfilerTest.class}) +@SuiteClasses({ UtilTest.class, ProfilerTest.class }) public class PackageTest { - } \ No newline at end of file diff --git a/slf4j-ext/src/test/java/org/slf4j/profiler/ProfilerTest.java b/slf4j-ext/src/test/java/org/slf4j/profiler/ProfilerTest.java index ecb510729..fef09a531 100644 --- a/slf4j-ext/src/test/java/org/slf4j/profiler/ProfilerTest.java +++ b/slf4j-ext/src/test/java/org/slf4j/profiler/ProfilerTest.java @@ -31,6 +31,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + public class ProfilerTest { Logger logger = LoggerFactory.getLogger(ProfilerTest.class); diff --git a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 84074cadc..a2504cd22 100644 --- a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -57,7 +57,6 @@ public static final StaticLoggerBinder getSingleton() { // to avoid constant folding by the compiler, this field must *not* be final public static String REQUESTED_API_VERSION = "1.6.99"; // !final - // Binding specific code: private static final String loggerFactoryClassStr = JCLLoggerFactory.class.getName(); diff --git a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java index 97935cb1a..c37af78d1 100644 --- a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java +++ b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java @@ -57,7 +57,7 @@ private StaticMarkerBinder() { public static StaticMarkerBinder getSingleton() { return SINGLETON; } - + /** * Currently this method always returns an instance of * {@link BasicMarkerFactory}. diff --git a/slf4j-jcl/src/test/java/org/slf4j/InvocationTest.java b/slf4j-jcl/src/test/java/org/slf4j/InvocationTest.java index 8123b3067..1ce3f9b7c 100644 --- a/slf4j-jcl/src/test/java/org/slf4j/InvocationTest.java +++ b/slf4j-jcl/src/test/java/org/slf4j/InvocationTest.java @@ -43,7 +43,6 @@ public class InvocationTest { Level oldLevel; java.util.logging.Logger root = java.util.logging.Logger.getLogger(""); - @Before public void setUp() throws Exception { oldLevel = root.getLevel(); diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java index 0c325ae77..1fb202252 100755 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java @@ -576,7 +576,7 @@ private void log(String callerFQCN, Level level, String msg, Throwable t) { LogRecord record = new LogRecord(level, msg); record.setLoggerName(getName()); record.setThrown(t); - // Note: parameters in record are not set because SLF4J only + // Note: parameters in record are not set because SLF4J only // supports a single formatting style fillCallerData(callerFQCN, record); logger.log(record); @@ -672,22 +672,22 @@ private LogRecord eventToRecord(LoggingEvent event, Level julLevel) { String format = event.getMessage(); Object[] arguments = event.getArgumentArray(); FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments); - if(ft.getThrowable() != null && event.getThrowable() != null) { + if (ft.getThrowable() != null && event.getThrowable() != null) { throw new IllegalArgumentException("both last element in argument array and last argument are of type Throwable"); } - + Throwable t = event.getThrowable(); - if(ft.getThrowable() != null) { + if (ft.getThrowable() != null) { t = ft.getThrowable(); throw new IllegalStateException("fix above code"); } - + LogRecord record = new LogRecord(julLevel, ft.getMessage()); record.setLoggerName(event.getLoggerName()); record.setMillis(event.getTimeStamp()); record.setSourceClassName(EventConstants.NA_SUBST); record.setSourceMethodName(EventConstants.NA_SUBST); - + record.setThrown(t); return record; } diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMDCBinder.java index 753e83f20..865fee964 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMDCBinder.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMDCBinder.java @@ -41,7 +41,7 @@ public class StaticMDCBinder { private StaticMDCBinder() { } - + /** * Return the singleton of this class. * @@ -51,7 +51,7 @@ private StaticMDCBinder() { public static final StaticMDCBinder getSingleton() { return SINGLETON; } - + /** * Currently this method always returns an instance of * {@link BasicMDCAdapter}. diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java index 97935cb1a..c37af78d1 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java @@ -57,7 +57,7 @@ private StaticMarkerBinder() { public static StaticMarkerBinder getSingleton() { return SINGLETON; } - + /** * Currently this method always returns an instance of * {@link BasicMarkerFactory}. diff --git a/slf4j-jdk14/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java b/slf4j-jdk14/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java index 9de05391b..3e128148f 100755 --- a/slf4j-jdk14/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java @@ -44,22 +44,19 @@ public class MultithreadedInitializationTest { - final static int THREAD_COUNT = 4 + Runtime.getRuntime().availableProcessors() * 2; private static AtomicLong EVENT_COUNT = new AtomicLong(0); final CyclicBarrier barrier = new CyclicBarrier(THREAD_COUNT + 1); - int diff = new Random().nextInt(10000); String loggerName = "org.slf4j.impl.MultithreadedInitializationTest"; private static java.util.logging.Logger getRootLogger() { return LogManager.getLogManager().getLogger(""); } - - + @After public void tearDown() throws Exception { java.util.logging.Logger rootLogger = getRootLogger(); @@ -75,7 +72,7 @@ public void tearDown() throws Exception { public void addRecordingHandler() { getRootLogger().addHandler(new RecordingHandler()); } - + @Test public void multiThreadedInitialization() throws InterruptedException, BrokenBarrierException { System.out.println("THREAD_COUNT=" + THREAD_COUNT); @@ -96,7 +93,7 @@ public void multiThreadedInitialization() throws InterruptedException, BrokenBar private List getRecordedEvents() { RecordingHandler ra = findRecordingHandler(); - if(ra == null) { + if (ra == null) { fail("failed to fing RecordingHandler"); } return ra.records; diff --git a/slf4j-jdk14/src/test/java/org/slf4j/impl/RecordingHandler.java b/slf4j-jdk14/src/test/java/org/slf4j/impl/RecordingHandler.java index 67521979a..7a23b45da 100755 --- a/slf4j-jdk14/src/test/java/org/slf4j/impl/RecordingHandler.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/impl/RecordingHandler.java @@ -8,7 +8,7 @@ public class RecordingHandler extends Handler { List records = new ArrayList(); - + @Override public void publish(LogRecord record) { records.add(record); diff --git a/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java b/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java index e668e716e..00e75b559 100644 --- a/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java @@ -42,7 +42,7 @@ * See http://jira.qos.ch/browse/SLF4J-252 * @author Thorbjorn Ravn Andersen */ -public class LoggerSerializationTest { +public class LoggerSerializationTest { static class LoggerHolder implements Serializable { private static final long serialVersionUID = 1L; diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerFactory.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerFactory.java index 6194bb7b7..e86cb9e42 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerFactory.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerFactory.java @@ -41,7 +41,7 @@ public class Log4jLoggerFactory implements ILoggerFactory { private static final String LOG4J_DELEGATION_LOOP_URL = "http://www.slf4j.org/codes.html#log4jDelegationLoop"; - + // check for delegation loops static { try { diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMDCBinder.java index a0e815fd7..4545e1f3e 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMDCBinder.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMDCBinder.java @@ -40,7 +40,7 @@ public class StaticMDCBinder { private StaticMDCBinder() { } - + /** * Return the singleton of this class. * @@ -50,7 +50,7 @@ private StaticMDCBinder() { public static final StaticMDCBinder getSingleton() { return SINGLETON; } - + /** * Currently this method always returns an instance of * {@link StaticMDCBinder}. diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java index 97935cb1a..c37af78d1 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java @@ -57,7 +57,7 @@ private StaticMarkerBinder() { public static StaticMarkerBinder getSingleton() { return SINGLETON; } - + /** * Currently this method always returns an instance of * {@link BasicMarkerFactory}. diff --git a/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java b/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java index 71845e280..5012b1df7 100644 --- a/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java @@ -48,7 +48,6 @@ public class InvocationTest { ListAppender listAppender = new ListAppender(); org.apache.log4j.Logger root; - @Before public void setUp() throws Exception { root = org.apache.log4j.Logger.getRootLogger(); @@ -59,7 +58,7 @@ public void setUp() throws Exception { public void tearDown() throws Exception { root.getLoggerRepository().resetConfiguration(); } - + @Test public void test1() { Logger logger = LoggerFactory.getLogger("test1"); @@ -119,8 +118,8 @@ public void testNullParameter_BUG78() { String[] parameters = null; String msg = "hello {}"; - logger.debug(msg, (Object[]) parameters); - + logger.debug(msg, (Object[]) parameters); + assertEquals(1, listAppender.list.size()); LoggingEvent e = (LoggingEvent) listAppender.list.get(0); assertEquals(msg, e.getMessage()); diff --git a/slf4j-log4j12/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java b/slf4j-log4j12/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java index 651bd5c7d..79c494365 100644 --- a/slf4j-log4j12/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java @@ -103,7 +103,7 @@ static class LoggerAccessingThread extends Thread { final CyclicBarrier barrier; Logger logger; int count; - + LoggerAccessingThread(CyclicBarrier barrier, int count) { this.barrier = barrier; this.count = count; @@ -115,7 +115,7 @@ public void run() { } catch (Exception e) { e.printStackTrace(); } - logger = LoggerFactory.getLogger(this.getClass().getName()+"-"+count); + logger = LoggerFactory.getLogger(this.getClass().getName() + "-" + count); logger.info("in run method"); EVENT_COUNT.getAndIncrement(); } diff --git a/slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveAppender.java b/slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveAppender.java index b3ff21962..6c1e64143 100644 --- a/slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveAppender.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveAppender.java @@ -38,9 +38,9 @@ public class RecursiveAppender extends AppenderSkeleton { int diff = new Random().nextInt(); int activationDelay = 0; String loggerName = "org.slf4j.impl.RecursiveAppender" + diff; - + List events = new ArrayList(); - + public RecursiveAppender() { System.out.println("entering RecursiveAppender constructor"); Logger logger = LoggerFactory.getLogger(loggerName); @@ -62,7 +62,7 @@ public boolean requiresLayout() { @Override public void activateOptions() { System.out.println("entering RecursiveAppender.activateOptions"); - if(activationDelay > 0) { + if (activationDelay > 0) { Logger logger = LoggerFactory.getLogger(loggerName); logger.info("About to wait {} millis", activationDelay); try { @@ -76,6 +76,7 @@ public void activateOptions() { System.out.println("exiting RecursiveAppender.activateOptions"); } + public int getActivationDelay() { return activationDelay; } @@ -83,7 +84,5 @@ public int getActivationDelay() { public void setActivationDelay(int activationDelay) { this.activationDelay = activationDelay; } - - } diff --git a/slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java b/slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java index 4dbc96a4c..f6d485efd 100755 --- a/slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java @@ -47,7 +47,7 @@ public void tearDown() throws Exception { @Test public void loggingDuringInitialization() { System.setProperty(CONFIG_FILE_KEY, "recursiveInit.properties"); - Logger logger = LoggerFactory.getLogger(loggerName+".loggingDuringInitialization-"+diff); + Logger logger = LoggerFactory.getLogger(loggerName + ".loggingDuringInitialization-" + diff); logger.info("hello"); } diff --git a/slf4j-migrator/src/test/java/org/slf4j/migrator/FileConverterTest.java b/slf4j-migrator/src/test/java/org/slf4j/migrator/FileConverterTest.java index 9d4fa35e6..4e1b1382d 100644 --- a/slf4j-migrator/src/test/java/org/slf4j/migrator/FileConverterTest.java +++ b/slf4j-migrator/src/test/java/org/slf4j/migrator/FileConverterTest.java @@ -31,8 +31,8 @@ import org.junit.Test; import org.slf4j.migrator.internal.NopProgressListener; import org.slf4j.migrator.line.EmptyRuleSet; -public class FileConverterTest { +public class FileConverterTest { @Test @Ignore diff --git a/slf4j-migrator/src/test/java/org/slf4j/migrator/ProjectConverterTest.java b/slf4j-migrator/src/test/java/org/slf4j/migrator/ProjectConverterTest.java index 67bdb2eb3..537ba3f4f 100644 --- a/slf4j-migrator/src/test/java/org/slf4j/migrator/ProjectConverterTest.java +++ b/slf4j-migrator/src/test/java/org/slf4j/migrator/ProjectConverterTest.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.slf4j.migrator.internal.NopProgressListener; -public class ProjectConverterTest { +public class ProjectConverterTest { public void test() { } diff --git a/slf4j-migrator/src/test/java/org/slf4j/migrator/helper/AbbreviatorTest.java b/slf4j-migrator/src/test/java/org/slf4j/migrator/helper/AbbreviatorTest.java index b17a17e09..ac470b88e 100644 --- a/slf4j-migrator/src/test/java/org/slf4j/migrator/helper/AbbreviatorTest.java +++ b/slf4j-migrator/src/test/java/org/slf4j/migrator/helper/AbbreviatorTest.java @@ -28,6 +28,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; + public class AbbreviatorTest { static final char FS = '/'; diff --git a/slf4j-migrator/src/test/java/org/slf4j/migrator/line/JCLRuleSetTest.java b/slf4j-migrator/src/test/java/org/slf4j/migrator/line/JCLRuleSetTest.java index 4f91d21ce..f480229ae 100644 --- a/slf4j-migrator/src/test/java/org/slf4j/migrator/line/JCLRuleSetTest.java +++ b/slf4j-migrator/src/test/java/org/slf4j/migrator/line/JCLRuleSetTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; + public class JCLRuleSetTest { LineConverter jclConverter = new LineConverter(new JCLRuleSet()); @@ -39,7 +40,6 @@ public void testImportReplacement() { assertEquals("import org.slf4j.Logger;", jclConverter.getOneLineReplacement("import org.apache.commons.logging.Log;")); } - @Test public void testLogFactoryGetLogReplacement() { // Logger declaration and instanciation without modifier @@ -93,7 +93,6 @@ public void testLogFactoryGetFactoryReplacement() { jclConverter.getOneLineReplacement("// myLog = LogFactory.getFactory().getInstance(MyClass.class);//logger instanciation")); } - @Test public void testLogDeclarationReplacement() { diff --git a/slf4j-migrator/src/test/java/org/slf4j/migrator/line/NoConversionTest.java b/slf4j-migrator/src/test/java/org/slf4j/migrator/line/NoConversionTest.java index 5aa9ddc51..60b1fdbf2 100644 --- a/slf4j-migrator/src/test/java/org/slf4j/migrator/line/NoConversionTest.java +++ b/slf4j-migrator/src/test/java/org/slf4j/migrator/line/NoConversionTest.java @@ -27,7 +27,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -public class NoConversionTest { + +public class NoConversionTest { /** * This test shows that performing JCL to SLF4J conversion has no impact on diff --git a/slf4j-nop/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/slf4j-nop/src/main/java/org/slf4j/impl/StaticMDCBinder.java index 35dc8d80a..a88f2bfc4 100644 --- a/slf4j-nop/src/main/java/org/slf4j/impl/StaticMDCBinder.java +++ b/slf4j-nop/src/main/java/org/slf4j/impl/StaticMDCBinder.java @@ -51,7 +51,7 @@ private StaticMDCBinder() { public static final StaticMDCBinder getSingleton() { return SINGLETON; } - + /** * Currently this method always returns an instance of * {@link StaticMDCBinder}. diff --git a/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java index 97935cb1a..c37af78d1 100644 --- a/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java +++ b/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java @@ -57,7 +57,7 @@ private StaticMarkerBinder() { public static StaticMarkerBinder getSingleton() { return SINGLETON; } - + /** * Currently this method always returns an instance of * {@link BasicMarkerFactory}. diff --git a/slf4j-nop/src/test/java/org/slf4j/LoggerFactoryFriend.java b/slf4j-nop/src/test/java/org/slf4j/LoggerFactoryFriend.java index 2581a5b3b..4398d3b25 100755 --- a/slf4j-nop/src/test/java/org/slf4j/LoggerFactoryFriend.java +++ b/slf4j-nop/src/test/java/org/slf4j/LoggerFactoryFriend.java @@ -2,6 +2,6 @@ public class LoggerFactoryFriend { static public void reset() { - LoggerFactory.reset(); + LoggerFactory.reset(); } } diff --git a/slf4j-nop/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java b/slf4j-nop/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java index 954755b7c..493b3d751 100755 --- a/slf4j-nop/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java +++ b/slf4j-nop/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java @@ -53,10 +53,10 @@ public class MultithreadedInitializationTest { String loggerName = "org.slf4j.impl.MultithreadedInitializationTest"; private final PrintStream oldErr = System.err; StringPrintStream sps = new StringPrintStream(oldErr); - + @Before public void setup() { - LoggerFactoryFriend.reset(); + LoggerFactoryFriend.reset(); System.setErr(sps); } @@ -147,6 +147,4 @@ public void println(Object o) { } }; - } - diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index a4d2f2721..bcca82fa5 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -649,7 +649,7 @@ public void error(String msg, Throwable t) { public void log(LoggingEvent event) { int levelInt = event.getLevel().toInt(); - + if (!isLevelEnabled(levelInt)) { return; } @@ -657,5 +657,4 @@ public void log(LoggingEvent event) { log(levelInt, tp.getMessage(), event.getThrowable()); } - } diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java index ef1a9d90d..f8527af73 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java @@ -48,7 +48,7 @@ public class StaticMarkerBinder implements MarkerFactoryBinder { private StaticMarkerBinder() { } - + /** * Return the singleton of this class. * @@ -58,7 +58,7 @@ private StaticMarkerBinder() { public static StaticMarkerBinder getSingleton() { return SINGLETON; } - + /** * Currently this method always returns an instance of * {@link BasicMarkerFactory}. diff --git a/slf4j-simple/src/test/java/org/slf4j/LoggerFactoryFriend.java b/slf4j-simple/src/test/java/org/slf4j/LoggerFactoryFriend.java index 2581a5b3b..4398d3b25 100755 --- a/slf4j-simple/src/test/java/org/slf4j/LoggerFactoryFriend.java +++ b/slf4j-simple/src/test/java/org/slf4j/LoggerFactoryFriend.java @@ -2,6 +2,6 @@ public class LoggerFactoryFriend { static public void reset() { - LoggerFactory.reset(); + LoggerFactory.reset(); } } diff --git a/slf4j-simple/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java b/slf4j-simple/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java index 5e2291490..519260960 100755 --- a/slf4j-simple/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java +++ b/slf4j-simple/src/test/java/org/slf4j/impl/MultithreadedInitializationTest.java @@ -80,8 +80,8 @@ public void multiThreadedInitialization() throws InterruptedException, BrokenBar logger.info("hello"); EVENT_COUNT.getAndIncrement(); - int NUM_LINES_IN_SLF4J_REPLAY_WARNING=3; - assertEquals(EVENT_COUNT.get()+NUM_LINES_IN_SLF4J_REPLAY_WARNING, sps.stringList.size()); + int NUM_LINES_IN_SLF4J_REPLAY_WARNING = 3; + assertEquals(EVENT_COUNT.get() + NUM_LINES_IN_SLF4J_REPLAY_WARNING, sps.stringList.size()); } private static LoggerAccessingThread[] harness() throws InterruptedException, BrokenBarrierException {