Fix compilation errors
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/86934ca4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/86934ca4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/86934ca4 Branch: refs/heads/LOG4J2-1365 Commit: 86934ca41c41bb4cfc950b8fc1e65b0aab374ef6 Parents: 86f30cf Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Mon Apr 18 13:37:31 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Mon Apr 18 13:37:31 2016 +0200 ---------------------------------------------------------------------- .../test/java/org/apache/logging/log4j/AbstractLoggerTest.java | 6 +++--- .../org/apache/logging/log4j/core/TimestampMessageTest.java | 3 ++- .../log4j/core/async/AsyncLoggerTimestampMessageTest.java | 3 ++- .../org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/86934ca4/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java index 3fd165d..d973610 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java @@ -165,7 +165,7 @@ public class AbstractLoggerTest extends AbstractLogger { @Override public boolean isEnabled(final Level level, final Marker marker, final CharSequence data, final Throwable t) { charSeqCount++; - return isEnabled(level, marker, new SimpleMessage(data), t); + return isEnabled(level, marker, (Message) new SimpleMessage(data), t); } @Override @@ -176,7 +176,7 @@ public class AbstractLoggerTest extends AbstractLogger { @Override public boolean isEnabled(final Level level, final Marker marker, final String data) { - return isEnabled(level, marker, new SimpleMessage(data), null); + return isEnabled(level, marker, (Message) new SimpleMessage(data), null); } @Override @@ -255,7 +255,7 @@ public class AbstractLoggerTest extends AbstractLogger { @Override public boolean isEnabled(final Level level, final Marker marker, final String data, final Throwable t) { - return isEnabled(level, marker, new SimpleMessage(data), t); + return isEnabled(level, marker, (Message) new SimpleMessage(data), t); } @Override http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/86934ca4/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java index d76e613..60d643b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/TimestampMessageTest.java @@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.util.ClockFactory; import org.apache.logging.log4j.core.util.ClockFactoryTest; import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.message.TimestampMessage; import org.apache.logging.log4j.test.appender.ListAppender; @@ -67,7 +68,7 @@ public class TimestampMessageTest { @Test public void testTimestampMessage() { final Logger log = context.getLogger("TimestampMessageTest"); - log.info(new TimeMsg("Message with embedded timestamp", 123456789000L)); + log.info((Message) new TimeMsg("Message with embedded timestamp", 123456789000L)); final List<String> msgs = app.getMessages(); assertNotNull(msgs); assertEquals(1, msgs.size()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/86934ca4/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java index 34198a0..e540353 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTimestampMessageTest.java @@ -28,6 +28,7 @@ import org.apache.logging.log4j.core.util.Clock; import org.apache.logging.log4j.core.util.ClockFactory; import org.apache.logging.log4j.core.util.ClockFactoryTest; import org.apache.logging.log4j.core.util.Constants; +import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.message.TimestampMessage; import org.apache.logging.log4j.util.Strings; @@ -69,7 +70,7 @@ public class AsyncLoggerTimestampMessageTest { file.delete(); final Logger log = LogManager.getLogger("com.foo.Bar"); assertFalse(PoisonClock.called); - log.info(new TimeMsg("Async logger msg with embedded timestamp", 123456789000L)); + log.info((Message) new TimeMsg("Async logger msg with embedded timestamp", 123456789000L)); assertTrue(PoisonClock.called); CoreLoggerContexts.stopLoggerContext(false, file); // stop async thread http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/86934ca4/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java index 8d1f189..37814c7 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java @@ -25,6 +25,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.DefaultConfiguration; +import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.SimpleMessage; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; @@ -92,7 +93,7 @@ public class SimpleBenchmark { @OutputTimeUnit(TimeUnit.SECONDS) @Benchmark public void testDebugMessageDisabledThroughput(final Blackhole bh) { - logger.debug(new SimpleMessage(msg)); + logger.debug((Message) new SimpleMessage(msg)); } @BenchmarkMode(Mode.SampleTime) @@ -126,6 +127,6 @@ public class SimpleBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) @Benchmark public void testDebugDisabledMessageResponseTime(final Blackhole bh) { - logger.debug(new SimpleMessage(msg)); + logger.debug((Message) new SimpleMessage(msg)); } }