Repository: logging-log4j2 Updated Branches: refs/heads/master 95132eb37 -> b283e3b42
Add missing @Overrides (except for special Java 6 JDBC case). Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b283e3b4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b283e3b4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b283e3b4 Branch: refs/heads/master Commit: b283e3b4212126da9b069f1d4e22fadd10256065 Parents: 95132eb Author: Gary Gregory <[email protected]> Authored: Sat Sep 27 08:36:33 2014 -0400 Committer: Gary Gregory <[email protected]> Committed: Sat Sep 27 08:36:33 2014 -0400 ---------------------------------------------------------------------- .../org/apache/logging/log4j/message/ObjectMessageTest.java | 1 + .../apache/logging/log4j/message/ThreadDumpMessageTest.java | 1 + .../logging/log4j/core/appender/MemoryMappedFileManager.java | 1 + .../log4j/core/appender/db/AbstractDatabaseManager.java | 1 + .../appender/rolling/RollingRandomAccessFileManager.java | 1 + .../java/org/apache/logging/log4j/core/tools/Generate.java | 8 ++++++++ .../logging/log4j/test/appender/UsesLoggingAppender.java | 1 + 7 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b283e3b4/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java index 25c491a..e0a4c49 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMessageTest.java @@ -78,6 +78,7 @@ public class ObjectMessageTest { @Test public void testDeserializeNonSerializableParamEqualIfToStringSame() { class NonSerializable { + @Override public boolean equals(final Object other) { return other instanceof NonSerializable; // a very lenient equals() } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b283e3b4/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java index d8f0930..5143611 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java @@ -79,6 +79,7 @@ public class ThreadDumpMessageTest { final String[] actual = new String[1]; final Thread other = new Thread("OtherThread") { + @Override public void run() { actual[0] = msg.getFormattedMessage(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b283e3b4/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java index 431562b..626c150 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java @@ -177,6 +177,7 @@ public class MemoryMappedFileManager extends OutputStreamManager { private static void unsafeUnmap(final MappedByteBuffer mbb) throws PrivilegedActionException { AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws Exception { final Method getCleanerMethod = mbb.getClass().getMethod("cleaner"); getCleanerMethod.setAccessible(true); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b283e3b4/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java index 8cff0d6..fa4cb2a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java @@ -134,6 +134,7 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements * This method is called automatically when the buffer size reaches its maximum or at the beginning of a call to * {@link #shutdown()}. It can also be called manually to flush events to the database. */ + @Override public final synchronized void flush() { if (this.isRunning() && this.buffer.size() > 0) { this.connectAndStart(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b283e3b4/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java index 7def988..63dcef5 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java @@ -149,6 +149,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager { * Returns the buffer capacity. * @return the buffer size */ + @Override public int getBufferSize() { return buffer.capacity(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b283e3b4/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java index 721e156..da0d2f5 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java @@ -47,6 +47,7 @@ public final class Generate { static enum Type { CUSTOM { + @Override String imports() { return "" // + "import java.io.Serializable;%n" // @@ -60,6 +61,7 @@ public final class Generate { + "%n"; } + @Override String declaration() { return "" // + "/**%n" // @@ -73,6 +75,7 @@ public final class Generate { ; } + @Override String constructor() { return "" // + "%n" // @@ -82,11 +85,13 @@ public final class Generate { ; } + @Override Class<?> generator() { return CustomLogger.class; } }, EXTEND { + @Override String imports() { return "" // + "import org.apache.logging.log4j.Level;%n" // @@ -99,6 +104,7 @@ public final class Generate { + "%n"; } + @Override String declaration() { return "" // + "/**%n" // @@ -112,6 +118,7 @@ public final class Generate { ; } + @Override String constructor() { return "" // + "%n" // @@ -122,6 +129,7 @@ public final class Generate { ; } + @Override Class<?> generator() { return ExtendedLogger.class; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b283e3b4/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java index 4e7da9e..0cfb197 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java @@ -57,6 +57,7 @@ public final class UsesLoggingAppender extends AbstractAppender { return new UsesLoggingAppender(name, filter, layout, ignoreExceptions); } + @Override public void append(final LogEvent event) { try { for (int i = 0; i < 50; i++) {
