You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/24 03:46:46 UTC
[21/38] james-project git commit: JAMES-2114 Remove LOGGER from
PROTOCOL Session API
JAMES-2114 Remove LOGGER from PROTOCOL Session API
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4f14df4f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4f14df4f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4f14df4f
Branch: refs/heads/master
Commit: 4f14df4f43a9382a07999b727c7227684159c425
Parents: f0170de
Author: benwa <bt...@linagora.com>
Authored: Mon Aug 14 18:25:01 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Aug 24 10:34:43 2017 +0700
----------------------------------------------------------------------
.../apache/james/protocols/api/Protocol.java | 6 ----
.../james/protocols/api/ProtocolImpl.java | 11 ++-----
.../james/protocols/api/ProtocolSession.java | 9 +-----
.../protocols/api/ProtocolSessionImpl.java | 16 +---------
.../api/handler/CommandDispatcher.java | 14 +++++----
.../api/handler/CommandHandlerResultLogger.java | 24 +++++----------
.../protocols/lmtp/AbstractLMTPServerTest.java | 2 +-
.../netty/BasicChannelUpstreamHandler.java | 19 +++++-------
.../james/protocols/pop3/POP3Protocol.java | 7 ++---
.../james/protocols/pop3/POP3SessionImpl.java | 5 ++-
.../pop3/core/AbstractPassCmdHandler.java | 5 ++-
.../protocols/pop3/core/QuitCmdHandler.java | 6 ++--
.../protocols/pop3/core/RsetCmdHandler.java | 5 ++-
.../protocols/pop3/AbstractPOP3ServerTest.java | 2 +-
.../pop3/AbstractStartTlsPOP3ServerTest.java | 2 +-
.../james/protocols/smtp/SMTPProtocol.java | 7 ++---
.../james/protocols/smtp/SMTPSessionImpl.java | 5 ++-
.../smtp/core/AbstractHookableCmdHandler.java | 7 +++--
.../smtp/core/DataLineMessageHookHandler.java | 10 +++---
.../protocols/smtp/core/MailCmdHandler.java | 15 +++++----
.../smtp/core/PostmasterAbuseRcptHook.java | 5 ++-
.../protocols/smtp/core/RcptCmdHandler.java | 16 +++++-----
.../smtp/core/esmtp/AuthCmdHandler.java | 19 +++++++-----
.../smtp/core/esmtp/MailSizeEsmtpExtension.java | 16 ++++++----
.../core/fastfail/AbstractGreylistHandler.java | 15 +++++----
.../core/fastfail/AbstractValidRcptHandler.java | 8 +++--
.../smtp/core/fastfail/DNSRBLHandler.java | 21 +++++++------
.../smtp/core/fastfail/MaxRcptHandler.java | 5 ++-
.../smtp/core/fastfail/SpamTrapHandler.java | 9 ++++--
.../fastfail/SupressDuplicateRcptHandler.java | 5 ++-
.../smtp/core/log/HookResultLogger.java | 9 ++++--
.../protocols/smtp/AbstractSMTPServerTest.java | 2 +-
.../smtp/netty/NettyStartTlsSMTPServerTest.java | 2 +-
.../smtp/utils/BaseFakeSMTPSession.java | 11 -------
.../hook/MailboxDeliverToRecipientHandler.java | 6 ++--
.../james/lmtpserver/netty/LMTPServer.java | 4 +--
.../james/pop3server/netty/POP3Server.java | 2 +-
.../DataLineJamesMessageHookHandler.java | 17 ++++++-----
.../james/smtpserver/ExtendedSMTPSession.java | 2 +-
.../james/smtpserver/JamesDataCmdHandler.java | 5 ++-
.../james/smtpserver/SendMailHandler.java | 11 ++++---
.../james/smtpserver/SetMimeHeaderHandler.java | 5 ++-
.../org/apache/james/smtpserver/TLDLookup.java | 30 ++++--------------
.../smtpserver/UsersRepositoryAuthHook.java | 5 ++-
.../fastfail/JDBCGreylistHandler.java | 3 +-
.../james/smtpserver/fastfail/SPFHandler.java | 6 ++--
.../fastfail/SpamAssassinHandler.java | 7 +++--
.../smtpserver/fastfail/URIRBLHandler.java | 26 ++++++----------
.../james/smtpserver/fastfail/URIScanner.java | 32 ++++++++------------
.../smtpserver/fastfail/ValidRcptHandler.java | 11 ++++---
.../james/smtpserver/fastfail/ValidRcptMX.java | 6 +---
.../netty/SMTPChannelUpstreamHandler.java | 5 ++-
.../james/smtpserver/netty/SMTPServer.java | 4 +--
53 files changed, 241 insertions(+), 266 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java b/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java
index 23e7341..f4b74f3 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java
@@ -20,7 +20,6 @@
package org.apache.james.protocols.api;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
-import org.slf4j.Logger;
/**
* Define a protocol
@@ -50,9 +49,4 @@ public interface Protocol {
*/
ProtocolSession newSession(ProtocolTransport transport);
- /**
- * @return The logger associated with the protocol
- */
- Logger getProtocolLogger();
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
index a010c54..8c71cba 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
@@ -20,7 +20,6 @@
package org.apache.james.protocols.api;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
-import org.slf4j.Logger;
/**
* Basic {@link Protocol} implementation
@@ -29,12 +28,10 @@ import org.slf4j.Logger;
public abstract class ProtocolImpl implements Protocol{
private final ProtocolHandlerChain chain;
private final ProtocolConfiguration config;
- protected final Logger logger;
- public ProtocolImpl(ProtocolHandlerChain chain, ProtocolConfiguration config, Logger logger) {
+ public ProtocolImpl(ProtocolHandlerChain chain, ProtocolConfiguration config) {
this.chain = chain;
this.config = config;
- this.logger = logger;
}
/*
@@ -50,7 +47,7 @@ public abstract class ProtocolImpl implements Protocol{
* @see org.apache.james.protocols.api.Protocol#newSession(org.apache.james.protocols.api.ProtocolTransport)
*/
public ProtocolSession newSession(ProtocolTransport transport) {
- return new ProtocolSessionImpl(logger, transport, config);
+ return new ProtocolSessionImpl(transport, config);
}
/*
@@ -60,8 +57,4 @@ public abstract class ProtocolImpl implements Protocol{
public ProtocolConfiguration getConfiguration() {
return config;
}
-
- public Logger getProtocolLogger() {
- return logger;
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
index 6fc3609..bc48249 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
@@ -24,7 +24,6 @@ import java.nio.charset.Charset;
import java.util.Map;
import org.apache.james.protocols.api.handler.LineHandler;
-import org.slf4j.Logger;
/**
* Session for a protocol. Every new connection generates a new session
@@ -37,13 +36,7 @@ public interface ProtocolSession {
Connection,
Transaction
}
- /**
- * Gets the context sensitive log for this session.
- * @return log, not null
- */
- Logger getLogger();
-
-
+
/**
* Store the given value with the given key in the specified {@link State}. If you want to remove a value you need to use <code>null</code> as value
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
index 930a137..67859a8 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.james.protocols.api.handler.LineHandler;
-import org.slf4j.Logger;
/**
* Basic implementation of {@link ProtocolSession}
@@ -33,8 +32,6 @@ import org.slf4j.Logger;
*
*/
public class ProtocolSessionImpl implements ProtocolSession {
-
- private final Logger pLog;
private final ProtocolTransport transport;
private final Map<String, Object> connectionState;
private final Map<String, Object> sessionState;
@@ -43,13 +40,11 @@ public class ProtocolSessionImpl implements ProtocolSession {
private final static Charset CHARSET = Charset.forName("US-ASCII");
private final static String DELIMITER = "\r\n";
- public ProtocolSessionImpl(Logger logger, ProtocolTransport transport, ProtocolConfiguration config) {
+ public ProtocolSessionImpl(ProtocolTransport transport, ProtocolConfiguration config) {
this.transport = transport;
- this.pLog = logger;
this.connectionState = new HashMap<>();
this.sessionState = new HashMap<>();
this.config = config;
-
}
/*
@@ -105,15 +100,6 @@ public class ProtocolSessionImpl implements ProtocolSession {
return transport.isTLSStarted();
}
-
- /**
- * @see org.apache.james.protocols.api.ProtocolSession#getLogger()
- */
- public Logger getLogger() {
- return pLog;
- }
-
-
/**
* @see org.apache.james.protocols.api.ProtocolSession#getSessionID()
*/
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
index 0d296b0..00b87bf 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
@@ -37,7 +37,8 @@ import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.future.FutureResponse;
import org.apache.james.protocols.api.future.FutureResponseImpl;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -45,6 +46,7 @@ import org.apache.james.protocols.api.future.FutureResponseImpl;
*
*/
public class CommandDispatcher<Session extends ProtocolSession> implements ExtensibleHandler, LineHandler<Session> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CommandDispatcher.class);
/**
* The list of available command handlers
*/
@@ -99,8 +101,8 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten
if (command == null) {
return null;
}
- if (session.getLogger().isDebugEnabled()) {
- session.getLogger().debug("Lookup command handler for command: " + command);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Lookup command handler for command: " + command);
}
List<CommandHandler<Session>> handlers = commandHandlerMap.get(command);
if(handlers == null) {
@@ -157,7 +159,7 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten
}
return dispatchCommandHandlers(session, request);
} catch (Exception e) {
- session.getLogger().debug("Unable to parse request", e);
+ LOGGER.debug("Unable to parse request", e);
return session.newFatalErrorResponse();
}
@@ -173,8 +175,8 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten
* @return response
*/
protected Response dispatchCommandHandlers(Session session, Request request) {
- if (session.getLogger().isDebugEnabled()) {
- session.getLogger().debug(getClass().getName() + " received: " + request.getCommand());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(getClass().getName() + " received: " + request.getCommand());
}
List<CommandHandler<Session>> commandHandlers = getCommandHandlers(request.getCommand(), session);
// fetch the command handlers registered to the command
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
index 0d15cf6..37f0410 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
@@ -23,36 +23,26 @@ import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.Response;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
* {@link ProtocolHandlerResultHandler} which logs the {@link Response} of {@link CommandHandler}'s.
- *
- * By default it logs to {@link Logger#debug(String)}, but subclasses can override this by override {@link #log(ProtocolSession, Response, String)} method.
*
*/
public class CommandHandlerResultLogger implements ProtocolHandlerResultHandler<Response, ProtocolSession> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CommandHandlerResultLogger.class);
+
public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) {
if (handler instanceof CommandHandler) {
String logmessage = handler.getClass().getName() + ": " + response.toString();
-
- log(session, response, logmessage);
- }
- return response;
- }
- /**
- * Log the given logmessage
- *
- * @param session
- * @param response
- * @param logmessage
- */
- protected void log(ProtocolSession session, Response response, String logmessage) {
- if (session.getLogger().isDebugEnabled()) {
- session.getLogger().debug(logmessage);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(logmessage);
+ }
}
+ return response;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/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 2a7ccc7..f2badab 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
@@ -71,7 +71,7 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{
}
chain.addAll(0, hList);
chain.wireExtensibleHandlers();
- return new SMTPProtocol(chain, new LMTPConfigurationImpl(), LOGGER);
+ return new SMTPProtocol(chain, new LMTPConfigurationImpl());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
index 16d43cc..f052805 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
@@ -47,12 +47,14 @@ import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
import org.jboss.netty.handler.codec.frame.TooLongFrameException;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link ChannelUpstreamHandler} which is used by the SMTPServer and other line based protocols
*/
@Sharable
public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(BasicChannelUpstreamHandler.class);
protected final Protocol protocol;
protected final ProtocolHandlerChain chain;
protected final Encryption secure;
@@ -88,7 +90,7 @@ public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
List<ConnectHandler> connectHandlers = chain.getHandlers(ConnectHandler.class);
List<ProtocolHandlerResultHandler> resultHandlers = chain.getHandlers(ProtocolHandlerResultHandler.class);
ProtocolSession session = (ProtocolSession) ctx.getAttachment();
- session.getLogger().info("Connection established from " + session.getRemoteAddress().getAddress().getHostAddress());
+ LOGGER.info("Connection established from " + session.getRemoteAddress().getAddress().getHostAddress());
if (connectHandlers != null) {
for (ConnectHandler cHandler : connectHandlers) {
long start = System.currentTimeMillis();
@@ -98,7 +100,7 @@ public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
for (ProtocolHandlerResultHandler resultHandler : resultHandlers) {
// Disable till PROTOCOLS-37 is implemented
if (response instanceof FutureResponse) {
- session.getLogger().debug("ProtocolHandlerResultHandler are not supported for FutureResponse yet");
+ LOGGER.debug("ProtocolHandlerResultHandler are not supported for FutureResponse yet");
break;
}
resultHandler.onResponse(session, response, executionTime, cHandler);
@@ -155,7 +157,7 @@ public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
for (ProtocolHandlerResultHandler resultHandler : resultHandlers) {
// Disable till PROTOCOLS-37 is implemented
if (response instanceof FutureResponse) {
- pSession.getLogger().debug("ProtocolHandlerResultHandler are not supported for FutureResponse yet");
+ LOGGER.debug("ProtocolHandlerResultHandler are not supported for FutureResponse yet");
break;
}
response = resultHandler.onResponse(pSession, response, executionTime, lHandler);
@@ -176,7 +178,7 @@ public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
try (Closeable closeable = ProtocolMDCContext.from(protocol, ctx)) {
ProtocolSession session = (ProtocolSession) ctx.getAttachment();
- getLogger(session).info("Connection closed for " + session.getRemoteAddress().getAddress().getHostAddress());
+ LOGGER.info("Connection closed for " + session.getRemoteAddress().getAddress().getHostAddress());
cleanup(ctx);
super.channelClosed(ctx, e);
@@ -232,17 +234,10 @@ public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
}
transport.writeResponse(Response.DISCONNECT, session);
}
- getLogger(session).error("Unable to process request", e.getCause());
+ LOGGER.error("Unable to process request", e.getCause());
cleanup(ctx);
}
}
}
- private Logger getLogger(ProtocolSession session) {
- if (session != null) {
- return session.getLogger();
- }
- return protocol.getProtocolLogger();
- }
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java
index ab3ad92..058b0e1 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java
@@ -24,7 +24,6 @@ import org.apache.james.protocols.api.ProtocolImpl;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
-import org.slf4j.Logger;
/**
* {@link ProtocolImpl} which implements the POP3 Protocol
@@ -32,8 +31,8 @@ import org.slf4j.Logger;
*/
public class POP3Protocol extends ProtocolImpl{
- public POP3Protocol(ProtocolHandlerChain chain, ProtocolConfiguration config, Logger logger) {
- super(chain, config, logger);
+ public POP3Protocol(ProtocolHandlerChain chain, ProtocolConfiguration config) {
+ super(chain, config);
}
@Override
@@ -43,7 +42,7 @@ public class POP3Protocol extends ProtocolImpl{
@Override
public ProtocolSession newSession(ProtocolTransport transport) {
- return new POP3SessionImpl(logger, transport, getConfiguration());
+ return new POP3SessionImpl(transport, getConfiguration());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
index a473edd..2ac4be1 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java
@@ -23,7 +23,6 @@ import org.apache.james.protocols.api.ProtocolSessionImpl;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.pop3.mailbox.Mailbox;
-import org.slf4j.Logger;
/**
* {@link POP3Session} implementation which use Netty
@@ -36,8 +35,8 @@ public class POP3SessionImpl extends ProtocolSessionImpl implements POP3Session
private Mailbox mailbox;
- public POP3SessionImpl(Logger logger, ProtocolTransport transport, ProtocolConfiguration configData) {
- super(logger, transport, configData);
+ public POP3SessionImpl(ProtocolTransport transport, ProtocolConfiguration configData) {
+ super(transport, configData);
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
index cb8fb8e..ded19ed 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java
@@ -26,6 +26,8 @@ import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.pop3.POP3Response;
import org.apache.james.protocols.pop3.POP3Session;
import org.apache.james.protocols.pop3.mailbox.Mailbox;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableSet;
@@ -34,6 +36,7 @@ import com.google.common.collect.ImmutableSet;
*/
public abstract class AbstractPassCmdHandler extends RsetCmdHandler {
private static final Collection<String> COMMANDS = ImmutableSet.of("PASS");
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPassCmdHandler.class);
private static final Response UNEXPECTED_ERROR = new POP3Response(POP3Response.ERR_RESPONSE, "Unexpected error accessing mailbox").immutable();
protected static final Response AUTH_FAILED = new POP3Response(POP3Response.ERR_RESPONSE, "Authentication failed.").immutable();
@@ -78,7 +81,7 @@ public abstract class AbstractPassCmdHandler extends RsetCmdHandler {
return AUTH_FAILED;
}
} catch (Exception e) {
- session.getLogger().error("Unexpected error accessing mailbox for " + session.getUser(), e);
+ LOGGER.error("Unexpected error accessing mailbox for " + session.getUser(), e);
session.setHandlerState(POP3Session.AUTHENTICATION_READY);
return UNEXPECTED_ERROR;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
index 88d70cc..4c12f60 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java
@@ -32,6 +32,8 @@ import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.pop3.POP3Response;
import org.apache.james.protocols.pop3.POP3Session;
import org.apache.james.protocols.pop3.mailbox.Mailbox;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableSet;
@@ -39,8 +41,8 @@ import com.google.common.collect.ImmutableSet;
* Handles QUIT command
*/
public class QuitCmdHandler implements CommandHandler<POP3Session> {
-
private static final Collection<String> COMMANDS = ImmutableSet.of("QUIT");
+ private static final Logger LOGGER = LoggerFactory.getLogger(QuitCmdHandler.class);
private static final Response SIGN_OFF;
private static final Response SIGN_OFF_NOT_CLEAN;
@@ -82,7 +84,7 @@ public class QuitCmdHandler implements CommandHandler<POP3Session> {
response = SIGN_OFF;
} catch (Exception ex) {
response = SIGN_OFF_NOT_CLEAN;
- session.getLogger().error("Some deleted messages were not removed", ex);
+ LOGGER.error("Some deleted messages were not removed", ex);
}
try {
mailbox.close();
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
index 1b62acf..f99385f 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java
@@ -33,6 +33,8 @@ import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.pop3.POP3Response;
import org.apache.james.protocols.pop3.POP3Session;
import org.apache.james.protocols.pop3.mailbox.MessageMetaData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableSet;
@@ -41,6 +43,7 @@ import com.google.common.collect.ImmutableSet;
*/
public class RsetCmdHandler implements CommandHandler<POP3Session> {
private static final Collection<String> COMMANDS = ImmutableSet.of("RSET");
+ private static final Logger LOGGER = LoggerFactory.getLogger(RsetCmdHandler.class);
@Override
public void init(Configuration config) throws ConfigurationException {
@@ -81,7 +84,7 @@ public class RsetCmdHandler implements CommandHandler<POP3Session> {
} catch (IOException e) {
// In the event of an exception being thrown there may or may not be
// anything in userMailbox
- session.getLogger().error("Unable to STAT mail box ", e);
+ LOGGER.error("Unable to STAT mail box ", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/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 6595106..dda1f7f 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
@@ -52,7 +52,7 @@ public abstract class AbstractPOP3ServerTest {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPOP3ServerTest.class);
private POP3Protocol createProtocol(AbstractPassCmdHandler handler) throws WiringException {
- return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration(), LOGGER);
+ return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration());
}
protected abstract ProtocolServer createServer(Protocol protocol);
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/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 e556946..418f749 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
@@ -47,7 +47,7 @@ public abstract class AbstractStartTlsPOP3ServerTest {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStartTlsPOP3ServerTest.class);
private POP3Protocol createProtocol(AbstractPassCmdHandler handler) throws WiringException {
- return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration(), LOGGER);
+ return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration());
}
protected POP3SClient createClient() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
index 4e2ba67..cef7e4a 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
@@ -23,7 +23,6 @@ import org.apache.james.protocols.api.ProtocolImpl;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
-import org.slf4j.Logger;
/**
* {@link ProtocolImpl} which creates {@link SMTPSessionImpl} instances
@@ -32,13 +31,13 @@ import org.slf4j.Logger;
*/
public class SMTPProtocol extends ProtocolImpl {
- public SMTPProtocol(ProtocolHandlerChain chain, SMTPConfiguration config, Logger logger) {
- super(chain, config, logger);
+ public SMTPProtocol(ProtocolHandlerChain chain, SMTPConfiguration config) {
+ super(chain, config);
}
@Override
public ProtocolSession newSession(ProtocolTransport transport) {
- return new SMTPSessionImpl(logger, transport, (SMTPConfiguration) getConfiguration());
+ return new SMTPSessionImpl(transport, (SMTPConfiguration) getConfiguration());
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
index dbf8fdd..c5fad00 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
@@ -23,7 +23,6 @@ import java.util.Collection;
import org.apache.james.protocols.api.ProtocolSessionImpl;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.Response;
-import org.slf4j.Logger;
/**
* {@link SMTPSession} implementation
@@ -36,8 +35,8 @@ public class SMTPSessionImpl extends ProtocolSessionImpl implements SMTPSession
private boolean relayingAllowed;
private boolean needsCommandInjectionDetection;
- public SMTPSessionImpl(Logger logger, ProtocolTransport transport, SMTPConfiguration config) {
- super(logger, transport, config);
+ public SMTPSessionImpl(ProtocolTransport transport, SMTPConfiguration config) {
+ super(transport, config);
relayingAllowed = config.isRelayingAllowed(getRemoteAddress().getAddress().getHostAddress());
needsCommandInjectionDetection = true;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
index 3f52b83..145d3a7 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
@@ -40,6 +40,8 @@ import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookResultHook;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.util.MDCBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
@@ -48,6 +50,7 @@ import com.google.common.base.Throwables;
*
*/
public abstract class AbstractHookableCmdHandler<Hook extends org.apache.james.protocols.smtp.hook.Hook> implements CommandHandler<SMTPSession>, ExtensibleHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractHookableCmdHandler.class);
private final MetricFactory metricFactory;
private List<Hook> hooks;
@@ -112,7 +115,7 @@ public abstract class AbstractHookableCmdHandler<Hook extends org.apache.james.p
int i = 0;
while (i < count) {
Hook rawHook = hooks.get(i);
- session.getLogger().debug("executing hook " + rawHook.getClass().getName());
+ LOGGER.debug("executing hook " + rawHook.getClass().getName());
long start = System.currentTimeMillis();
HookResult hRes = callHook(rawHook, session, parameters);
@@ -120,7 +123,7 @@ public abstract class AbstractHookableCmdHandler<Hook extends org.apache.james.p
if (rHooks != null) {
for (HookResultHook rHook : rHooks) {
- session.getLogger().debug("executing hook " + rHook);
+ LOGGER.debug("executing hook " + rHook);
hRes = rHook.onHookResult(session, hRes, executionTime, rawHook);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
index 6f29ae6..6ce88ea 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
@@ -43,6 +43,8 @@ import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookResultHook;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.MessageHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class handles the actual calling of the {@link MessageHook} implementations to queue the message. If no {@link MessageHook} return OK or DECLINED it will write back an
@@ -50,6 +52,7 @@ import org.apache.james.protocols.smtp.hook.MessageHook;
*
*/
public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DataLineMessageHookHandler.class);
private static final Response ERROR_PROCESSING_MESSAGE = new SMTPResponse(SMTPRetCode.LOCAL_ERROR,DSNStatus.getStatus(DSNStatus.TRANSIENT,
DSNStatus.UNDEFINED_STATUS) + " Error processing message").immutable();
@@ -101,8 +104,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan
}
out.flush();
} catch (IOException e) {
- session.getLogger().error(
- "Unknown error occurred while processing DATA.", e);
+ LOGGER.error("Unknown error occurred while processing DATA.", e);
session.resetState();
return ERROR_PROCESSING_MESSAGE;
@@ -131,7 +133,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan
if (mail != null && messageHandlers != null) {
for (Object messageHandler : messageHandlers) {
MessageHook rawHandler = (MessageHook) messageHandler;
- session.getLogger().debug("executing message handler " + rawHandler);
+ LOGGER.debug("executing message handler " + rawHandler);
long start = System.currentTimeMillis();
HookResult hRes = rawHandler.onMessage(session, mail);
@@ -139,7 +141,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan
if (rHooks != null) {
for (Object rHook : rHooks) {
- session.getLogger().debug("executing hook " + rHook);
+ LOGGER.debug("executing hook " + rHook);
hRes = ((HookResultHook) rHook).onHookResult(session, hRes, executionTime, rawHandler);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
index d6a9997..a47726f 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
@@ -42,6 +42,8 @@ import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.MailHook;
import org.apache.james.protocols.smtp.hook.MailParametersHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableSet;
@@ -50,6 +52,7 @@ import com.google.common.collect.ImmutableSet;
*/
public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
private static final Collection<String> COMMANDS = ImmutableSet.of("MAIL");
+ private static final Logger LOGGER = LoggerFactory.getLogger(MailCmdHandler.class);
private static final Response SENDER_ALREADY_SPECIFIED = new SMTPResponse(SMTPRetCode.BAD_SEQUENCE, DSNStatus
.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_OTHER)
+ " Sender already specified").immutable();
@@ -213,25 +216,25 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
}
} else {
// Unexpected option attached to the Mail command
- if (session.getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
StringBuilder debugBuffer = new StringBuilder(128)
.append(
"MAIL command had unrecognized/unexpected option ")
.append(mailOptionName).append(
" with value ").append(
mailOptionValue);
- session.getLogger().debug(debugBuffer.toString());
+ LOGGER.debug(debugBuffer.toString());
}
}
}
}
if (session.getConfiguration().useAddressBracketsEnforcement()
&& (!sender.startsWith("<") || !sender.endsWith(">"))) {
- if (session.getLogger().isInfoEnabled()) {
+ if (LOGGER.isInfoEnabled()) {
StringBuilder errorBuffer = new StringBuilder(128).append(
"Error parsing sender address: ").append(sender)
.append(": did not start and end with < >");
- session.getLogger().info(errorBuffer.toString());
+ LOGGER.info(errorBuffer.toString());
}
return SYNTAX_ERROR;
}
@@ -256,12 +259,12 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
try {
senderAddress = new MailAddress(sender);
} catch (Exception pe) {
- if (session.getLogger().isInfoEnabled()) {
+ if (LOGGER.isInfoEnabled()) {
StringBuilder errorBuffer = new StringBuilder(256)
.append("Error parsing sender address: ")
.append(sender).append(": ").append(
pe.getMessage());
- session.getLogger().info(errorBuffer.toString());
+ LOGGER.info(errorBuffer.toString());
}
return SYNTAX_ERROR_ADDRESS;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
index 81f6605..6c9f54e 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
@@ -24,18 +24,21 @@ import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.RcptHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handler which whitelist "postmaster" and "abuse" recipients.
*/
public class PostmasterAbuseRcptHook implements RcptHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(PostmasterAbuseRcptHook.class);
/**
* @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (rcpt.getLocalPart().equalsIgnoreCase("postmaster") || rcpt.getLocalPart().equalsIgnoreCase("abuse")) {
- session.getLogger().debug("Sender allowed");
+ LOGGER.debug("Sender allowed");
return HookResult.ok();
} else {
return HookResult.declined();
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
index c259dd5..719cabc 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
@@ -39,6 +39,8 @@ import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.RcptHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableSet;
@@ -47,7 +49,7 @@ import com.google.common.collect.ImmutableSet;
*/
public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> implements
CommandHandler<SMTPSession> {
-
+ private static final Logger LOGGER = LoggerFactory.getLogger(RcptCmdHandler.class);
public static final String CURRENT_RECIPIENT = "CURRENT_RECIPIENT"; // Current
// recipient
private static final Collection<String> COMMANDS = ImmutableSet.of("RCPT");
@@ -142,12 +144,12 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
}
if (session.getConfiguration().useAddressBracketsEnforcement()
&& (!recipient.startsWith("<") || !recipient.endsWith(">"))) {
- if (session.getLogger().isInfoEnabled()) {
+ if (LOGGER.isInfoEnabled()) {
StringBuilder errorBuffer = new StringBuilder(192).append(
"Error parsing recipient address: ").append(
"Address did not start and end with < >").append(
getContext(session, null, recipient));
- session.getLogger().info(errorBuffer.toString());
+ LOGGER.info(errorBuffer.toString());
}
return SYNTAX_ERROR_DELIVERY;
}
@@ -168,12 +170,12 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
try {
recipientAddress = new MailAddress(recipient);
} catch (Exception pe) {
- if (session.getLogger().isInfoEnabled()) {
+ if (LOGGER.isInfoEnabled()) {
StringBuilder errorBuffer = new StringBuilder(192).append(
"Error parsing recipient address: ").append(
getContext(session, recipientAddress, recipient))
.append(pe.getMessage());
- session.getLogger().info(errorBuffer.toString());
+ LOGGER.info(errorBuffer.toString());
}
/*
* from RFC2822; 553 Requested action not taken: mailbox name
@@ -197,7 +199,7 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
rcptOptionValue = rcptOption.substring(equalIndex + 1);
}
// Unexpected option attached to the RCPT command
- if (session.getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
StringBuilder debugBuffer = new StringBuilder(128)
.append(
"RCPT command had unrecognized/unexpected option ")
@@ -205,7 +207,7 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
.append(rcptOptionValue).append(
getContext(session, recipientAddress,
recipient));
- session.getLogger().debug(debugBuffer.toString());
+ LOGGER.debug(debugBuffer.toString());
}
return new SMTPResponse(
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
index baedf96..f2108d7 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
@@ -48,6 +48,8 @@ import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookResultHook;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.MailParametersHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -64,6 +66,7 @@ import com.google.common.collect.ImmutableSet;
public class AuthCmdHandler
implements CommandHandler<SMTPSession>, EhloExtension, ExtensibleHandler, MailParametersHook {
private static final Collection<String> COMMANDS = ImmutableSet.of("AUTH");
+ private static final Logger LOGGER = LoggerFactory.getLogger(CommandHandler.class);
private static final String[] MAIL_PARAMS = { "AUTH" };
private static final List<String> ESMTP_FEATURES = ImmutableList.of("AUTH LOGIN PLAIN", "AUTH=LOGIN PLAIN");
@@ -381,7 +384,7 @@ public class AuthCmdHandler
if (hooks != null) {
for (AuthHook rawHook : hooks) {
- session.getLogger().debug("executing hook " + rawHook);
+ LOGGER.debug("executing hook " + rawHook);
long start = System.currentTimeMillis();
HookResult hRes = rawHook.doAuth(session, user, pass);
@@ -389,7 +392,7 @@ public class AuthCmdHandler
if (rHooks != null) {
for (HookResultHook rHook : rHooks) {
- session.getLogger().debug("executing hook " + rHook);
+ LOGGER.debug("executing hook " + rHook);
hRes = rHook.onHookResult(session, hRes, executionTime, rawHook);
}
}
@@ -398,11 +401,11 @@ public class AuthCmdHandler
if (res != null) {
if (SMTPRetCode.AUTH_FAILED.equals(res.getRetCode())) {
- session.getLogger().info("AUTH method " + authType + " failed");
+ LOGGER.info("AUTH method " + authType + " failed");
} else if (SMTPRetCode.AUTH_OK.equals(res.getRetCode())) {
- if (session.getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
// TODO: Make this string a more useful debug message
- session.getLogger().debug("AUTH method " + authType + " succeeded");
+ LOGGER.debug("AUTH method " + authType + " succeeded");
}
}
return res;
@@ -411,7 +414,7 @@ public class AuthCmdHandler
}
res = AUTH_FAILED;
- session.getLogger().error("AUTH method "+authType+" failed from " + user + "@" + session.getRemoteAddress().getAddress().getHostAddress());
+ LOGGER.error("AUTH method "+authType+" failed from " + user + "@" + session.getRemoteAddress().getAddress().getHostAddress());
return res;
}
@@ -486,13 +489,13 @@ public class AuthCmdHandler
* @param initialResponse the initial response line passed in with the AUTH command
*/
private Response doUnknownAuth(SMTPSession session, String authType, String initialResponse) {
- if (session.getLogger().isInfoEnabled()) {
+ if (LOGGER.isInfoEnabled()) {
StringBuilder errorBuffer =
new StringBuilder(128)
.append("AUTH method ")
.append(authType)
.append(" is an unrecognized authentication type");
- session.getLogger().info(errorBuffer.toString());
+ LOGGER.info(errorBuffer.toString());
}
return UNKNOWN_AUTH_TYPE;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
index 51184c0..10fd3cf 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
@@ -26,8 +26,8 @@ import java.util.List;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.ProtocolSession.State;
+import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.MailEnvelope;
import org.apache.james.protocols.smtp.SMTPResponse;
@@ -39,12 +39,16 @@ import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.MailParametersHook;
import org.apache.james.protocols.smtp.hook.MessageHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handle the ESMTP SIZE extension.
*/
public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension, DataLineFilter, MessageHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MailSizeEsmtpExtension.class);
+
private final static String MESG_SIZE = "MESG_SIZE"; // The size of the
private final static String MESG_FAILED = "MESG_FAILED"; // Message failed flag
private final static String[] MAIL_PARAMS = { "SIZE" };
@@ -113,16 +117,16 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
try {
size = Integer.parseInt(mailOptionValue);
} catch (NumberFormatException pe) {
- session.getLogger().error("Rejected syntactically incorrect value for SIZE parameter.");
+ LOGGER.error("Rejected syntactically incorrect value for SIZE parameter.");
// This is a malformed option value. We return an error
return SYNTAX_ERROR;
}
- if (session.getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
StringBuilder debugBuffer = new StringBuilder(128).append(
"MAIL command option SIZE received with value ").append(
size).append(".");
- session.getLogger().debug(debugBuffer.toString());
+ LOGGER.debug(debugBuffer.toString());
}
long maxMessageSize = session.getConfiguration().getMaxMessageSize();
if ((maxMessageSize > 0) && (size > maxMessageSize)) {
@@ -135,7 +139,7 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
.append(size).append(
" exceeding system maximum message size of ")
.append(maxMessageSize).append("based on SIZE option.");
- session.getLogger().error(errorBuffer.toString());
+ LOGGER.error(errorBuffer.toString());
return QUOTA_EXCEEDED;
} else {
@@ -212,7 +216,7 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
.append(" exceeding system maximum message size of ")
.append(
session.getConfiguration().getMaxMessageSize());
- session.getLogger().error(errorBuffer.toString());
+ LOGGER.error(errorBuffer.toString());
return QUOTA_EXCEEDED;
} else {
return HookResult.declined();
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
index bb96f22..2fe36b0 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
@@ -28,6 +28,8 @@ import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.RcptHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -36,6 +38,7 @@ import org.apache.james.protocols.smtp.hook.RcptHook;
*
*/
public abstract class AbstractGreylistHandler implements RcptHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractGreylistHandler.class);
/** 1 hour */
private long tempBlockTime = 3600000;
@@ -86,7 +89,7 @@ public abstract class AbstractGreylistHandler implements RcptHook {
count = Integer.parseInt(data.next());
}
- session.getLogger().debug("Triplet " + ipAddress + " | " + sender + " | " + recip +" -> TimeStamp: " + createTimeStamp);
+ LOGGER.debug("Triplet " + ipAddress + " | " + sender + " | " + recip +" -> TimeStamp: " + createTimeStamp);
// if the timestamp is bigger as 0 we have allready a triplet stored
@@ -97,14 +100,14 @@ public abstract class AbstractGreylistHandler implements RcptHook {
return TO_FAST;
} else {
- session.getLogger().debug("Update triplet " + ipAddress + " | " + sender + " | " + recip + " -> timestamp: " + time);
+ LOGGER.debug("Update triplet " + ipAddress + " | " + sender + " | " + recip + " -> timestamp: " + time);
// update the triplet..
updateTriplet(ipAddress, sender, recip, count, time);
}
} else {
- session.getLogger().debug("New triplet " + ipAddress + " | " + sender + " | " + recip );
+ LOGGER.debug("New triplet " + ipAddress + " | " + sender + " | " + recip );
// insert a new triplet
insertTriplet(ipAddress, sender, recip, count, time);
@@ -117,7 +120,7 @@ public abstract class AbstractGreylistHandler implements RcptHook {
if (Math.random() > 0.99) {
// cleanup old entries
- session.getLogger().debug("Delete old entries");
+ LOGGER.debug("Delete old entries");
cleanupAutoWhiteListGreyList(time - autoWhiteListLifeTime);
cleanupGreyList(time - unseenLifeTime);
@@ -125,7 +128,7 @@ public abstract class AbstractGreylistHandler implements RcptHook {
} catch (Exception e) {
// just log the exception
- session.getLogger().error("Error on greylist method: " + e.getMessage());
+ LOGGER.error("Error on greylist method: " + e.getMessage());
}
return HookResult.declined();
}
@@ -209,7 +212,7 @@ public abstract class AbstractGreylistHandler implements RcptHook {
if (!session.isRelayingAllowed()) {
return doGreyListCheck(session, sender,rcpt);
} else {
- session.getLogger().info("IpAddress " + session.getRemoteAddress().getAddress().getHostAddress() + " is allowed to send. Skip greylisting.");
+ LOGGER.info("IpAddress " + session.getRemoteAddress().getAddress().getHostAddress() + " is allowed to send. Skip greylisting.");
}
return HookResult.declined();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
index b839dfa..8a148ba 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
@@ -29,6 +29,8 @@ import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.RcptHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -36,8 +38,8 @@ import org.apache.james.protocols.smtp.hook.RcptHook;
*
*/
public abstract class AbstractValidRcptHandler implements RcptHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractValidRcptHandler.class);
-
/**
* @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
@@ -53,7 +55,7 @@ public abstract class AbstractValidRcptHandler implements RcptHook {
}
} else {
if (isLocalDomain(session, rcpt.getDomain()) == false) {
- session.getLogger().debug("Unknown domain " + rcpt.getDomain() + " so reject it");
+ LOGGER.debug("Unknown domain " + rcpt.getDomain() + " so reject it");
} else {
if (isValidRecipient(session, rcpt) == false) {
@@ -64,7 +66,7 @@ public abstract class AbstractValidRcptHandler implements RcptHook {
if (reject) {
//user not exist
- session.getLogger().info("Rejected message. Unknown user: " + rcpt.toString());
+ LOGGER.info("Rejected message. Unknown user: " + rcpt.toString());
return new HookResult(HookReturnCode.DENY,SMTPRetCode.MAILBOX_PERM_UNAVAILABLE, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.ADDRESS_MAILBOX) + " Unknown user: " + rcpt.toString());
} else {
return HookResult.declined();
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
index 073ccab..312708e 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
@@ -33,11 +33,14 @@ import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.RcptHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Connect handler for DNSRBL processing
*/
public class DNSRBLHandler implements RcptHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DNSRBLHandler.class);
/**
* The lists of rbl servers to be checked to limit spam
@@ -119,7 +122,7 @@ public class DNSRBLHandler implements RcptHook {
* This whould make no sense.
*/
if (session.isRelayingAllowed()) {
- session.getLogger().info("Ipaddress " + session.getRemoteAddress().getAddress() + " is allowed to relay. Don't check it");
+ LOGGER.info("Ipaddress " + session.getRemoteAddress().getAddress() + " is allowed to relay. Don't check it");
return;
}
@@ -135,14 +138,14 @@ public class DNSRBLHandler implements RcptHook {
String[] rblList = whitelist;
for (String rbl : rblList) {
if (resolve(reversedOctets + rbl)) {
- if (session.getLogger().isInfoEnabled()) {
- session.getLogger().info("Connection from " + ipAddress + " whitelisted by " + rbl);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("Connection from " + ipAddress + " whitelisted by " + rbl);
}
return;
} else {
- if (session.getLogger().isDebugEnabled()) {
- session.getLogger().debug("IpAddress " + session.getRemoteAddress().getAddress() + " not listed on " + rbl);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("IpAddress " + session.getRemoteAddress().getAddress() + " not listed on " + rbl);
}
}
}
@@ -152,8 +155,8 @@ public class DNSRBLHandler implements RcptHook {
String[] rblList = blacklist;
for (String rbl : rblList) {
if (resolve(reversedOctets + rbl)) {
- if (session.getLogger().isInfoEnabled()) {
- session.getLogger().info("Connection from " + ipAddress + " restricted by " + rbl + " to SMTP AUTH/postmaster/abuse.");
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("Connection from " + ipAddress + " restricted by " + rbl + " to SMTP AUTH/postmaster/abuse.");
}
// we should try to retrieve details
@@ -173,8 +176,8 @@ public class DNSRBLHandler implements RcptHook {
return;
} else {
// if it is unknown, it isn't blocked
- if (session.getLogger().isDebugEnabled()) {
- session.getLogger().debug("unknown host exception thrown:" + rbl);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("unknown host exception thrown:" + rbl);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
index 3060691..43c4b5b 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
@@ -31,8 +31,11 @@ import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.RcptHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MaxRcptHandler implements RcptHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MaxRcptHandler.class);
private static final HookResult MAX_RCPT = new HookResult(HookReturnCode.DENY, SMTPRetCode.SYSTEM_STORAGE_ERROR, DSNStatus.getStatus(DSNStatus.NETWORK, DSNStatus.DELIVERY_TOO_MANY_REC)
+ " Requested action not taken: max recipients reached");
@@ -54,7 +57,7 @@ public class MaxRcptHandler implements RcptHook {
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if ((session.getRcptCount() + 1) > maxRcpt) {
- session.getLogger().info("Maximum recipients of " + maxRcpt + " reached");
+ LOGGER.info("Maximum recipients of " + maxRcpt + " reached");
return MAX_RCPT;
} else {
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
index 7663d6b..73df529 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
@@ -32,12 +32,15 @@ import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.RcptHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This handler can be used for providing a spam trap. IPAddresses which send emails to the configured
* recipients will get blacklisted for the configured time.
*/
public class SpamTrapHandler implements RcptHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SpamTrapHandler.class);
/** Map which hold blockedIps and blockTime in memory */
private final Map<String,Long> blockedIps = new HashMap<>();
@@ -99,10 +102,10 @@ public class SpamTrapHandler implements RcptHook {
long blockTime = rawTime.longValue();
if (blockTime > System.currentTimeMillis()) {
- session.getLogger().debug("BlockList contain Ip " + ip);
+ LOGGER.debug("BlockList contain Ip " + ip);
return true;
} else {
- session.getLogger().debug("Remove ip " + ip + " from blockList");
+ LOGGER.debug("Remove ip " + ip + " from blockList");
synchronized(blockedIps) {
blockedIps.remove(ip);
@@ -121,7 +124,7 @@ public class SpamTrapHandler implements RcptHook {
private void addIp(String ip, SMTPSession session) {
long bTime = System.currentTimeMillis() + blockTime;
- session.getLogger().debug("Add ip " + ip + " for " + bTime + " to blockList");
+ LOGGER.debug("Add ip " + ip + " for " + bTime + " to blockList");
synchronized(blockedIps) {
blockedIps.put(ip, Long.valueOf(bTime));
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
index fb363f9..69c823e 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
@@ -34,12 +34,15 @@ import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.RcptHook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
* This handler can be used to just ignore duplicated recipients.
*/
public class SupressDuplicateRcptHandler implements RcptHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SupressDuplicateRcptHandler.class);
@Override
public void init(Configuration config) throws ConfigurationException {
@@ -66,7 +69,7 @@ public class SupressDuplicateRcptHandler implements RcptHook {
.append(" Recipient <")
.append(rcpt.toString())
.append("> OK");
- session.getLogger().debug("Duplicate recipient not add to recipient list: " + rcpt.toString());
+ LOGGER.debug("Duplicate recipient not add to recipient list: " + rcpt.toString());
return new HookResult(HookReturnCode.OK,SMTPRetCode.MAIL_OK, responseBuffer.toString());
}
return HookResult.declined();
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
index 431e84e..37ea742 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java
@@ -25,6 +25,8 @@ import org.apache.james.protocols.smtp.hook.Hook;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookResultHook;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -32,7 +34,8 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode;
* logged to INFO. If not to DEBUG
*
*/
-public class HookResultLogger implements HookResultHook{
+public class HookResultLogger implements HookResultHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HookResultLogger.class);
@Override
public void init(Configuration config) throws ConfigurationException {
@@ -81,9 +84,9 @@ public class HookResultLogger implements HookResultHook{
sb.append(")");
if (info) {
- session.getLogger().info(sb.toString());
+ LOGGER.info(sb.toString());
} else {
- session.getLogger().debug(sb.toString());
+ LOGGER.debug(sb.toString());
}
return hResult;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/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 19d2421..b29b329 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
@@ -1103,7 +1103,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(), LOGGER);
+ return new SMTPProtocol(chain, new SMTPConfigurationImpl());
}
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/4f14df4f/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 0178f0a..624b2dc 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
@@ -101,7 +101,7 @@ public class NettyStartTlsSMTPServerTest {
chain.add(handler.get());
}
chain.wireExtensibleHandlers();
- return new SMTPProtocol(chain, new SMTPConfigurationImpl(), LOGGER);
+ return new SMTPProtocol(chain, new SMTPConfigurationImpl());
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/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 78b7e64..456c93e 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
@@ -29,16 +29,12 @@ import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Abstract class to simplify the mocks
*/
public class BaseFakeSMTPSession implements SMTPSession {
- private static final Logger log = LoggerFactory.getLogger(BaseFakeSMTPSession.class);
-
@Override
public boolean needsCommandInjectionDetection() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
@@ -132,13 +128,6 @@ public class BaseFakeSMTPSession implements SMTPSession {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
- /**
- * @see org.apache.james.protocols.smtp.SMTPSession#getLogger()
- */
- public Logger getLogger() {
- return log;
- }
-
public boolean isStartTLSSupported() {
return false;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
index dfa9a8a..32c8ab2 100644
--- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
+++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
@@ -41,6 +41,8 @@ import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link DeliverToRecipientHook} which deliver the message directly to the recipients mailbox.
@@ -48,6 +50,7 @@ import org.apache.james.user.api.UsersRepositoryException;
*
*/
public class MailboxDeliverToRecipientHandler implements DeliverToRecipientHook {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MailboxDeliverToRecipientHandler.class);
private UsersRepository users;
private MailboxManager mailboxManager;
@@ -87,9 +90,8 @@ public class MailboxDeliverToRecipientHandler implements DeliverToRecipientHook
mailboxManager.getMailbox(MailboxPath.inbox(mailboxSession), mailboxSession).appendMessage(envelope.getMessageInputStream(), new Date(), mailboxSession, true, null);
mailboxManager.endProcessingRequest(mailboxSession);
result = new HookResult(HookReturnCode.OK, SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS, DSNStatus.CONTENT_OTHER) + " Message received");
-
} catch (IOException | MailboxException | UsersRepositoryException e) {
- session.getLogger().error("Unexpected error handling DATA stream", e);
+ LOGGER.error("Unexpected error handling DATA stream", e);
result = new HookResult(HookReturnCode.DENYSOFT, " Temporary error deliver message to " + recipient);
}
return result;
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
index f1b97a8..f7359a0 100644
--- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
+++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
@@ -143,8 +143,8 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe
@Override
protected ChannelUpstreamHandler createCoreHandler() {
- SMTPProtocol protocol = new SMTPProtocol(getProtocolHandlerChain(), lmtpConfig, getLogger());
- return new SMTPChannelUpstreamHandler(protocol, getLogger(), lmtpMetrics);
+ SMTPProtocol protocol = new SMTPProtocol(getProtocolHandlerChain(), lmtpConfig);
+ return new SMTPChannelUpstreamHandler(protocol, lmtpMetrics);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/4f14df4f/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
index 4f07010..6edf0a1 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
@@ -78,7 +78,7 @@ public class POP3Server extends AbstractProtocolAsyncServer implements POP3Serve
@Override
protected void preInit() throws Exception {
super.preInit();
- POP3Protocol protocol = new POP3Protocol(getProtocolHandlerChain(), theConfigData, getLogger());
+ POP3Protocol protocol = new POP3Protocol(getProtocolHandlerChain(), theConfigData);
coreHandler = new BasicChannelUpstreamHandler(protocol, getEncryption());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org