Repository: logging-log4j2 Updated Branches: refs/heads/master f645d04b7 -> f3eeb562f
Add missing '@Override' annotations. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f3eeb562 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f3eeb562 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f3eeb562 Branch: refs/heads/master Commit: f3eeb562f32faa49a29b09958df1663b2742bb7b Parents: f645d04 Author: ggregory <[email protected]> Authored: Fri Sep 18 22:21:58 2015 -0700 Committer: ggregory <[email protected]> Committed: Fri Sep 18 22:21:58 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/util/NanoClockFactory.java | 2 ++ .../apache/logging/log4j/core/config/JiraLog4j2_1100JsonTest.java | 1 + .../apache/logging/log4j/core/config/JiraLog4j2_1100XmlTest.java | 1 + .../logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java | 1 + .../logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java | 1 + 5 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f3eeb562/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClockFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClockFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClockFactory.java index 73e3be8..1eca7af 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClockFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClockFactory.java @@ -32,6 +32,7 @@ public class NanoClockFactory { * Creates dummy nano clocks that always return a fixed value. */ Dummy { + @Override public NanoClock createNanoClock() { return new DummyNanoClock(); } @@ -40,6 +41,7 @@ public class NanoClockFactory { * Creates real nano clocks which call {{System.nanoTime()}}. */ System { + @Override public NanoClock createNanoClock() { return new SystemNanoClock(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f3eeb562/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100JsonTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100JsonTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100JsonTest.java index 928d093..76c0c7e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100JsonTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100JsonTest.java @@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.config; public class JiraLog4j2_1100JsonTest extends AbstractLog4j2_1100Test { + @Override protected String getConfigurationResource() { return "LOG4J2-1100/log4j2.json"; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f3eeb562/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100XmlTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100XmlTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100XmlTest.java index bb53619..8e3aa9c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100XmlTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100XmlTest.java @@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.config; public class JiraLog4j2_1100XmlTest extends AbstractLog4j2_1100Test { + @Override protected String getConfigurationResource() { return "LOG4J2-1100/log4j2.xml"; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f3eeb562/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java index 8a1be96..9890770 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java @@ -22,6 +22,7 @@ import org.junit.Ignore; @Ignore public class JiraLog4j2_1100YamlBadTest extends AbstractLog4j2_1100Test { + @Override protected String getConfigurationResource() { return "LOG4J2-1100/log4j2-good.yaml"; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f3eeb562/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java index da1be0d..7138c6c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java @@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.config; public class JiraLog4j2_1100YamlGoodTest extends AbstractLog4j2_1100Test { + @Override protected String getConfigurationResource() { return "LOG4J2-1100/log4j2-good.yaml"; }
