http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java b/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java index 3b78e06..8f15658 100644 --- a/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java +++ b/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java @@ -67,10 +67,10 @@ public class ManageSieveProcessor { command = request; } if (command.endsWith("\n")) { - command = command.substring(0, command.length()-1); + command = command.substring(0, command.length() - 1); } if (command.endsWith("\r")) { - command = command.substring(0, command.length()-1); + command = command.substring(0, command.length() - 1); } return command; }
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java index a0398d8..f690abd 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java @@ -40,7 +40,7 @@ import com.google.common.collect.ImmutableList; * Abstract base class for Servers which want to use async io * */ -public abstract class AbstractAsyncServer implements ProtocolServer{ +public abstract class AbstractAsyncServer implements ProtocolServer { public static final int DEFAULT_IO_WORKER_COUNT = Runtime.getRuntime().availableProcessors() * 2; private volatile int backlog = 250; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java index f75d542..c02ccbc 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java @@ -34,7 +34,7 @@ import org.jboss.netty.util.HashedWheelTimer; * * */ -public abstract class AbstractChannelPipelineFactory implements ChannelPipelineFactory, ExternalResourceReleasable{ +public abstract class AbstractChannelPipelineFactory implements ChannelPipelineFactory, ExternalResourceReleasable { public static final int MAX_LINE_LENGTH = 8192; protected final ConnectionLimitUpstreamHandler connectionLimitHandler; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java index e40f0a1..bc8269a 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractSSLAwareChannelPipelineFactory.java @@ -31,7 +31,7 @@ import org.jboss.netty.handler.ssl.SslHandler; * * */ -public abstract class AbstractSSLAwareChannelPipelineFactory extends AbstractChannelPipelineFactory{ +public abstract class AbstractSSLAwareChannelPipelineFactory extends AbstractChannelPipelineFactory { private String[] enabledCipherSuites = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java index fec522a..d6d38d9 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelGroupHandler.java @@ -37,7 +37,7 @@ public final class ChannelGroupHandler extends SimpleChannelUpstreamHandler { } @Override - public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception{ + public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception { // Add all open channels to the global group so that they are // closed on shutdown. channels.add(e.getChannel()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionLimitUpstreamHandler.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionLimitUpstreamHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionLimitUpstreamHandler.java index cc3f5fe..73c71d0 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionLimitUpstreamHandler.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionLimitUpstreamHandler.java @@ -34,7 +34,7 @@ import org.jboss.netty.channel.SimpleChannelUpstreamHandler; * TODO: Remove when its committed to NETTY. * https://jira.jboss.org/jira/browse/NETTY-311 */ -public class ConnectionLimitUpstreamHandler extends SimpleChannelUpstreamHandler{ +public class ConnectionLimitUpstreamHandler extends SimpleChannelUpstreamHandler { private final AtomicInteger connections = new AtomicInteger(0); private volatile int maxConnections = -1; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java index c002f9d..cb66060 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java @@ -37,7 +37,7 @@ import org.jboss.netty.channel.SimpleChannelUpstreamHandler; * TODO: Remove when its committed to NETTY. * https://jira.jboss.org/jira/browse/NETTY-311 */ -public class ConnectionPerIpLimitUpstreamHandler extends SimpleChannelUpstreamHandler{ +public class ConnectionPerIpLimitUpstreamHandler extends SimpleChannelUpstreamHandler { private final ConcurrentMap<String, AtomicInteger> connections = new ConcurrentHashMap<>(); private volatile int maxConnectionsPerIp = -1; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java index 7ccc2b2..a05f3aa 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyProtocolTransport.java @@ -142,7 +142,7 @@ public class NettyProtocolTransport extends AbstractProtocolTransport { } else if (in instanceof CombinedInputStream) { Iterator<InputStream> streams = ((CombinedInputStream) in).iterator(); - while(streams.hasNext()) { + while (streams.hasNext()) { InputStream pIn = streams.next(); if (pIn instanceof FileInputStream) { FileChannel fChannel = ((FileInputStream) in).getChannel(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/netty/src/main/java/org/apache/james/protocols/netty/TimeoutHandler.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/TimeoutHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/TimeoutHandler.java index efcb9b5..99c456b 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/TimeoutHandler.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/TimeoutHandler.java @@ -29,7 +29,7 @@ import org.jboss.netty.util.Timer; * idle timeout. Be aware that this handle is not thread safe so it can't be shared across pipelines * */ -public class TimeoutHandler extends IdleStateHandler{ +public class TimeoutHandler extends IdleStateHandler { public TimeoutHandler(Timer timer, int readerIdleTimeSeconds) { super(timer, readerIdleTimeSeconds, 0, 0); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 058b0e1..e25f90d 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 @@ -29,7 +29,7 @@ import org.apache.james.protocols.api.handler.ProtocolHandlerChain; * {@link ProtocolImpl} which implements the POP3 Protocol * */ -public class POP3Protocol extends ProtocolImpl{ +public class POP3Protocol extends ProtocolImpl { public POP3Protocol(ProtocolHandlerChain chain, ProtocolConfiguration config) { super(chain, config); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java index 985dd39..d7e57c0 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java @@ -49,7 +49,7 @@ import org.apache.james.protocols.pop3.core.WelcomeMessageHandler; * * */ -public class POP3ProtocolHandlerChain extends ProtocolHandlerChainImpl{ +public class POP3ProtocolHandlerChain extends ProtocolHandlerChainImpl { public POP3ProtocolHandlerChain() { super(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java index 914b778..ef8923a 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Response.java @@ -90,7 +90,7 @@ public class POP3Response extends AbstractResponse { } else { for (int i = 0; i < lines.size(); i++) { if (i == 0) { - responseList.add(getRetCode() + WS +lines.get(i)); + responseList.add(getRetCode() + WS + lines.get(i)); } else { responseList.add(lines.get(i)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java index 293e0a2..07e227d 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/POP3StartTlsResponse.java @@ -29,7 +29,7 @@ import org.apache.james.protocols.api.StartTlsResponse; * * */ -public class POP3StartTlsResponse extends POP3Response implements StartTlsResponse{ +public class POP3StartTlsResponse extends POP3Response implements StartTlsResponse { public POP3StartTlsResponse(String code, CharSequence description) { super(code, description); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java index 60d42a9..11eea14 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java @@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableSet; * @author Maurer * */ -public abstract class AbstractApopCmdHandler extends AbstractPassCmdHandler{ +public abstract class AbstractApopCmdHandler extends AbstractPassCmdHandler { private static final Collection<String> COMMANDS = ImmutableSet.of("APOP"); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java index 6f69806..3a2ec7b 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java @@ -42,7 +42,7 @@ public class MessageMetaDataUtils { if (uidList == null || number > uidList.size()) { return null; } else { - return uidList.get(number -1); + return uidList.get(number - 1); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java index 664c10a..38428e8 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java @@ -80,7 +80,7 @@ public abstract class ImapMailbox implements Mailbox { */ public abstract void remove(long... uids) throws IOException; - public void remove(String... uids) throws NumberFormatException, IOException { + public void remove(String... uids) throws NumberFormatException, IOException { long[] imapUids = Arrays.stream(uids) .mapToLong(Long::parseLong) .toArray(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java index 3faa026..56f4590 100644 --- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java +++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java @@ -32,8 +32,8 @@ public class MessageMetaData { this.uid = uid; this.size = size; - if(!MessageMetaDataUtils.isRFC1939Compatible(uid)) { - throw new IllegalArgumentException("UID is not RFC1939 compatible"); + if (!MessageMetaDataUtils.isRFC1939Compatible(uid)) { + throw new IllegalArgumentException("UID is not RFC1939 compatible"); } } @@ -49,7 +49,7 @@ public class MessageMetaData { /** * Return the uid of the message. This method uses extra Mailbox ID argument to make * UID unique when it is not globally unique. By default assuming UID globally unique. - * + * * @param mailboxId * Mailbox ID * @return http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java index 48482e4..620ff83 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/core/AbstractInputStreamTest.java @@ -24,7 +24,7 @@ import java.io.InputStream; import junit.framework.TestCase; -public abstract class AbstractInputStreamTest extends TestCase{ +public abstract class AbstractInputStreamTest extends TestCase { protected void checkRead(InputStream in, String expected) throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyPOP3ServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyPOP3ServerTest.java index 39d88e2..9a49dd0 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyPOP3ServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyPOP3ServerTest.java @@ -25,7 +25,7 @@ import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.netty.NettyServer; import org.apache.james.protocols.pop3.AbstractPOP3ServerTest; -public class NettyPOP3ServerTest extends AbstractPOP3ServerTest{ +public class NettyPOP3ServerTest extends AbstractPOP3ServerTest { private static final String LOCALHOST_IP = "127.0.0.1"; private static final int RANDOM_PORT = 0; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java index 5071353..b6ec5ca 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/netty/NettyStartTlsPOP3ServerTest.java @@ -26,7 +26,7 @@ import org.apache.james.protocols.api.ProtocolServer; import org.apache.james.protocols.netty.NettyServer; import org.apache.james.protocols.pop3.AbstractStartTlsPOP3ServerTest; -public class NettyStartTlsPOP3ServerTest extends AbstractStartTlsPOP3ServerTest{ +public class NettyStartTlsPOP3ServerTest extends AbstractStartTlsPOP3ServerTest { @Override protected ProtocolServer createServer(Protocol protocol, InetSocketAddress address, Encryption enc) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java index 241286e..f272aa6 100644 --- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java +++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/utils/TestPassCmdHandler.java @@ -32,7 +32,7 @@ public class TestPassCmdHandler extends AbstractPassCmdHandler { mailboxes.put(username, mailbox); } - protected Mailbox auth(POP3Session session, String username, String password) throws Exception{ + protected Mailbox auth(POP3Session session, String username, String password) throws Exception { return mailboxes.get(username); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailAddressException.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailAddressException.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailAddressException.java index dc94811..a9b370c 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailAddressException.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailAddressException.java @@ -23,7 +23,7 @@ package org.apache.james.protocols.smtp; * @Deprecated see {@link org.apache.james.protocols.smtp.MailAddress} for more details. */ @Deprecated -public class MailAddressException extends Exception{ +public class MailAddressException extends Exception { private static final long serialVersionUID = -2845113080526615146L; private final String address; private final int pos; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java index a621d44..02e0cc6 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java @@ -33,7 +33,7 @@ import org.apache.james.core.MailAddress; * * */ -public class MailEnvelopeImpl implements MailEnvelope{ +public class MailEnvelopeImpl implements MailEnvelope { private List<MailAddress> recipients; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java index 2f1c7fa..08b3f5f 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java @@ -29,7 +29,7 @@ import org.apache.james.protocols.api.ProtocolConfiguration; * SMTPHandlers * */ -public interface SMTPConfiguration extends ProtocolConfiguration{ +public interface SMTPConfiguration extends ProtocolConfiguration { /** * Returns the service wide maximum message size in bytes. http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java index 5814e46..70a7656 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java @@ -28,7 +28,7 @@ import org.apache.james.protocols.api.ProtocolConfigurationImpl; * are not thread-safe * */ -public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements SMTPConfiguration{ +public class SMTPConfigurationImpl extends ProtocolConfigurationImpl implements SMTPConfiguration { public String helloName = "localhost"; private final long maxMessageSize = 0; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java index 71c6714..932acb2 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java @@ -26,7 +26,7 @@ import org.apache.james.protocols.api.ProtocolSession; * SMTPHandler object */ -public interface SMTPSession extends ProtocolSession{ +public interface SMTPSession extends ProtocolSession { // Keys used to store/lookup data in the internal state hash map /** Sender's email address */ http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java index 84e4db3..922883d 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPStartTlsResponse.java @@ -30,7 +30,7 @@ import org.apache.james.protocols.api.StartTlsResponse; * * */ -public class SMTPStartTlsResponse extends SMTPResponse implements StartTlsResponse{ +public class SMTPStartTlsResponse extends SMTPResponse implements StartTlsResponse { public SMTPStartTlsResponse(String code, CharSequence description) { super(code, description); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java index 1704f57..5fb1a7e 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAddHeadersFilter.java @@ -35,14 +35,14 @@ import org.apache.james.protocols.smtp.SMTPSession; * * */ -public abstract class AbstractAddHeadersFilter extends SeparatingDataLineFilter{ +public abstract class AbstractAddHeadersFilter extends SeparatingDataLineFilter { private static final AtomicInteger COUNTER = new AtomicInteger(0); private final String headersPrefixAdded = "HEADERS_PREFIX_ADDED" + COUNTER.incrementAndGet(); private final String headersSuffixAdded = "HEADERS_SUFFIX_ADDED" + COUNTER.incrementAndGet(); - enum Location{ + enum Location { Prefix, Suffix } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 5717971..5814384 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 @@ -194,7 +194,7 @@ public abstract class AbstractHookableCmdHandler<Hook extends org.apache.james.p String smtpRetCode = result.getSmtpRetCode(); String smtpDesc = result.getSmtpDescription(); - if ((rCode &HookReturnCode.DENY) == HookReturnCode.DENY) { + if ((rCode & HookReturnCode.DENY) == HookReturnCode.DENY) { if (smtpRetCode == null) { smtpRetCode = SMTPRetCode.TRANSACTION_FAILED; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java index baa390f..6294a9a 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java @@ -38,6 +38,7 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.SECURITY_AUTH) + " Incorrect Authentication for Specified Email Address"); + /** * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, * org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) @@ -48,7 +49,7 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements String authUser = (session.getUser()).toLowerCase(Locale.US); MailAddress senderAddress = (MailAddress) session.getAttachment( SMTPSession.SENDER, ProtocolSession.State.Transaction); - String username= null; + String username = null; if (senderAddress != null) { if (useVirtualHosting()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java index f8e03b2..277cf1d 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java @@ -57,9 +57,9 @@ import com.google.common.collect.ImmutableSet; */ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHandler { - private static final Response NO_RECIPIENT = new SMTPResponse(SMTPRetCode.BAD_SEQUENCE, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_OTHER)+" No recipients specified").immutable(); - private static final Response NO_SENDER = new SMTPResponse(SMTPRetCode.BAD_SEQUENCE, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_OTHER)+" No sender specified").immutable(); - private static final Response UNEXPECTED_ARG = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG)+" Unexpected argument provided with DATA command").immutable(); + private static final Response NO_RECIPIENT = new SMTPResponse(SMTPRetCode.BAD_SEQUENCE, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_OTHER) + " No recipients specified").immutable(); + private static final Response NO_SENDER = new SMTPResponse(SMTPRetCode.BAD_SEQUENCE, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_OTHER) + " No sender specified").immutable(); + private static final Response UNEXPECTED_ARG = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG) + " Unexpected argument provided with DATA command").immutable(); private static final Response DATA_READY = new SMTPResponse(SMTPRetCode.DATA_READY, "Ok Send data ending with <CRLF>.<CRLF>").immutable(); private static final Collection<String> COMMANDS = ImmutableSet.of("DATA"); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java index 97690da..d1804db 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java @@ -32,7 +32,7 @@ import org.apache.james.protocols.smtp.SMTPSession; * DataLineFilter are used to check the Data stream while the message is * being received. */ -public interface DataLineFilter extends ProtocolHandler{ +public interface DataLineFilter extends ProtocolHandler { /** * Handle line processing http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 7e66ca1..a4712e4 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 @@ -82,7 +82,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan // 46 is "." // Stream terminated int c = line.get(); - if (line.remaining() == 2 && c== 46) { + if (line.remaining() == 2 && c == 46) { out.flush(); out.close(); @@ -94,7 +94,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan // DotStuffing. } else if (c == 46 && line.get() == 46) { byte[] bline = readBytes(line); - out.write(bline,1,bline.length-1); + out.write(bline,1,bline.length - 1); // Standard write } else { // TODO: maybe we should handle the Header/Body recognition here @@ -180,9 +180,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan throw new WiringException("No messageHandler configured"); } } - /** - * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() - */ + public List<Class<?>> getMarkerInterfaces() { List<Class<?>> classes = new LinkedList<>(); classes.add(MessageHook.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java index c39f816..84f5ed6 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java @@ -40,7 +40,7 @@ import com.google.common.collect.ImmutableSet; */ public class ExpnCmdHandler implements CommandHandler<SMTPSession> { - private static final Response NOT_SUPPORTED = new SMTPResponse(SMTPRetCode.UNIMPLEMENTED_COMMAND, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SYSTEM_NOT_CAPABLE)+" EXPN is not supported").immutable(); + private static final Response NOT_SUPPORTED = new SMTPResponse(SMTPRetCode.UNIMPLEMENTED_COMMAND, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SYSTEM_NOT_CAPABLE) + " EXPN is not supported").immutable(); /** * The name of the command handled by the command handler */ http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java index 65e4245..8ff6258 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java @@ -40,8 +40,8 @@ import com.google.common.collect.ImmutableSet; */ public class HelpCmdHandler implements CommandHandler<SMTPSession> { private static final String COMMAND_NAME = "HELP"; - private static final Response NOT_SUPPORTED = new SMTPResponse(SMTPRetCode.UNIMPLEMENTED_COMMAND, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SYSTEM_NOT_CAPABLE)+" " + COMMAND_NAME + " is not supported").immutable(); - /** + private static final Response NOT_SUPPORTED = new SMTPResponse(SMTPRetCode.UNIMPLEMENTED_COMMAND, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SYSTEM_NOT_CAPABLE) + " " + COMMAND_NAME + " is not supported").immutable(); + /** * The name of the command handled by the command handler */ private static final Collection<String> COMMANDS = ImmutableSet.of(COMMAND_NAME); @@ -50,7 +50,7 @@ public class HelpCmdHandler implements CommandHandler<SMTPSession> { * handles HELP command * **/ - public Response onCommand(SMTPSession session, Request request){ + public Response onCommand(SMTPSession session, Request request) { return NOT_SUPPORTED; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java index 9523782..4a5963d 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java @@ -45,7 +45,7 @@ public class NoopCmdHandler implements CommandHandler<SMTPSession> { */ private static final Collection<String> COMMANDS = ImmutableSet.of("NOOP"); - private static final Response NOOP = new SMTPResponse(SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.UNDEFINED_STATUS)+" OK").immutable(); + private static final Response NOOP = new SMTPResponse(SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.UNDEFINED_STATUS) + " OK").immutable(); /** * Handler method called upon receipt of a NOOP command. http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java index 6960d6d..c81160a 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java @@ -36,7 +36,7 @@ import org.apache.james.protocols.smtp.SMTPSession; * {@link AbstractAddHeadersFilter} which adds the Received header for the message. */ public class ReceivedDataLineFilter extends AbstractAddHeadersFilter { - private static final String EHLO ="EHLO"; + private static final String EHLO = "EHLO"; private static final String SMTP = "SMTP"; private static final String ESMTPA = "ESMTPA"; private static final String ESMTP = "ESMTP"; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java index e74d64a..8ed8b5c 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java @@ -43,8 +43,8 @@ public class RsetCmdHandler implements CommandHandler<SMTPSession> { * The name of the command handled by the command handler */ private static final Collection<String> COMMANDS = ImmutableSet.of("RSET"); - private static final Response OK = new SMTPResponse(SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.UNDEFINED_STATUS)+" OK").immutable(); - private static final Response SYNTAX_ERROR = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG)+" Unexpected argument provided with RSET command").immutable(); + private static final Response OK = new SMTPResponse(SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.UNDEFINED_STATUS) + " OK").immutable(); + private static final Response SYNTAX_ERROR = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG) + " Unexpected argument provided with RSET command").immutable(); /** * handles RSET command * http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java index 03d485f..d141392 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SeparatingDataLineFilter.java @@ -44,7 +44,7 @@ import org.apache.james.protocols.smtp.SMTPSession; * * */ -public abstract class SeparatingDataLineFilter implements DataLineFilter{ +public abstract class SeparatingDataLineFilter implements DataLineFilter { private static final String HEADERS_COMPLETE = "HEADERS_COMPLETE"; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java index d61e25c..84ae076 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java @@ -43,7 +43,7 @@ import com.google.common.collect.ImmutableSet; /** * Default command handler for handling unknown commands */ -public class UnknownCmdHandler extends AbstractHookableCmdHandler<UnknownHook>{ +public class UnknownCmdHandler extends AbstractHookableCmdHandler<UnknownHook> { /** * The name of the command handled by the command handler http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java index e344038..39aa3fb 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java @@ -42,7 +42,7 @@ public class VrfyCmdHandler implements CommandHandler<SMTPSession> { private static final Collection<String> COMMANDS = ImmutableSet.of("VRFY"); private static final Response NOT_SUPPORTED = new SMTPResponse(SMTPRetCode.UNIMPLEMENTED_COMMAND, - DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SYSTEM_NOT_CAPABLE)+" VRFY is not supported").immutable(); + DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SYSTEM_NOT_CAPABLE) + " VRFY is not supported").immutable(); /** * Handler method called upon receipt of a VRFY command. http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 3c13270..e3d2d51 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 @@ -71,9 +71,9 @@ public class AuthCmdHandler private static final List<String> ESMTP_FEATURES = ImmutableList.of("AUTH LOGIN PLAIN", "AUTH=LOGIN PLAIN"); private static final Response AUTH_ABORTED = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.SECURITY_AUTH) + " Authentication aborted").immutable(); - private static final Response ALREADY_AUTH = new SMTPResponse(SMTPRetCode.BAD_SEQUENCE, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_OTHER)+" User has previously authenticated. " + private static final Response ALREADY_AUTH = new SMTPResponse(SMTPRetCode.BAD_SEQUENCE, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_OTHER) + " User has previously authenticated. " + " Further authentication is not required!").immutable(); - private static final Response SYNTAX_ERROR = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG)+" Usage: AUTH (authentication type) <challenge>").immutable(); + private static final Response SYNTAX_ERROR = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_INVALID_ARG) + " Usage: AUTH (authentication type) <challenge>").immutable(); private static final Response AUTH_READY_PLAIN = new SMTPResponse(SMTPRetCode.AUTH_READY, "OK. Continue authentication").immutable(); private static final Response AUTH_READY_USERNAME_LOGIN = new SMTPResponse(SMTPRetCode.AUTH_READY, "VXNlcm5hbWU6").immutable(); // base64 encoded "Username:" private static final Response AUTH_READY_PASSWORD_LOGIN = new SMTPResponse(SMTPRetCode.AUTH_READY, "UGFzc3dvcmQ6").immutable(); // base64 encoded "Password: @@ -267,8 +267,7 @@ public class AuthCmdHandler user = authTokenizer.nextToken(); // Authentication Identity try { pass = authTokenizer.nextToken(); // Password - } - catch (java.util.NoSuchElementException ignored) { + } catch (java.util.NoSuchElementException ignored) { // If we got here, this is what happened. RFC 2595 // says that "the client may leave the authorization // identity empty to indicate that it is the same as @@ -290,8 +289,7 @@ public class AuthCmdHandler authTokenizer = null; } - } - catch (Exception e) { + } catch (Exception e) { // Ignored - this exception in parsing will be dealt // with in the if clause below } @@ -376,7 +374,7 @@ public class AuthCmdHandler */ protected Response doAuthTest(SMTPSession session, String user, String pass, String authType) { if ((user == null) || (pass == null)) { - return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,"Could not decode parameters for AUTH "+authType); + return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,"Could not decode parameters for AUTH " + authType); } Response res = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java index 0902edb..bc87827 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java @@ -43,7 +43,7 @@ import com.google.common.collect.ImmutableSet; /** * Handles EHLO command */ -public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> implements EhloExtension{ +public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> implements EhloExtension { /** * The name of the command handled by the command handler http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 614d471..1b8423d 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 @@ -164,7 +164,7 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension if (currentSize == null) { newSize = Long.valueOf(line.remaining()); } else { - newSize = Long.valueOf(currentSize.intValue()+line.remaining()); + newSize = Long.valueOf(currentSize.intValue() + line.remaining()); } session.setAttachment("CURRENT_SIZE", newSize, State.Transaction); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java index 2878d0c..11ebcfd 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java @@ -51,10 +51,8 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte private static final Response TLS_ALREADY_ACTIVE = new SMTPResponse("500", DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD) + " TLS already active RFC2487 5.2").immutable(); private static final Response READY_FOR_STARTTLS = new SMTPStartTlsResponse("220", DSNStatus.getStatus(DSNStatus.SUCCESS, DSNStatus.UNDEFINED_STATUS) + " Ready to start TLS").immutable(); private static final Response SYNTAX_ERROR = new SMTPResponse("501 " + DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG) + " Syntax error (no parameters allowed) with STARTTLS command").immutable(); - private static final Response NOT_SUPPORTED = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD) +" Command " + COMMAND_NAME +" unrecognized.").immutable(); - /** - * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() - */ + private static final Response NOT_SUPPORTED = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD) + " Command " + COMMAND_NAME + " unrecognized.").immutable(); + public Collection<String> getImplCommands() { return COMMANDS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 ab91fea..cce3891 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 @@ -54,6 +54,7 @@ public abstract class AbstractGreylistHandler implements RcptHook { + " Temporary rejected: Reconnect to fast. Please try again later"); private static final HookResult TEMPORARY_REJECT = new HookResult(HookReturnCode.DENYSOFT, SMTPRetCode.LOCAL_ERROR, DSNStatus.getStatus(DSNStatus.TRANSIENT, DSNStatus.NETWORK_DIR_SERVER) + " Temporary rejected: Please try again later"); + public void setUnseenLifeTime(long unseenLifeTime) { this.unseenLifeTime = unseenLifeTime; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 9b53c7e..622b4ef 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 @@ -55,7 +55,7 @@ public abstract class AbstractValidRcptHandler implements RcptHook { } else { if (isValidRecipient(session, rcpt) == false) { - reject= true; + reject = true; } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java index 2c70cd0..5e27ded 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java @@ -33,7 +33,7 @@ import org.apache.james.protocols.smtp.hook.UnknownHook; * * */ -public class MaxUnknownCmdHandler implements UnknownHook{ +public class MaxUnknownCmdHandler implements UnknownHook { public static final int DEFAULT_MAX_UNKOWN = 5; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java index ce2354b..cda61f8 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java @@ -70,11 +70,7 @@ public class ResolvableEhloHeloHandler implements RcptHook, HeloHook { protected String resolve(String host) throws UnknownHostException { return InetAddress.getByName(host).getHostName(); } - /** - * @param session the SMTPSession - * @param argument the argument - * @return true if the helo is bad. - */ + protected boolean isBadHelo(SMTPSession session, String argument) { // try to resolv the provided helo. If it can not resolved do not // accept it. http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 f77aebb..45bfcb6 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 @@ -77,7 +77,7 @@ public class SpamTrapHandler implements RcptHook { return HookResult.deny(); } else { - if (spamTrapRecips.contains(rcpt.toString().toLowerCase(Locale.US))){ + if (spamTrapRecips.contains(rcpt.toString().toLowerCase(Locale.US))) { addIp(address, session); @@ -107,7 +107,7 @@ public class SpamTrapHandler implements RcptHook { } else { LOGGER.debug("Remove ip {} from blockList", ip); - synchronized(blockedIps) { + synchronized (blockedIps) { blockedIps.remove(ip); } } @@ -126,7 +126,7 @@ public class SpamTrapHandler implements RcptHook { LOGGER.debug("Add ip {} for {} to blockList", ip, bTime); - synchronized(blockedIps) { + synchronized (blockedIps) { blockedIps.put(ip, Long.valueOf(bTime)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 929a6fd..531ff6e 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 @@ -58,7 +58,7 @@ public class SupressDuplicateRcptHandler implements RcptHook { Collection<MailAddress> rcptList = (Collection<MailAddress>) session.getAttachment(SMTPSession.RCPT_LIST, State.Transaction); // Check if the recipient is already in the rcpt list - if(rcptList != null && rcptList.contains(rcpt)) { + if (rcptList != null && rcptList.contains(rcpt)) { StringBuilder responseBuffer = new StringBuilder(); responseBuffer.append(DSNStatus.getStatus(DSNStatus.SUCCESS, DSNStatus.ADDRESS_VALID)) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java index c1341bb..94d5aba 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java @@ -38,7 +38,7 @@ public abstract class ValidSenderDomainHandler implements MailHook { */ public HookResult doMail(SMTPSession session, MailAddress sender) { if (sender != null && !hasMXRecord(session,sender.getDomain())) { - return new HookResult(HookReturnCode.DENY,SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.ADDRESS_SYNTAX_SENDER)+ " sender " + sender + " contains a domain with no valid MX records"); + return new HookResult(HookReturnCode.DENY,SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.ADDRESS_SYNTAX_SENDER) + " sender " + sender + " contains a domain with no valid MX records"); } else { return HookResult.declined(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 adf9017..1c96646 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 @@ -75,7 +75,7 @@ public class HookResultLogger implements HookResultHook { info = true; } if ((result & HookReturnCode.DISCONNECT) == HookReturnCode.DISCONNECT) { - if(match) { + if (match) { sb.append("|"); } sb.append("DISCONNECT"); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java index 3591b32..952c98b 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java @@ -23,7 +23,7 @@ import org.apache.james.protocols.smtp.SMTPSession; /** * Implement this interfaces to hook in the AUTH Command */ -public interface AuthHook extends Hook{ +public interface AuthHook extends Hook { /** * Return the HookResult after run the hook http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HeloHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HeloHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HeloHook.java index b2b6589..716a0e1 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HeloHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HeloHook.java @@ -28,7 +28,7 @@ import org.apache.james.protocols.smtp.SMTPSession; * Implement this interfaces to hook in the HELO Command * */ -public interface HeloHook extends Hook{ +public interface HeloHook extends Hook { /** * Return the HookResult after run the hook http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java index 2a14cba..03bae53 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java @@ -22,7 +22,7 @@ package org.apache.james.protocols.smtp.hook; import org.apache.james.protocols.smtp.SMTPSession; -public interface HookResultHook extends Hook{ +public interface HookResultHook extends Hook { HookResult onHookResult(SMTPSession session,HookResult result, long executionTime, Hook object); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java index a0feafa..ec1649f 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java @@ -26,7 +26,7 @@ import org.apache.james.protocols.smtp.SMTPSession; * Implement this interfaces to hook in the MAIL Command * */ -public interface MailHook extends Hook{ +public interface MailHook extends Hook { /** * Return the HookResult after run the hook http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailParametersHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailParametersHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailParametersHook.java index 1df6beb..2438898 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailParametersHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailParametersHook.java @@ -24,7 +24,7 @@ import org.apache.james.protocols.smtp.SMTPSession; * Implement this interfaces to hook in the MAIL Command * */ -public interface MailParametersHook extends Hook{ +public interface MailParametersHook extends Hook { /** * Return the HookResult after run the hook http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java index dc76ca6..75cfe01 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java @@ -26,7 +26,7 @@ import org.apache.james.protocols.smtp.SMTPSession; * be server-wide common to all the SMTPHandlers, therefore the handlers must * store all the state information in the SMTPSession object */ -public interface MessageHook extends Hook{ +public interface MessageHook extends Hook { /** * Handle Message */ http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/QuitHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/QuitHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/QuitHook.java index 1ab7b19..a6c2335 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/QuitHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/QuitHook.java @@ -28,7 +28,7 @@ import org.apache.james.protocols.smtp.SMTPSession; * Implement this interfaces to hook in the MAIL Command * */ -public interface QuitHook extends Hook{ +public interface QuitHook extends Hook { /** * Return the HookResult after run the hook http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java index bbc65b1..0c09663 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java @@ -24,7 +24,7 @@ import org.apache.james.protocols.smtp.SMTPSession; /** * Implement this interfaces to hook in the MAIL Command */ -public interface RcptHook extends Hook{ +public interface RcptHook extends Hook { /** * Return the HookResult after run the hook http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java index 3b09e07..16876d7 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java @@ -25,7 +25,7 @@ import org.apache.james.protocols.smtp.SMTPSession; * * */ -public interface UnknownHook extends Hook{ +public interface UnknownHook extends Hook { /** * Called on unknown smtp command http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java index afbdd5c..94249a8 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPSServerTest.java @@ -27,7 +27,7 @@ import org.apache.james.protocols.api.utils.BogusSslContextFactory; import org.apache.james.protocols.api.utils.BogusTrustManagerFactory; -public abstract class AbstractSMTPSServerTest extends AbstractSMTPServerTest{ +public abstract class AbstractSMTPSServerTest extends AbstractSMTPServerTest { @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
