Repository: logging-log4j2 Updated Branches: refs/heads/release-2.x 61b77dfb6 -> a8a7e7c93
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java ---------------------------------------------------------------------- diff --git a/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java b/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java index f1ede24..3fbb0da 100644 --- a/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java +++ b/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java @@ -168,7 +168,7 @@ public final class PoolingDriverConnectionSource extends AbstractDriverManagerCo } @Override - public boolean stop(long timeout, TimeUnit timeUnit) { + public boolean stop(final long timeout, final TimeUnit timeUnit) { try { final PoolingDriver driver = getPoolingDriver(); if (driver != null) { @@ -176,7 +176,7 @@ public final class PoolingDriverConnectionSource extends AbstractDriverManagerCo driver.closePool(poolName); } return true; - } catch (Exception e) { + } catch (final Exception e) { getLogger().error("Exception stopping connection source for '{}' â '{}'", getConnectionString(), getActualConnectionString(), e); return false; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java ---------------------------------------------------------------------- diff --git a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java index 538dc8d..f7405c2 100644 --- a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java +++ b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java @@ -22,8 +22,6 @@ import java.util.Map; import javax.swing.JPanel; import javax.swing.SwingWorker; -import com.sun.tools.jconsole.JConsolePlugin; - /** * Adapts the {@code ClientGui} to the {@code JConsolePlugin} API. */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java ---------------------------------------------------------------------- diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java index b2d36a8..081f760 100644 --- a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java +++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java @@ -89,7 +89,7 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager { protected void writeInternal(final LogEvent event) { writeInternal(event, null); } - + @Override protected void writeInternal(final LogEvent event, final Serializable serializable) { if (!this.isRunning() || this.entityManagerFactory == null || this.entityManager == null http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java ---------------------------------------------------------------------- diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java index 9e0120e..fde75af 100644 --- a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java +++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java @@ -46,11 +46,11 @@ public class InstantAttributeConverter implements AttributeConverter<Instant, St return null; } - int pos = s.indexOf(","); - long epochSecond = Long.parseLong(s.substring(0, pos)); - int nanos = Integer.parseInt(s.substring(pos + 1, s.length())); + final int pos = s.indexOf(","); + final long epochSecond = Long.parseLong(s.substring(0, pos)); + final int nanos = Integer.parseInt(s.substring(pos + 1, s.length())); - MutableInstant result = new MutableInstant(); + final MutableInstant result = new MutableInstant(); result.initFromEpochSecond(epochSecond, nanos); return result; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java index 6ff3c14..6d90b3c 100644 --- a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java +++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java @@ -64,7 +64,7 @@ public abstract class AbstractJpaAppenderTest { public void tearDown() throws SQLException { final LoggerContext context = LoggerContext.getContext(false); try { - String appenderName = "databaseAppender"; + final String appenderName = "databaseAppender"; final Appender appender = context.getConfiguration().getAppender(appenderName); assertNotNull("The appender '" + appenderName + "' should not be null.", appender); assertTrue("The appender should be a JpaAppender.", appender instanceof JpaAppender); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java ---------------------------------------------------------------------- diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java index 0fae006..165f87f 100644 --- a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java +++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java @@ -36,7 +36,7 @@ public class ContextStackJsonAttributeConverterTest { private ContextStackJsonAttributeConverter converter; @Rule - public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule(); + public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule(); @Before public void setUp() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java ---------------------------------------------------------------------- diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java index bc86410..90e0730 100644 --- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java +++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java @@ -29,7 +29,7 @@ public final class Constants { * {@code log4j-core}. */ public static final String LOGGER_ADAPTOR_PROPERTY = "log4j.jul.LoggerAdapter"; - + /** * The Log4j property to set to a custom implementation of {@link org.apache.logging.log4j.jul.LevelConverter}. The specified class must have * a default constructor. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java ---------------------------------------------------------------------- diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java index adaf4eb..ea04fee 100644 --- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java +++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java @@ -34,7 +34,7 @@ import org.apache.logging.log4j.Level; * <p> * Since 2.4, supports custom JUL levels by mapping them to their closest mapped neighbour. * </p> - * + * * @since 2.1 */ public class DefaultLevelConverter implements LevelConverter { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java ---------------------------------------------------------------------- diff --git a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java index 18f3bf0..03f3cff 100644 --- a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java +++ b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java @@ -22,7 +22,7 @@ import org.junit.Test; /** * Tests {@link DefaultLevelConverter} for custom JUL levels. - * + * * @since 2.4 */ public class DefaultLevelConverterCustomJulLevelsTest { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java ---------------------------------------------------------------------- diff --git a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java index 465fa3f..68416c2 100644 --- a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java +++ b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java @@ -43,7 +43,7 @@ import de.flapdoodle.embed.process.runtime.Network; /** * A JUnit test rule to manage a MongoDB embedded instance. - * + * * TODO Move this class to Apache Commons Testing. */ public class MongoDbTestRule implements TestRule { @@ -164,7 +164,7 @@ public class MongoDbTestRule implements TestRule { @Override public String toString() { - StringBuilder builder = new StringBuilder(); + final StringBuilder builder = new StringBuilder(); builder.append("MongoDbTestRule [starter="); builder.append(starter); builder.append(", portSystemPropertyName="); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java ---------------------------------------------------------------------- diff --git a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java index 96a903b..b6a7097 100644 --- a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java +++ b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java @@ -43,7 +43,7 @@ import de.flapdoodle.embed.process.runtime.Network; /** * A JUnit test rule to manage a MongoDB embedded instance. - * + * * TODO Move this class to Apache Commons Testing. */ public class MongoDbTestRule implements TestRule { @@ -172,7 +172,7 @@ public class MongoDbTestRule implements TestRule { @Override public String toString() { - StringBuilder builder = new StringBuilder(); + final StringBuilder builder = new StringBuilder(); builder.append("MongoDbTestRule [starter="); builder.append(starter); builder.append(", portSystemPropertyName="); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java ---------------------------------------------------------------------- diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java index f22c4a1..39fecb7 100644 --- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java +++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java @@ -44,7 +44,7 @@ public abstract class AbstractLoadBundleTest { private final BundleTestInfo bundleTestInfo; private Path here; - + @Rule public OsgiRule osgi = new OsgiRule(getFactory()); /** @@ -61,7 +61,7 @@ public abstract class AbstractLoadBundleTest { @Before public void before() throws BundleException { bundleContext = osgi.getFramework().getBundleContext(); - + here = Paths.get(".").toAbsolutePath().normalize(); } @@ -75,7 +75,7 @@ public abstract class AbstractLoadBundleTest { final Path corePath = here.resolveSibling("log4j-core").resolve("target").resolve("log4j-core-" + bundleTestInfo.getVersion() + ".jar"); return bundleContext.installBundle(corePath.toUri().toString()); } - + private Bundle getDummyBundle() throws BundleException { final Path dumyPath = here.resolveSibling("log4j-samples").resolve("log4j-samples-configuration").resolve("target").resolve("log4j-samples-configuration-" + bundleTestInfo.getVersion() + ".jar"); return bundleContext.installBundle(dumyPath.toUri().toString()); @@ -86,9 +86,9 @@ public abstract class AbstractLoadBundleTest { return bundleContext.installBundle(apiPath.toUri().toString()); } - + protected abstract FrameworkFactory getFactory(); - + private void log(final Bundle dummy) throws ReflectiveOperationException { // use reflection to log in the context of the dummy bundle @@ -131,7 +131,7 @@ public abstract class AbstractLoadBundleTest { private void start(final Bundle api, final Bundle core, final Bundle dummy) throws BundleException { api.start(); core.start(); - dummy.start(); + dummy.start(); } private void stop(final Bundle api, final Bundle core, final Bundle dummy) throws BundleException { @@ -139,7 +139,7 @@ public abstract class AbstractLoadBundleTest { core.stop(); api.stop(); } - + private void uninstall(final Bundle api, final Bundle core, final Bundle dummy) throws BundleException { dummy.uninstall(); core.uninstall(); @@ -154,37 +154,37 @@ public abstract class AbstractLoadBundleTest { final Bundle api = getApiBundle(); final Bundle core = getCoreBundle(); - + Assert.assertEquals("api is not in INSTALLED state", Bundle.INSTALLED, api.getState()); Assert.assertEquals("core is not in INSTALLED state", Bundle.INSTALLED, core.getState()); api.start(); core.start(); - - Assert.assertEquals("api is not in ACTIVE state", Bundle.ACTIVE, api.getState()); - Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState()); - + + Assert.assertEquals("api is not in ACTIVE state", Bundle.ACTIVE, api.getState()); + Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState()); + core.stop(); api.stop(); - + Assert.assertEquals("api is not in RESOLVED state", Bundle.RESOLVED, api.getState()); Assert.assertEquals("core is not in RESOLVED state", Bundle.RESOLVED, core.getState()); - + api.start(); core.start(); - - Assert.assertEquals("api is not in ACTIVE state", Bundle.ACTIVE, api.getState()); - Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState()); - + + Assert.assertEquals("api is not in ACTIVE state", Bundle.ACTIVE, api.getState()); + Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState()); + core.stop(); api.stop(); - + Assert.assertEquals("api is not in RESOLVED state", Bundle.RESOLVED, api.getState()); Assert.assertEquals("core is not in RESOLVED state", Bundle.RESOLVED, core.getState()); - + core.uninstall(); api.uninstall(); - + Assert.assertEquals("api is not in UNINSTALLED state", Bundle.UNINSTALLED, api.getState()); Assert.assertEquals("core is not in UNINSTALLED state", Bundle.UNINSTALLED, core.getState()); } @@ -223,7 +223,7 @@ public abstract class AbstractLoadBundleTest { core.stop(); api.stop(); - + core.uninstall(); api.uninstall(); } @@ -291,7 +291,7 @@ public abstract class AbstractLoadBundleTest { /** - * Tests the loading of the 1.2 Compatibility API bundle, its classes should be loadable from the Core bundle, + * Tests the loading of the 1.2 Compatibility API bundle, its classes should be loadable from the Core bundle, * and the class loader should be the same between a class from core and a class from compat */ @Test @@ -303,7 +303,7 @@ public abstract class AbstractLoadBundleTest { api.start(); core.start(); - + final Class<?> coreClassFromCore = core.loadClass("org.apache.logging.log4j.core.Core"); final Class<?> levelClassFrom12API = core.loadClass("org.apache.log4j.Level"); final Class<?> levelClassFromAPI = core.loadClass("org.apache.logging.log4j.Level"); @@ -313,7 +313,7 @@ public abstract class AbstractLoadBundleTest { core.stop(); api.stop(); - + uninstall(api, core, compat); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java ---------------------------------------------------------------------- diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java index 6832157..eef72e1 100644 --- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java +++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java @@ -58,7 +58,7 @@ public class OsgiRule extends ExternalResource { configMap.put("felix.log.level", "4"); configMap.put("eclipse.log.level", "ALL"); // Hack to get the build working on Windows. Could try newer versions of Felix. - configMap.put("felix.cache.locking", "false"); + configMap.put("felix.cache.locking", "false"); // Delegates loading of endorsed libraries to JVM classloader // config.put("org.osgi.framework.bootdelegation", "javax.*,org.w3c.*,org.xml.*"); framework = factory.newFramework(configMap); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java index 7bf5ba9..b9b8a7f 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java @@ -116,21 +116,21 @@ public class FileAppenderThrowableBenchmark { new Class<?>[]{Class.forName(FileAppenderThrowableBenchmark.class.getName() + "$TestIface" + (i % 31))}, new InvocationHandler() { @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { try { return method.invoke(delegate, args); - } catch (InvocationTargetException e) { + } catch (final InvocationTargetException e) { throw e.getCause(); } } }); } - } catch (ClassNotFoundException e) { + } catch (final ClassNotFoundException e) { throw new IllegalStateException("Failed to create stack", e); } try { helper.action(); - } catch (IllegalStateException e) { + } catch (final IllegalStateException e) { return e; } throw new IllegalStateException("Failed to create throwable"); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java index 0d36c21..df5d494 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java @@ -164,7 +164,7 @@ public class LoggerConfigBenchmark { processLogEvent(event); } } - + volatile LoggerConfigBenchmark loggerConfig = this; /** @@ -186,7 +186,7 @@ public class LoggerConfigBenchmark { /** * Determine if the LogEvent should be processed or ignored. - * + * * @param event The LogEvent. * @return true if the LogEvent should be processed. */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java index 865f925..774a5a5 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java @@ -68,8 +68,8 @@ public class StringBuilderEscapeBenchmark { return state.buffer.length(); } - private static String repeat(String str, int times) { - StringBuilder sb = new StringBuilder(str.length() * times); + private static String repeat(final String str, final int times) { + final StringBuilder sb = new StringBuilder(str.length() * times); for (int i = 0; i < times; i++) { sb.append(str); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java index beb1456..9e5a3e4 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java @@ -177,7 +177,7 @@ public class ThreadLocalVsPoolBenchmark { } /** - * + * */ abstract class ObjectPool<T> { private final Deque<T> pool = new ConcurrentLinkedDeque<>(); @@ -195,7 +195,7 @@ abstract class ObjectPool<T> { } /** - * + * */ class StringBuilderPool extends ObjectPool<StringBuilder> { private final int initialSize; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java index 885c357..c28d398 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java @@ -67,7 +67,7 @@ public class ThreadsafeDateFormatBenchmark { private final FastDateFormat fastDateFormat = FastDateFormat.getInstance("HH:mm:ss.SSS"); private final FixedDateFormat fixedDateFormat = FixedDateFormat.createIfSupported("HH:mm:ss.SSS"); private final FormatterFixedReuseBuffer formatFixedReuseBuffer = new FormatterFixedReuseBuffer(); - + private class CachedTimeFastFormat { private final long timestamp; private final String formatted; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java index 74e76f7..a6b3db9 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java @@ -172,7 +172,7 @@ public class TimeFormatBenchmark { // Do subtract to get remainder instead of doing % 10 buffer[pos++] = ((char) (hour - 10 * temp + '0')); - buffer[pos++] = ((char) ':'); + buffer[pos++] = (':'); // Minute // 13/128 is nearly the same as /10 for values up to 65 @@ -181,14 +181,14 @@ public class TimeFormatBenchmark { // Do subtract to get remainder instead of doing % 10 buffer[pos++] = ((char) (minute - 10 * temp + '0')); - buffer[pos++] = ((char) ':'); + buffer[pos++] = (':'); // Second // 13/128 is nearly the same as /10 for values up to 65 temp = (second * 13) >> 7; buffer[pos++] = ((char) (temp + '0')); buffer[pos++] = ((char) (second - 10 * temp + '0')); - buffer[pos++] = ((char) '.'); + buffer[pos++] = ('.'); // Millisecond // 41/4096 is nearly the same as /100 @@ -227,7 +227,7 @@ public class TimeFormatBenchmark { // Do subtract to get remainder instead of doing % 10 buffer.append((char) (hours - 10 * temp + '0')); - buffer.append((char) ':'); + buffer.append(':'); // Minute temp = minutes / 10; @@ -235,13 +235,13 @@ public class TimeFormatBenchmark { // Do subtract to get remainder instead of doing % 10 buffer.append((char) (minutes - 10 * temp + '0')); - buffer.append((char) ':'); + buffer.append(':'); // Second temp = seconds / 10; buffer.append((char) (temp + '0')); buffer.append((char) (seconds - 10 * temp + '0')); - buffer.append((char) '.'); + buffer.append('.'); // Millisecond temp = ms / 100; @@ -279,7 +279,7 @@ public class TimeFormatBenchmark { // Do subtract to get remainder instead of doing % 10 buffer[pos++] = ((char) (hours - 10 * temp + '0')); - buffer[pos++] = ((char) ':'); + buffer[pos++] = (':'); // Minute temp = minutes / 10; @@ -287,13 +287,13 @@ public class TimeFormatBenchmark { // Do subtract to get remainder instead of doing % 10 buffer[pos++] = ((char) (minutes - 10 * temp + '0')); - buffer[pos++] = ((char) ':'); + buffer[pos++] = (':'); // Second temp = seconds / 10; buffer[pos++] = ((char) (temp + '0')); buffer[pos++] = ((char) (seconds - 10 * temp + '0')); - buffer[pos++] = ((char) '.'); + buffer[pos++] = ('.'); // Millisecond temp = ms / 100; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java ---------------------------------------------------------------------- diff --git a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java index fcf1d66..e7865a8 100644 --- a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java +++ b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java @@ -32,7 +32,7 @@ public class Log4jLoggerFactory extends AbstractLoggerAdapter<Logger> implements private static final String PACKAGE = "org.slf4j"; private final Log4jMarkerFactory markerFactory; - public Log4jLoggerFactory(Log4jMarkerFactory markerFactory) { + public Log4jLoggerFactory(final Log4jMarkerFactory markerFactory) { this.markerFactory = markerFactory; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java index 05ccbfa..e8cba90 100644 --- a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java +++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.LifeCycle; * access to them. */ interface Log4jWebLifeCycle extends Log4jWebSupport, LifeCycle { - + /** * Starts up Log4j in the web application. Calls {@link #setLoggerContext()} after initialization is complete. * http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java index ddbc799..b3c47e2 100644 --- a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java +++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java @@ -67,7 +67,7 @@ public class ServletAppender extends AbstractAppender { /** * Logs with {@link ServletContext#log(String, Throwable)} if true and with {@link ServletContext#log(String)} if false. - * + * * @return whether to log a Throwable with the servlet context. */ public boolean isLogThrowables() { @@ -82,7 +82,7 @@ public class ServletAppender extends AbstractAppender { } } - + @PluginBuilderFactory public static <B extends Builder<B>> B newBuilder() { return new Builder<B>().asBuilder(); @@ -90,7 +90,7 @@ public class ServletAppender extends AbstractAppender { private final ServletContext servletContext; private final boolean logThrowables; - + private ServletAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter, final ServletContext servletContext, final boolean ignoreExceptions, final boolean logThrowables) { super(name, filter, layout, ignoreExceptions, Property.EMPTY_ARRAY);
