You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2015/10/21 09:05:52 UTC
[1/3] logging-log4j2 git commit: Use LoggerContextRule to simplify
test.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 080ce0f49 -> ed65b408c
Use LoggerContextRule to simplify test.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/96c38036
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/96c38036
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/96c38036
Branch: refs/heads/master
Commit: 96c38036801622e9af283349d6d7abc66b5b8277
Parents: 080ce0f
Author: Matt Sicker <bo...@gmail.com>
Authored: Wed Oct 21 02:04:47 2015 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Wed Oct 21 02:04:47 2015 -0500
----------------------------------------------------------------------
.../log4j/core/appender/AsyncAppenderTest.java | 32 +++++++-------------
1 file changed, 11 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96c38036/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
index 895e649..7a86e48 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
@@ -17,17 +17,15 @@
package org.apache.logging.log4j.core.appender;
import java.util.List;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LoggingException;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.ClassRule;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -37,23 +35,15 @@ import static org.junit.Assert.*;
*/
public class AsyncAppenderTest {
private static final String CONFIG = "log4j-asynch.xml";
- private static Configuration config;
- private static ListAppender listAppender;
- private static LoggerContext ctx;
- @BeforeClass
- public static void setupClass() {
- System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- ctx = LoggerContext.getContext(false);
- config = ctx.getConfiguration();
- listAppender = (ListAppender) config.getAppender("List");
- }
+ @ClassRule
+ public static LoggerContextRule context = new LoggerContextRule(CONFIG);
+
+ private ListAppender listAppender;
- @AfterClass
- public static void cleanupClass() {
- System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
- ctx.reconfigure();
- StatusLogger.getLogger().reset();
+ @Before
+ public void before() throws Exception {
+ listAppender = context.getListAppender("List");
}
@After
[3/3] logging-log4j2 git commit: Remove redundant casts.
Posted by ma...@apache.org.
Remove redundant casts.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ed65b408
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ed65b408
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ed65b408
Branch: refs/heads/master
Commit: ed65b408c4fab44850e8fd61191961c88149d4d5
Parents: 0b72e49
Author: Matt Sicker <bo...@gmail.com>
Authored: Wed Oct 21 02:06:04 2015 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Wed Oct 21 02:06:04 2015 -0500
----------------------------------------------------------------------
.../log4j/core/appender/RollingRandomAccessFileAppender.java | 2 +-
.../logging/log4j/core/appender/routing/RoutingAppender.java | 2 +-
.../java/org/apache/logging/log4j/core/layout/PatternLayout.java | 2 +-
.../java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java | 2 +-
.../log4j/core/pattern/ExtendedThrowablePatternConverter.java | 2 +-
.../logging/log4j/core/pattern/RootThrowablePatternConverter.java | 2 +-
.../log4j/core/appender/routing/JsonRoutingAppender2Test.java | 2 +-
.../log4j/core/appender/routing/JsonRoutingAppenderTest.java | 2 +-
.../log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java | 2 +-
.../log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java | 2 +-
.../log4j/core/config/plugins/util/PluginManagerPackagesTest.java | 2 +-
.../logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
index 4efdaa8..cf47d46 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
@@ -121,7 +121,7 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA
* @return the buffer size
*/
public int getBufferSize() {
- return ((RollingRandomAccessFileManager) getManager()).getBufferSize();
+ return getManager().getBufferSize();
}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
index d9b2818..02be2c2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
@@ -151,7 +151,7 @@ public final class RoutingAppender extends AbstractAppender {
final Node appNode = new Node(node);
config.createConfiguration(appNode, event);
if (appNode.getObject() instanceof Appender) {
- final Appender app = (Appender) appNode.getObject();
+ final Appender app = appNode.getObject();
app.start();
return app;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index 6c57820..28d6329 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -218,7 +218,7 @@ public final class PatternLayout extends AbstractStringLayout {
if (parser == null) {
parser = new PatternParser(config, KEY, LogEventPatternConverter.class);
config.addComponent(KEY, parser);
- parser = (PatternParser) config.getComponent(KEY);
+ parser = config.getComponent(KEY);
}
return parser;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
index 2009161..64aaa6d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
@@ -234,7 +234,7 @@ public final class Rfc5424Layout extends AbstractStringLayout {
if (parser == null) {
parser = new PatternParser(config, PatternLayout.KEY, ThrowablePatternConverter.class);
config.addComponent(COMPONENT_KEY, parser);
- parser = (PatternParser) config.getComponent(COMPONENT_KEY);
+ parser = config.getComponent(COMPONENT_KEY);
}
return parser;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
index 2357093..6ed8c22 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
@@ -61,7 +61,7 @@ public final class ExtendedThrowablePatternConverter extends ThrowablePatternCon
public void format(final LogEvent event, final StringBuilder toAppendTo) {
ThrowableProxy proxy = null;
if (event instanceof Log4jLogEvent) {
- proxy = ((Log4jLogEvent) event).getThrownProxy();
+ proxy = event.getThrownProxy();
}
final Throwable throwable = event.getThrown();
if ((throwable != null || proxy != null) && options.anyLines()) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
index 36f845f..e3e7d33 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
@@ -61,7 +61,7 @@ public final class RootThrowablePatternConverter extends ThrowablePatternConvert
public void format(final LogEvent event, final StringBuilder toAppendTo) {
ThrowableProxy proxy = null;
if (event instanceof Log4jLogEvent) {
- proxy = ((Log4jLogEvent) event).getThrownProxy();
+ proxy = event.getThrownProxy();
}
final Throwable throwable = event.getThrown();
if (throwable != null && options.anyLines()) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
index 03895ec..af7c078 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
@@ -46,7 +46,7 @@ public class JsonRoutingAppender2Test {
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
ctx = LoggerContext.getContext(false);
config = ctx.getConfiguration();
- listAppender = (ListAppender) config.getAppender("List");
+ listAppender = config.getAppender("List");
final File file = new File("target/rolling1/rollingtest-Unknown.log");
file.delete();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
index ccb29f6..45e5412 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
@@ -46,7 +46,7 @@ public class JsonRoutingAppenderTest {
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
ctx = LoggerContext.getContext(false);
config = ctx.getConfiguration();
- listAppender = (ListAppender) config.getAppender("List");
+ listAppender = config.getAppender("List");
final File file = new File("target/rolling1/rollingtest-Unknown.log");
file.delete();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java
index 0ae3895..ea52157 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java
@@ -44,7 +44,7 @@ public class AsyncLoggersWithAsyncAppenderTest {
System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, AsyncLoggerContextSelector.class.getName());
ctx = LoggerContext.getContext(false);
config = ctx.getConfiguration();
- listAppender = (ListAppender) config.getAppender("List");
+ listAppender = config.getAppender("List");
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
index 816e393..5bd60d1 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
@@ -44,7 +44,7 @@ public class AsyncLoggersWithAsyncLoggerConfigTest {
System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, AsyncLoggerContextSelector.class.getName());
ctx = LoggerContext.getContext(false);
config = ctx.getConfiguration();
- listAppender = (ListAppender) config.getAppender("List");
+ listAppender = config.getAppender("List");
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
index e1ccf74..2ebefe0 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
@@ -79,7 +79,7 @@ public class PluginManagerPackagesTest {
// with the packages element pointing to our custom plugin
ctx = Configurator.initialize("Test1", "customplugin/log4j2-741.xml");
config = ctx.getConfiguration();
- listAppender = (ListAppender) config.getAppender("List");
+ listAppender = config.getAppender("List");
final Logger logger = LogManager.getLogger(PluginManagerPackagesTest.class);
logger.info("this message is ignored");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed65b408/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
index ea4f2df..5c8c5cc 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
@@ -63,7 +63,7 @@ public class AsyncAppenderLogbackBenchmark {
@Setup(Level.Trial)
public void up() {
System.setProperty("logback.configurationFile", "perf-logback-async.xml");
- logger = (Logger) LoggerFactory.getLogger(getClass());
+ logger = LoggerFactory.getLogger(getClass());
}
@TearDown(Level.Trial)
[2/3] logging-log4j2 git commit: Remove redundant static finals in
interface.
Posted by ma...@apache.org.
Remove redundant static finals in interface.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0b72e494
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0b72e494
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0b72e494
Branch: refs/heads/master
Commit: 0b72e494d9ba98538a21676be90a8d7bd2048ef7
Parents: 96c3803
Author: Matt Sicker <bo...@gmail.com>
Authored: Wed Oct 21 02:05:12 2015 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Wed Oct 21 02:05:12 2015 -0500
----------------------------------------------------------------------
.../logging/log4j/core/async/perftest/IPerfTestRunner.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0b72e494/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java
index 2e4c32c..62bec14 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java
@@ -19,10 +19,10 @@ package org.apache.logging.log4j.core.async.perftest;
import com.lmax.disruptor.collections.Histogram;
public interface IPerfTestRunner {
- static final String LINE100 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890!\"#$%&'()-=^~|\\@`[]{};:+*,.<>/?_123456";
- static final String THROUGHPUT_MSG = LINE100 + LINE100 + LINE100 + LINE100
+ String LINE100 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890!\"#$%&'()-=^~|\\@`[]{};:+*,.<>/?_123456";
+ String THROUGHPUT_MSG = LINE100 + LINE100 + LINE100 + LINE100
+ LINE100;
- static final String LATENCY_MSG = "Short msg";
+ String LATENCY_MSG = "Short msg";
void runThroughputTest(int lines, Histogram histogram);