Repository: james-project Updated Branches: refs/heads/master 34d63025e -> 67e44d268
JAMES-2113 Get a ride of MockLogger Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a13597f1 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a13597f1 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a13597f1 Branch: refs/heads/master Commit: a13597f12923477516ebc70a1f17289d2a854748 Parents: 34d6302 Author: benwa <btell...@linagora.com> Authored: Thu Aug 10 16:22:39 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Thu Aug 17 11:20:25 2017 +0700 ---------------------------------------------------------------------- protocols/api/pom.xml | 3 - .../james/protocols/api/utils/MockLogger.java | 129 ------------------- protocols/lmtp/pom.xml | 9 +- .../protocols/lmtp/AbstractLMTPServerTest.java | 8 +- protocols/pom.xml | 5 + protocols/pop3/pom.xml | 4 + .../protocols/pop3/AbstractPOP3ServerTest.java | 7 +- .../pop3/AbstractStartTlsPOP3ServerTest.java | 7 +- protocols/smtp/pom.xml | 4 + .../protocols/smtp/AbstractSMTPServerTest.java | 10 +- .../smtp/netty/NettyStartTlsSMTPServerTest.java | 7 +- .../smtp/utils/BaseFakeSMTPSession.java | 5 +- 12 files changed, 50 insertions(+), 148 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/api/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/api/pom.xml b/protocols/api/pom.xml index 8d0f0fd..d0c9fe3 100644 --- a/protocols/api/pom.xml +++ b/protocols/api/pom.xml @@ -46,12 +46,9 @@ <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </dependency> - <!-- Logging frameworks - completely optional --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <scope>compile</scope> - <optional>true</optional> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/api/src/test/java/org/apache/james/protocols/api/utils/MockLogger.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/test/java/org/apache/james/protocols/api/utils/MockLogger.java b/protocols/api/src/test/java/org/apache/james/protocols/api/utils/MockLogger.java deleted file mode 100644 index ef19a27..0000000 --- a/protocols/api/src/test/java/org/apache/james/protocols/api/utils/MockLogger.java +++ /dev/null @@ -1,129 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james.protocols.api.utils; - -import org.apache.james.protocols.api.logger.Logger; - -public class MockLogger implements Logger { - - public String getName() { - return "MockLogger to System out"; - } - - public boolean isTraceEnabled() { - return true; - } - - public void trace(String msg) { - SysPrint(msg); - } - - public void trace(String msg, Throwable t) { - SysPrint(msg, t); - } - - public boolean isDebugEnabled() { - return true; - } - - public void debug(String msg) { - SysPrint(msg); - } - - public void debug(String msg, Throwable t) { - SysPrint(msg, t); - } - - public boolean isInfoEnabled() { - return true; - } - - public void info(String msg) { - SysPrint(msg); - } - - public void info(String msg, Throwable t) { - SysPrint(msg, t); - } - - public boolean isWarnEnabled() { - return true; - } - - public void warn(String msg) { - SysPrint(msg); - } - - public void warn(String msg, Throwable t) { - SysPrint(msg, t); - } - - public boolean isErrorEnabled() { - return true; - } - - public void error(String msg) { - SysPrint(msg); - } - - public void error(String msg, Throwable t) { - SysPrint(msg, t); - } - - private void SysPrint(String msg, Object... obj) { - if (obj != null) { - Throwable t = null; - StringBuffer s = new StringBuffer(msg); - s.append(" args=["); - boolean first = true; - for (Object o : obj) { - if (o instanceof Throwable) { - t = (Throwable) o; - } else { - if (first) { - s.append(o.toString()); - first = false; - } else { - s.append(", ").append(o.toString()); - } - } - } - s.append("]"); - System.out.println(s.toString()); - if (t != null) { - t.printStackTrace(); - } - } else { - System.out.println(msg); - } - } - - public boolean isFatalEnabled() { - return true; - } - - public void fatal(String message) { - SysPrint(message); - } - - public void fatal(String message, Throwable t) { - SysPrint(message, t); - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/lmtp/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml index fcf4824..c0f8404 100644 --- a/protocols/lmtp/pom.xml +++ b/protocols/lmtp/pom.xml @@ -43,8 +43,8 @@ <artifactId>protocols-smtp</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> <scope>test</scope> </dependency> <dependency> @@ -57,6 +57,11 @@ <artifactId>javax.inject</artifactId> </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.james.protocols</groupId> <artifactId>protocols-netty</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java index 7f76506..26a6ba8 100644 --- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java +++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java @@ -38,7 +38,7 @@ import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.api.handler.ProtocolHandler; import org.apache.james.protocols.api.handler.WiringException; -import org.apache.james.protocols.api.utils.MockLogger; +import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter; import org.apache.james.protocols.api.utils.ProtocolServerUtils; import org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook; import org.apache.james.protocols.smtp.AbstractSMTPServerTest; @@ -52,9 +52,13 @@ import org.apache.james.protocols.smtp.hook.MessageHook; import org.apache.james.protocols.smtp.utils.TestMessageHook; import org.junit.Ignore; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{ + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractLMTPServerTest.class); + @Override protected Protocol createProtocol(ProtocolHandler... handlers) throws WiringException { LMTPProtocolHandlerChain chain = new LMTPProtocolHandlerChain(); @@ -68,7 +72,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{ } chain.addAll(0, hList); chain.wireExtensibleHandlers(); - return new SMTPProtocol(chain, new LMTPConfigurationImpl(), new MockLogger()); + return new SMTPProtocol(chain, new LMTPConfigurationImpl(), new ProtocolLoggerAdapter(LOGGER)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/pom.xml b/protocols/pom.xml index 02bb164..d996f0a 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -127,6 +127,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>1.1.7</version> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>${commons-codec.version}</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/pop3/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml index 3872ff3..777fbc9 100644 --- a/protocols/pop3/pom.xml +++ b/protocols/pop3/pom.xml @@ -39,6 +39,10 @@ <artifactId>protocols-api</artifactId> </dependency> <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </dependency> + <dependency> <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java index 1b6098d..e74aee6 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java @@ -34,7 +34,7 @@ import org.apache.commons.net.pop3.POP3Reply; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.api.handler.WiringException; -import org.apache.james.protocols.api.utils.MockLogger; +import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter; import org.apache.james.protocols.api.utils.ProtocolServerUtils; import org.apache.james.protocols.pop3.core.AbstractApopCmdHandler; import org.apache.james.protocols.pop3.core.AbstractPassCmdHandler; @@ -43,14 +43,17 @@ import org.apache.james.protocols.pop3.utils.MockMailbox; import org.apache.james.protocols.pop3.utils.MockMailbox.Message; import org.apache.james.protocols.pop3.utils.TestPassCmdHandler; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractPOP3ServerTest { private static final Message MESSAGE1 = new Message("Subject: test\r\nX-Header: value\r\n", "My Body\r\n"); private static final Message MESSAGE2 = new Message("Subject: test2\r\nX-Header: value2\r\n", "My Body with a DOT.\r\n.\r\n"); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPOP3ServerTest.class); private POP3Protocol createProtocol(AbstractPassCmdHandler handler) throws WiringException { - return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration(), new MockLogger()); + return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration(), new ProtocolLoggerAdapter(LOGGER)); } protected abstract ProtocolServer createServer(Protocol protocol); http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java index 128e388..d660145 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java @@ -30,22 +30,25 @@ import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.api.handler.WiringException; +import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter; import org.apache.james.protocols.api.utils.BogusSslContextFactory; import org.apache.james.protocols.api.utils.BogusTrustManagerFactory; -import org.apache.james.protocols.api.utils.MockLogger; import org.apache.james.protocols.api.utils.ProtocolServerUtils; import org.apache.james.protocols.pop3.core.AbstractPassCmdHandler; import org.apache.james.protocols.pop3.utils.MockMailbox; import org.apache.james.protocols.pop3.utils.TestPassCmdHandler; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractStartTlsPOP3ServerTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int RANDOM_PORT = 0; + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStartTlsPOP3ServerTest.class); private POP3Protocol createProtocol(AbstractPassCmdHandler handler) throws WiringException { - return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration(), new MockLogger()); + return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration(), new ProtocolLoggerAdapter(LOGGER)); } protected POP3SClient createClient() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/smtp/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml index b1dcfd7..c9918bb 100644 --- a/protocols/smtp/pom.xml +++ b/protocols/smtp/pom.xml @@ -57,6 +57,10 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java index aca46ff..e3504e6 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java @@ -43,7 +43,7 @@ import org.apache.james.protocols.api.handler.ConnectHandler; import org.apache.james.protocols.api.handler.DisconnectHandler; import org.apache.james.protocols.api.handler.ProtocolHandler; import org.apache.james.protocols.api.handler.WiringException; -import org.apache.james.protocols.api.utils.MockLogger; +import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter; import org.apache.james.protocols.api.utils.ProtocolServerUtils; import org.apache.james.protocols.smtp.hook.HeloHook; import org.apache.james.protocols.smtp.hook.HookResult; @@ -54,18 +54,20 @@ import org.apache.james.protocols.smtp.hook.RcptHook; import org.apache.james.protocols.smtp.utils.TestMessageHook; import org.apache.james.util.concurrency.ConcurrentTestRunner; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; import com.google.common.io.CharStreams; public abstract class AbstractSMTPServerTest { - + protected final static String MSG1 = "Subject: Testmessage\r\n\r\nThis is a message\r\n"; protected final static String SENDER = "me@sender"; protected final static String RCPT1 ="rpct1@domain"; protected final static String RCPT2 ="rpct2@domain"; + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSMTPServerTest.class); - @Test public void testSimpleDelivery() throws Exception { TestMessageHook hook = new TestMessageHook(); @@ -1102,7 +1104,7 @@ public abstract class AbstractSMTPServerTest { SMTPProtocolHandlerChain chain = new SMTPProtocolHandlerChain(new NoopMetricFactory()); chain.addAll(0, Arrays.asList(handlers)); chain.wireExtensibleHandlers(); - return new SMTPProtocol(chain, new SMTPConfigurationImpl(), new MockLogger()); + return new SMTPProtocol(chain, new SMTPConfigurationImpl(), new ProtocolLoggerAdapter(LOGGER)); } protected static void checkEnvelope(MailEnvelope env, String sender, List<String> recipients, String msg) throws IOException { http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java index 25e627e..accfb73 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java @@ -39,10 +39,10 @@ import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.api.handler.ProtocolHandler; import org.apache.james.protocols.api.handler.WiringException; +import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter; import org.apache.james.protocols.api.utils.BogusSSLSocketFactory; import org.apache.james.protocols.api.utils.BogusSslContextFactory; import org.apache.james.protocols.api.utils.BogusTrustManagerFactory; -import org.apache.james.protocols.api.utils.MockLogger; import org.apache.james.protocols.api.utils.ProtocolServerUtils; import org.apache.james.protocols.netty.AbstractChannelPipelineFactory; import org.apache.james.protocols.netty.NettyServer; @@ -54,6 +54,8 @@ import org.apache.james.protocols.smtp.utils.TestMessageHook; import org.assertj.core.api.AssertDelegateTarget; import org.junit.After; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Optional; import com.sun.mail.smtp.SMTPTransport; @@ -62,6 +64,7 @@ public class NettyStartTlsSMTPServerTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int RANDOM_PORT = 0; + private static final Logger LOGGER = LoggerFactory.getLogger(NettyStartTlsSMTPServerTest.class); private SMTPSClient smtpsClient = null; private ProtocolServer server = null; @@ -99,7 +102,7 @@ public class NettyStartTlsSMTPServerTest { chain.add(handler.get()); } chain.wireExtensibleHandlers(); - return new SMTPProtocol(chain, new SMTPConfigurationImpl(), new MockLogger()); + return new SMTPProtocol(chain, new SMTPConfigurationImpl(), new ProtocolLoggerAdapter(LOGGER)); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/a13597f1/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java index 5b2e371..7282c38 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java @@ -28,16 +28,17 @@ import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.LineHandler; import org.apache.james.protocols.api.logger.Logger; -import org.apache.james.protocols.api.utils.MockLogger; +import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter; import org.apache.james.protocols.smtp.SMTPConfiguration; import org.apache.james.protocols.smtp.SMTPSession; +import org.slf4j.LoggerFactory; /** * Abstract class to simplify the mocks */ public class BaseFakeSMTPSession implements SMTPSession { - private static final Logger log = new MockLogger(); + private static final Logger log = new ProtocolLoggerAdapter(LoggerFactory.getLogger(BaseFakeSMTPSession.class)); @Override public boolean needsCommandInjectionDetection() { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
