Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2EFE310738 for ; Thu, 30 Jan 2014 04:21:39 +0000 (UTC) Received: (qmail 1889 invoked by uid 500); 30 Jan 2014 04:21:39 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 1859 invoked by uid 500); 30 Jan 2014 04:21:36 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 1852 invoked by uid 99); 30 Jan 2014 04:21:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jan 2014 04:21:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jan 2014 04:21:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3FE872388860; Thu, 30 Jan 2014 04:21:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1562689 - in /logging/log4j/log4j2/trunk: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ log4j-core/src/main/java/org/apache/logging/log4j/core/async/ log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ lo... Date: Thu, 30 Jan 2014 04:21:13 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140130042114.3FE872388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Thu Jan 30 04:21:13 2014 New Revision: 1562689 URL: http://svn.apache.org/r1562689 Log: Add missing '@Override' annotations. Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTCPSyslogServer.java logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUDPSyslogServer.java logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java?rev=1562689&r1=1562688&r2=1562689&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java Thu Jan 30 04:21:13 2014 @@ -123,6 +123,7 @@ public final class FactoryMethodConnecti } // method must be present to compile on Java 7, @Override must be absent to compile on Java 6 + @Override @SuppressWarnings("unused") public java.util.logging.Logger getParentLogger() { throw new UnsupportedOperationException(); Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java?rev=1562689&r1=1562688&r2=1562689&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java Thu Jan 30 04:21:13 2014 @@ -85,11 +85,13 @@ public class AsyncLogger extends Logger static enum ThreadNameStrategy { // LOG4J2-467 CACHED { + @Override public String getThreadName(Info info) { return info.cachedThreadName; } }, UNCACHED { + @Override public String getThreadName(Info info) { return Thread.currentThread().getName(); } @@ -156,6 +158,7 @@ public class AsyncLogger extends Logger */ private static void initInfoForExecutorThread() { executor.submit(new Runnable(){ + @Override public void run() { final boolean isAppenderThread = true; final Info info = new Info(new RingBufferLogEventTranslator(), // Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java?rev=1562689&r1=1562688&r2=1562689&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java Thu Jan 30 04:21:13 2014 @@ -289,6 +289,7 @@ class AsyncLoggerConfigHelper { */ private static void initThreadLocalForExecutorThread() { executor.submit(new Runnable(){ + @Override public void run() { isAppenderThread.set(Boolean.TRUE); } Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java?rev=1562689&r1=1562688&r2=1562689&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java Thu Jan 30 04:21:13 2014 @@ -53,10 +53,12 @@ public class RingBufferAdmin implements } } + @Override public long getBufferSize() { return ringBuffer.getBufferSize(); } + @Override public long getRemainingCapacity() { return ringBuffer.remainingCapacity(); } Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTCPSyslogServer.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTCPSyslogServer.java?rev=1562689&r1=1562688&r2=1562689&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTCPSyslogServer.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTCPSyslogServer.java Thu Jan 30 04:21:13 2014 @@ -31,6 +31,7 @@ public class MockTCPSyslogServer extends sock = new ServerSocket(port); } + @Override public void shutdown() { this.shutdown = true; try { Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java?rev=1562689&r1=1562688&r2=1562689&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java Thu Jan 30 04:21:13 2014 @@ -127,6 +127,7 @@ public class MockTLSSyslogServer extends return count == loopLen; } + @Override public List getMessageList() { return messageList; } Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUDPSyslogServer.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUDPSyslogServer.java?rev=1562689&r1=1562688&r2=1562689&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUDPSyslogServer.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUDPSyslogServer.java Thu Jan 30 04:21:13 2014 @@ -30,6 +30,7 @@ public class MockUDPSyslogServer extends this.socket = new DatagramSocket(port); } + @Override public void shutdown() { this.shutdown = true; thread.interrupt(); Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java?rev=1562689&r1=1562688&r2=1562689&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java Thu Jan 30 04:21:13 2014 @@ -299,6 +299,7 @@ public class FlumePersistentAppenderTest this.stop = stop; } + @Override public void run() { for (int i = start; i < stop; ++i) { final StructuredDataMessage msg = new StructuredDataMessage( @@ -319,6 +320,7 @@ public class FlumePersistentAppenderTest this.stop = stop; this.fields = fields; } + @Override public void run() { for (int i = start; i < stop; ++i) {