http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 5be6f4e..b98efab 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 @@ -62,8 +62,8 @@ public abstract class AbstractSMTPServerTest { protected static final String MSG1 = "Subject: Testmessage\r\n\r\nThis is a message\r\n"; protected static final String SENDER = "me@sender"; - protected static final String RCPT1 ="rpct1@domain"; - protected static final String RCPT2 ="rpct2@domain"; + protected static final String RCPT1 = "rpct1@domain"; + protected static final String RCPT2 = "rpct2@domain"; @Test public void testSimpleDelivery() throws Exception { @@ -142,19 +142,19 @@ public abstract class AbstractSMTPServerTest { assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT1); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT2); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); assertThat(client.sendShortMessageData(msg)).isTrue(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); } @@ -177,7 +177,7 @@ public abstract class AbstractSMTPServerTest { client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); assertThat(queued.hasNext()).isFalse(); @@ -209,7 +209,7 @@ public abstract class AbstractSMTPServerTest { client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); assertThat(queued.hasNext()).isFalse(); @@ -241,7 +241,7 @@ public abstract class AbstractSMTPServerTest { client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); assertThat(queued.hasNext()).isFalse(); @@ -273,15 +273,15 @@ public abstract class AbstractSMTPServerTest { assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isTrue(); client.mail("invalid"); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT1); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); @@ -312,10 +312,10 @@ public abstract class AbstractSMTPServerTest { assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isTrue(); client.helo(""); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); @@ -348,15 +348,15 @@ public abstract class AbstractSMTPServerTest { assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.rcpt(RCPT1); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); @@ -385,21 +385,21 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.mail(SENDER); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT1); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); @@ -426,15 +426,15 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); @@ -462,15 +462,15 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = hook.getQueued().iterator(); @@ -512,15 +512,15 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); } finally { @@ -559,15 +559,15 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); } finally { @@ -605,18 +605,18 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); } finally { @@ -654,18 +654,18 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); } finally { @@ -709,25 +709,25 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT1); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT2); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); } finally { @@ -772,25 +772,25 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT1); - assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT2); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); } finally { @@ -811,21 +811,21 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.setSender(""); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT1); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); } finally { @@ -867,23 +867,23 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT2); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); assertThat(client.sendShortMessageData(MSG1)).isFalse(); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = testHook.getQueued().iterator(); @@ -930,23 +930,23 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.helo("localhost"); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.setSender(SENDER); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.addRecipient(RCPT2); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); assertThat(client.sendShortMessageData(MSG1)).isFalse(); - assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.quit(); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); Iterator<MailEnvelope> queued = testHook.getQueued().iterator(); @@ -991,7 +991,7 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativePermanent(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); @@ -1032,7 +1032,7 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isNegativeTransient(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect(); @@ -1074,7 +1074,7 @@ public abstract class AbstractSMTPServerTest { SMTPClient client = createClient(); InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress(); client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort()); - assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply="+ client.getReplyString()).isTrue(); + assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).as("Reply=" + client.getReplyString()).isTrue(); client.disconnect();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java index 8496bee..16529aa 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java @@ -89,7 +89,7 @@ public class DNSRBLHandlerTest { } else if ("1.0.168.192.bl.spamcop.net.".equals(host)) { return false; } - throw new UnsupportedOperationException("getByName("+host+") not implemented in DNSRBLHandlerTest mock"); + throw new UnsupportedOperationException("getByName(" + host + ") not implemented in DNSRBLHandlerTest mock"); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java index 9f5f68c..b436b58 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java @@ -41,10 +41,7 @@ public class MaxUnknownCmdHandlerTest { public Map<String,Object> getState() { return map; } - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolSession#setAttachment(java.lang.String, java.lang.Object, org.apache.james.protocols.api.ProtocolSession.State) - */ + public Object setAttachment(String key, Object value, State state) { if (state == State.Connection) { throw new UnsupportedOperationException(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java index 8eff79e..878284b 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java @@ -81,7 +81,7 @@ public class SpamTrapHandlerTest { // Wait for the blockTime to exceed Thread.sleep(blockTime); } catch (InterruptedException e) { - fail("Failed to sleep for " + blockTime +" ms"); + fail("Failed to sleep for " + blockTime + " ms"); } result = handler.doRcpt(setUpSMTPSession(ip),null,new MailAddress(RECIP1)).getResult(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java index 7d5594e..2b90ec2 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPSServerTest.java @@ -31,7 +31,7 @@ import org.apache.james.protocols.smtp.AbstractSMTPSServerTest; * * */ -public class NettySMTPSServerTest extends AbstractSMTPSServerTest{ +public class NettySMTPSServerTest extends AbstractSMTPSServerTest { 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/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPServerTest.java index e037107..8ae4b0a 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettySMTPServerTest.java @@ -30,7 +30,7 @@ import org.apache.james.protocols.smtp.AbstractSMTPServerTest; * * */ -public class NettySMTPServerTest extends AbstractSMTPServerTest{ +public class NettySMTPServerTest extends AbstractSMTPServerTest { 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/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 1a76dbc..2131f9a 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 @@ -197,7 +197,7 @@ public class NettyStartTlsSMTPServerTest { @Test public void startTlsShouldWorkWhenUsingJavamail() throws Exception { TestMessageHook hook = new TestMessageHook(); - server = createServer(createProtocol(Optional.<ProtocolHandler> of(hook)), Encryption.createStartTls(BogusSslContextFactory.getServerContext())); + server = createServer(createProtocol(Optional.<ProtocolHandler>of(hook)), Encryption.createStartTls(BogusSslContextFactory.getServerContext())); server.bind(); SMTPTransport transport = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/cli/src/main/java/org/apache/james/cli/exceptions/JamesCliException.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/exceptions/JamesCliException.java b/server/container/cli/src/main/java/org/apache/james/cli/exceptions/JamesCliException.java index b565a75..66d54c1 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/exceptions/JamesCliException.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/exceptions/JamesCliException.java @@ -19,7 +19,7 @@ package org.apache.james.cli.exceptions; -public class JamesCliException extends RuntimeException{ +public class JamesCliException extends RuntimeException { public JamesCliException(String s) { super(s); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java b/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java index d3d0f74..5871619 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java @@ -122,7 +122,7 @@ public enum CmdType { public String getUsage() { StringBuilder stringBuilder = new StringBuilder(command); - for(String argument : arguments) { + for (String argument : arguments) { stringBuilder.append(" <" + argument + ">"); } return stringBuilder.toString(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/cli/src/main/java/org/apache/james/cli/utils/ValueWithUnit.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/utils/ValueWithUnit.java b/server/container/cli/src/main/java/org/apache/james/cli/utils/ValueWithUnit.java index 3d8b71e..0bac5ff 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/utils/ValueWithUnit.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/utils/ValueWithUnit.java @@ -53,14 +53,14 @@ public class ValueWithUnit { this.value = value; } - public static ValueWithUnit parse(String providedLongWithUnitString) throws Exception{ - if(providedLongWithUnitString.equalsIgnoreCase(UNKNOWN)) { + public static ValueWithUnit parse(String providedLongWithUnitString) throws Exception { + if (providedLongWithUnitString.equalsIgnoreCase(UNKNOWN)) { return new ValueWithUnit(Unit.NoUnit, Quota.UNKNOWN); } - if(providedLongWithUnitString.equalsIgnoreCase(UNLIMITED)) { + if (providedLongWithUnitString.equalsIgnoreCase(UNLIMITED)) { return new ValueWithUnit(Unit.NoUnit, Quota.UNLIMITED); } - char lastChar = providedLongWithUnitString.charAt(providedLongWithUnitString.length()-1); + char lastChar = providedLongWithUnitString.charAt(providedLongWithUnitString.length() - 1); Unit unit = getUnit(lastChar); String argWithoutUnit = removeLastCharIfNeeded(providedLongWithUnitString, unit); return new ValueWithUnit(unit, Long.parseLong(argWithoutUnit)); @@ -88,15 +88,15 @@ public class ValueWithUnit { } private static String removeLastCharIfNeeded(String providedLongWithUnitString, Unit unit) { - if(unit != Unit.NoUnit) { - return providedLongWithUnitString.substring(0, providedLongWithUnitString.length()-1); + if (unit != Unit.NoUnit) { + return providedLongWithUnitString.substring(0, providedLongWithUnitString.length() - 1); } else { return providedLongWithUnitString; } } - private static Unit getUnit(char lastChar) throws Exception{ - switch(lastChar) { + private static Unit getUnit(char lastChar) throws Exception { + switch (lastChar) { case 'K' : case 'k' : return Unit.K; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java index aa24c29..e59b4c6 100644 --- a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java +++ b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java @@ -117,7 +117,7 @@ public class ServerCmdTest { String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.LISTDOMAINS.getCommand()}; CommandLine commandLine = ServerCmd.parseCommandLine(arguments); - expect(dataProbe.listDomains()).andReturn(ImmutableList.<String> of()); + expect(dataProbe.listDomains()).andReturn(ImmutableList.<String>of()); control.replay(); testee.executeCommandLine(commandLine); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageInputStreamSourceTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageInputStreamSourceTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageInputStreamSourceTest.java index 642699b..a81c422 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageInputStreamSourceTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageInputStreamSourceTest.java @@ -30,8 +30,8 @@ import org.junit.Test; public class MimeMessageInputStreamSourceTest { - private static final int _1M = 1024*1024; - private static final int _10KB = 10*1024; + private static final int _1M = 1024 * 1024; + private static final int _10KB = 10 * 1024; private MimeMessageInputStreamSource testee; @After http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/core/src/test/java/org/apache/james/server/core/filesystem/SimpleUrlTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/filesystem/SimpleUrlTest.java b/server/container/core/src/test/java/org/apache/james/server/core/filesystem/SimpleUrlTest.java index 420f8b3..21b6707 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/filesystem/SimpleUrlTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/filesystem/SimpleUrlTest.java @@ -24,7 +24,7 @@ import org.junit.Test; public class SimpleUrlTest { - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void simplifyPathShouldThrowOnNull() { SimpleUrl.simplifyPath(null); } @@ -52,7 +52,7 @@ public class SimpleUrlTest { assertThat(new SimpleUrl("").getSimplified()).isEmpty(); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void simplifiedShouldThrowWhenNullInput() { new SimpleUrl(null); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/GuiceModuleTestRule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/GuiceModuleTestRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/GuiceModuleTestRule.java index 4b78ea8..ca586c4 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/GuiceModuleTestRule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/GuiceModuleTestRule.java @@ -25,5 +25,6 @@ import com.google.inject.Module; public interface GuiceModuleTestRule extends TestRule { Module getModule(); + void await(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestESMetricReporterModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestESMetricReporterModule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestESMetricReporterModule.java index 65f8dd6..1ad9c09 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestESMetricReporterModule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestESMetricReporterModule.java @@ -28,7 +28,7 @@ import org.apache.james.metrics.es.ESReporterConfiguration; import com.google.inject.AbstractModule; import com.google.inject.Provides; -public class TestESMetricReporterModule extends AbstractModule{ +public class TestESMetricReporterModule extends AbstractModule { private static final String LOCALHOST = "localhost"; private static final int DEFAULT_ES_HTTP_PORT = 9200; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java index 428f160..8a35f9a 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java @@ -32,7 +32,7 @@ import org.elasticsearch.client.Client; import com.google.inject.AbstractModule; import com.google.inject.Provides; -public class TestElasticSearchModule extends AbstractModule{ +public class TestElasticSearchModule extends AbstractModule { private final EmbeddedElasticSearch embeddedElasticSearch; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestTikaModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestTikaModule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestTikaModule.java index 3985e2a..4abe3e2 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestTikaModule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestTikaModule.java @@ -31,7 +31,7 @@ import org.apache.james.mailbox.tika.TikaHttpClientImpl; import com.google.inject.AbstractModule; import com.google.inject.Provides; -public class TestTikaModule extends AbstractModule{ +public class TestTikaModule extends AbstractModule { private final TikaContainer tika; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java index 49b0893..20f724f 100644 --- a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java +++ b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java @@ -98,7 +98,7 @@ public class JMXServer { PropertiesConfiguration configuration = getPropertiesConfiguration(); String address = configuration.getString("jmx.address", "localhost"); int port = configuration.getInt("jmx.port", 9999); - String serviceURL = "service:jmx:rmi://" + address + "/jndi/rmi://" + address+ ":" + port +"/jmxrmi"; + String serviceURL = "service:jmx:rmi://" + address + "/jndi/rmi://" + address + ":" + port + "/jmxrmi"; restrictingRMISocketFactory = new RestrictingRMISocketFactory(address); LocateRegistry.createRegistry(port, restrictingRMISocketFactory, restrictingRMISocketFactory); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java index d904678..c7c57fb 100644 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java +++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java @@ -134,7 +134,7 @@ public class JPAMailboxModule extends AbstractModule { @Provides @Singleton - JPAConfiguration provideConfiguration(PropertiesProvider propertiesProvider) throws FileNotFoundException, ConfigurationException{ + JPAConfiguration provideConfiguration(PropertiesProvider propertiesProvider) throws FileNotFoundException, ConfigurationException { PropertiesConfiguration dataSource = propertiesProvider.getConfiguration("james-database"); return JPAConfiguration.builder() .driverName(dataSource.getString("database.driverClassName")) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/jpa-guice/src/test/java/org/apache/james/TestJPAConfigurationModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/TestJPAConfigurationModule.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/TestJPAConfigurationModule.java index 7c064c4..3fa53f6 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/TestJPAConfigurationModule.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/TestJPAConfigurationModule.java @@ -39,7 +39,7 @@ public class TestJPAConfigurationModule extends AbstractModule { @Provides @Singleton - JPAConfiguration provideConfiguration() throws FileNotFoundException, ConfigurationException{ + JPAConfiguration provideConfiguration() throws FileNotFoundException, ConfigurationException { return JPAConfiguration.builder() .driverName(JDBC_EMBEDDED_DRIVER) .driverURL(JDBC_EMBEDDED_URL) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/jpa-smtp/src/test/java/org/apache/james/TestJPAConfigurationModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/src/test/java/org/apache/james/TestJPAConfigurationModule.java b/server/container/guice/jpa-smtp/src/test/java/org/apache/james/TestJPAConfigurationModule.java index 7c064c4..3fa53f6 100644 --- a/server/container/guice/jpa-smtp/src/test/java/org/apache/james/TestJPAConfigurationModule.java +++ b/server/container/guice/jpa-smtp/src/test/java/org/apache/james/TestJPAConfigurationModule.java @@ -39,7 +39,7 @@ public class TestJPAConfigurationModule extends AbstractModule { @Provides @Singleton - JPAConfiguration provideConfiguration() throws FileNotFoundException, ConfigurationException{ + JPAConfiguration provideConfiguration() throws FileNotFoundException, ConfigurationException { return JPAConfiguration.builder() .driverName(JDBC_EMBEDDED_DRIVER) .driverURL(JDBC_EMBEDDED_URL) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java index b236a84..0140f0d 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java @@ -88,7 +88,7 @@ public class MemoryMailQueueFactoryTest { } @Test - public void dequeueShouldWork() throws Exception{ + public void dequeueShouldWork() throws Exception { Mail mail = FakeMail.builder() .name(NAME_1) .build(); @@ -97,7 +97,7 @@ public class MemoryMailQueueFactoryTest { } @Test - public void dequeueShouldPreserveState() throws Exception{ + public void dequeueShouldPreserveState() throws Exception { String state = "state"; Mail mail = FakeMail.builder() .name(NAME_1) @@ -115,7 +115,7 @@ public class MemoryMailQueueFactoryTest { } @Test - public void dequeueShouldPreserveName() throws Exception{ + public void dequeueShouldPreserveName() throws Exception { Mail mail = FakeMail.builder() .name(NAME_1) .build(); @@ -131,7 +131,7 @@ public class MemoryMailQueueFactoryTest { } @Test - public void dequeueShouldWorkWithMultipleMessages() throws Exception{ + public void dequeueShouldWorkWithMultipleMessages() throws Exception { Mail mail1 = FakeMail.builder() .name(NAME_1) .build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java index 3f68373..ad16a2f 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java @@ -103,7 +103,7 @@ public class JMAPModule extends AbstractModule { @Provides @Singleton - JMAPConfiguration provideConfiguration(PropertiesProvider propertiesProvider, FileSystem fileSystem) throws ConfigurationException, IOException{ + JMAPConfiguration provideConfiguration(PropertiesProvider propertiesProvider, FileSystem fileSystem) throws ConfigurationException, IOException { try { PropertiesConfiguration configuration = propertiesProvider.getConfiguration("jmap"); return JMAPConfiguration.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/modules/TestJMAPServerModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/modules/TestJMAPServerModule.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/modules/TestJMAPServerModule.java index c15f5e4..a2f9313 100644 --- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/modules/TestJMAPServerModule.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/modules/TestJMAPServerModule.java @@ -32,17 +32,18 @@ import com.google.inject.AbstractModule; import com.google.inject.Provides; import com.google.inject.name.Names; -public class TestJMAPServerModule extends AbstractModule{ +public class TestJMAPServerModule extends AbstractModule { - private static final String PUBLIC_PEM_KEY = "-----BEGIN PUBLIC KEY-----\n" + - "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlChO/nlVP27MpdkG0Bh\n" + - "16XrMRf6M4NeyGa7j5+1UKm42IKUf3lM28oe82MqIIRyvskPc11NuzSor8HmvH8H\n" + - "lhDs5DyJtx2qp35AT0zCqfwlaDnlDc/QDlZv1CoRZGpQk1Inyh6SbZwYpxxwh0fi\n" + - "+d/4RpE3LBVo8wgOaXPylOlHxsDizfkL8QwXItyakBfMO6jWQRrj7/9WDhGf4Hi+\n" + - "GQur1tPGZDl9mvCoRHjFrD5M/yypIPlfMGWFVEvV5jClNMLAQ9bYFuOc7H1fEWw6\n" + - "U1LZUUbJW9/CH45YXz82CYqkrfbnQxqRb2iVbVjs/sHopHd1NTiCfUtwvcYJiBVj\n" + - "kwIDAQAB\n" + - "-----END PUBLIC KEY-----"; + private static final String PUBLIC_PEM_KEY = + "-----BEGIN PUBLIC KEY-----\n" + + "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlChO/nlVP27MpdkG0Bh\n" + + "16XrMRf6M4NeyGa7j5+1UKm42IKUf3lM28oe82MqIIRyvskPc11NuzSor8HmvH8H\n" + + "lhDs5DyJtx2qp35AT0zCqfwlaDnlDc/QDlZv1CoRZGpQk1Inyh6SbZwYpxxwh0fi\n" + + "+d/4RpE3LBVo8wgOaXPylOlHxsDizfkL8QwXItyakBfMO6jWQRrj7/9WDhGf4Hi+\n" + + "GQur1tPGZDl9mvCoRHjFrD5M/yypIPlfMGWFVEvV5jClNMLAQ9bYFuOc7H1fEWw6\n" + + "U1LZUUbJW9/CH45YXz82CYqkrfbnQxqRb2iVbVjs/sHopHd1NTiCfUtwvcYJiBVj\n" + + "kwIDAQAB\n" + + "-----END PUBLIC KEY-----"; private final long maximumLimit; @@ -57,7 +58,7 @@ public class TestJMAPServerModule extends AbstractModule{ @Provides @Singleton - JMAPConfiguration provideConfiguration() throws FileNotFoundException, ConfigurationException{ + JMAPConfiguration provideConfiguration() throws FileNotFoundException, ConfigurationException { return JMAPConfiguration.builder() .enable() .keystore("keystore") http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java index 8770adb..0f59d38 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java @@ -26,7 +26,7 @@ import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; -public class ProtocolHandlerLoaderBeanFactory extends AbstractBeanFactory implements ProtocolHandlerLoader{ +public class ProtocolHandlerLoaderBeanFactory extends AbstractBeanFactory implements ProtocolHandlerLoader { @SuppressWarnings("unchecked") @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java b/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java index fd30993..996010b 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java @@ -27,7 +27,7 @@ import org.apache.james.filesystem.api.FileSystem; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; -public class ResourceLoaderFileSystem implements FileSystem, ResourceLoaderAware{ +public class ResourceLoaderFileSystem implements FileSystem, ResourceLoaderAware { private ResourceLoader loader; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java index 7ee950a..451a97b 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java @@ -96,10 +96,8 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc // Simply return the configuration if it is already loaded. if (conf != null) { return conf; - } - - // Load the configuration. - else { + } else { + // Load the configuration. // Compute resourceName and configPart (if any, configPart can // remain null). http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java index a8492a0..cba1469 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java @@ -53,9 +53,9 @@ import org.springframework.util.ReflectionUtils; * * @param <A> */ -public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotation> extends InstantiationAwareBeanPostProcessorAdapter implements BundleContextAware, BeanClassLoaderAware, BeanFactoryAware{ +public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotation> extends InstantiationAwareBeanPostProcessorAdapter implements BundleContextAware, BeanClassLoaderAware, BeanFactoryAware { - public static final long DEFAULT_TIMEOUT = 60 * 1000* 5; + public static final long DEFAULT_TIMEOUT = 60 * 1000 * 5; private BundleContext bundleContext; private static final Logger logger = LoggerFactory.getLogger(AbstractOSGIAnnotationBeanPostProcessor.class); @@ -165,8 +165,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati try { logger.debug("Processing annotation [{}] for [{}.{}()] on bean [{}]", s, bean.getClass().getName(), method.getName(), beanName); method.invoke(bean, getServiceImporter(s, method, beanName).getObject()); - } - catch (Exception e) { + } catch (Exception e) { throw new IllegalArgumentException("Error processing annotation " + s, e); } } @@ -193,8 +192,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati ImporterCallAdapter.setCardinality(importer, Cardinality.C_0__1); } newprops.addPropertyValue(pd.getName(), importer.getObject()); - } - catch (Exception e) { + } catch (Exception e) { throw new FatalBeanException("Could not create service reference", e); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java index 3eac87f..65042fd 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java @@ -25,7 +25,7 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.XMLConfiguration; -public class OSGIConfigurationProvider implements org.apache.james.container.spring.lifecycle.ConfigurationProvider{ +public class OSGIConfigurationProvider implements org.apache.james.container.spring.lifecycle.ConfigurationProvider { @Override public void registerConfiguration(String beanName, HierarchicalConfiguration conf) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIPersistenceUnitAnnotationBeanPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIPersistenceUnitAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIPersistenceUnitAnnotationBeanPostProcessor.java index 44ec58d..56ca90c 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIPersistenceUnitAnnotationBeanPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIPersistenceUnitAnnotationBeanPostProcessor.java @@ -24,7 +24,7 @@ import javax.persistence.PersistenceUnit; /** * Inject the {@link EntityManagerFactory} if an method is marked with the {@link PersistenceUnit} annotation */ -public class OSGIPersistenceUnitAnnotationBeanPostProcessor extends AbstractOSGIAnnotationBeanPostProcessor<PersistenceUnit>{ +public class OSGIPersistenceUnitAnnotationBeanPostProcessor extends AbstractOSGIAnnotationBeanPostProcessor<PersistenceUnit> { @Override protected Class<PersistenceUnit> getAnnotation() { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java index e507f79..2570b06 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java @@ -22,7 +22,7 @@ import javax.annotation.Resource; import org.springframework.osgi.service.exporter.OsgiServicePropertiesResolver; -public class OSGIResourceAnnotationBeanPostProcessor extends AbstractOSGIAnnotationBeanPostProcessor<Resource>{ +public class OSGIResourceAnnotationBeanPostProcessor extends AbstractOSGIAnnotationBeanPostProcessor<Resource> { /** * @see org.apache.james.container.spring.lifecycle.osgi.AbstractOSGIAnnotationBeanPostProcessor#getAnnotation() @@ -33,8 +33,9 @@ public class OSGIResourceAnnotationBeanPostProcessor extends AbstractOSGIAnnotat @Override protected String getFilter(Resource a) { - return "(" +OsgiServicePropertiesResolver.BEAN_NAME_PROPERTY_KEY + "=" + a.name() +")"; + return "(" + OsgiServicePropertiesResolver.BEAN_NAME_PROPERTY_KEY + "=" + a.name() + ")"; } + @Override protected Object getBeanFromFactory(Resource a, Class<?> clazz) { return beanFactory.getBean(a.name(), clazz); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java index a81b09a..0b50d10 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java @@ -49,7 +49,7 @@ public class MaxQuotaConfigurationReader implements Configurable { try { configureDefaultValues(defaultMaxMessage, defaultMaxStorage); configureQuotaRootSpecificValues(maxMessage, maxStorage); - } catch(MailboxException e) { + } catch (MailboxException e) { throw new ConfigurationException("Exception caught while configuring max quota manager", e); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java index 94edacd..ae841a6 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java @@ -143,7 +143,7 @@ public abstract class AbstractBundleTracker implements BeanFactoryAware, BundleL final ServiceReference<?>[] applicationContextRefs = bundleContext.getServiceReferences(ApplicationContext.class.getName(), filter); // Check if we found an ApplicationContext. If not create one - if(applicationContextRefs == null || applicationContextRefs.length != 1) { + if (applicationContextRefs == null || applicationContextRefs.length != 1) { // Create a new context which just serve as registry later AbstractDelegatedExecutionApplicationContext context = new AbstractDelegatedExecutionApplicationContext() { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/DomainListTracker.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/DomainListTracker.java b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/DomainListTracker.java index da91e8c..9d94886 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/DomainListTracker.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/DomainListTracker.java @@ -20,7 +20,7 @@ package org.apache.james.container.spring.osgi; import org.apache.james.domainlist.api.DomainList; -public class DomainListTracker extends AbstractBundleTracker{ +public class DomainListTracker extends AbstractBundleTracker { @Override protected String getComponentName() { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/RecipientRewriteTableTracker.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/RecipientRewriteTableTracker.java b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/RecipientRewriteTableTracker.java index f326cc7..3126604 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/RecipientRewriteTableTracker.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/RecipientRewriteTableTracker.java @@ -20,7 +20,7 @@ package org.apache.james.container.spring.osgi; import org.apache.james.rrt.api.RecipientRewriteTable; -public class RecipientRewriteTableTracker extends AbstractBundleTracker{ +public class RecipientRewriteTableTracker extends AbstractBundleTracker { @Override protected String getComponentName() { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/UsersRepositoryTracker.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/UsersRepositoryTracker.java b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/UsersRepositoryTracker.java index 684ae10..e956e47 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/UsersRepositoryTracker.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/UsersRepositoryTracker.java @@ -20,7 +20,7 @@ package org.apache.james.container.spring.osgi; import org.apache.james.user.api.UsersRepository; -public class UsersRepositoryTracker extends AbstractBundleTracker{ +public class UsersRepositoryTracker extends AbstractBundleTracker { @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/util-java8/src/main/java/org/apache/james/util/date/ImapDateTimeFormatter.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/main/java/org/apache/james/util/date/ImapDateTimeFormatter.java b/server/container/util-java8/src/main/java/org/apache/james/util/date/ImapDateTimeFormatter.java index 049ad08..0a0d633 100644 --- a/server/container/util-java8/src/main/java/org/apache/james/util/date/ImapDateTimeFormatter.java +++ b/server/container/util-java8/src/main/java/org/apache/james/util/date/ImapDateTimeFormatter.java @@ -63,7 +63,7 @@ public class ImapDateTimeFormatter { } private static ImmutableMap<Long, String> monthOfYear() { - return ImmutableMap.<Long, String> builder() + return ImmutableMap.<Long, String>builder() .put(1L, "Jan") .put(2L, "Feb") .put(3L, "Mar") @@ -80,7 +80,7 @@ public class ImapDateTimeFormatter { } private static ImmutableMap<Long, String> dayOfWeek() { - return ImmutableMap.<Long, String> builder() + return ImmutableMap.<Long, String>builder() .put(1L, "Mon") .put(2L, "Tue") .put(3L, "Wed") http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/util-java8/src/main/java/org/apache/james/util/mime/MessageContentExtractor.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/main/java/org/apache/james/util/mime/MessageContentExtractor.java b/server/container/util-java8/src/main/java/org/apache/james/util/mime/MessageContentExtractor.java index 09d2916..74bb660 100644 --- a/server/container/util-java8/src/main/java/org/apache/james/util/mime/MessageContentExtractor.java +++ b/server/container/util-java8/src/main/java/org/apache/james/util/mime/MessageContentExtractor.java @@ -50,7 +50,7 @@ public class MessageContentExtractor { if (body instanceof TextBody) { return parseTextBody(message, (TextBody)body); } - if (body instanceof Multipart){ + if (body instanceof Multipart) { return parseMultipart(message, (Multipart)body); } return MessageContent.empty(); @@ -73,7 +73,7 @@ public class MessageContentExtractor { } private MessageContent parseMultipartContent(Entity entity, Multipart multipart) throws IOException { - switch(entity.getMimeType()) { + switch (entity.getMimeType()) { case MULTIPART_ALTERNATIVE: return retrieveHtmlAndPlainTextContent(multipart); default: http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java index 0c1e758..907cd6a 100644 --- a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java +++ b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java @@ -281,7 +281,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer { // Used to insert new token entries. PreparedStatement insert = conn.prepareStatement(insertSqlStatement); // Used to update existing token entries. - PreparedStatement update = conn.prepareStatement(updateSqlStatement)){ + PreparedStatement update = conn.prepareStatement(updateSqlStatement)) { for (Map.Entry<String, Integer> entry : tokens.entrySet()) { update.setInt(1, entry.getValue()); @@ -374,7 +374,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer { private void deleteData(Connection conn, String deleteSqlStatement) throws SQLException { try (// Used to delete ham tokens PreparedStatement delete = conn.prepareStatement(deleteSqlStatement); - ){ + ) { delete.executeUpdate(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java index 2216829..a022520 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java @@ -219,7 +219,7 @@ public abstract class RetryingContext implements Context, ExceptionRetryingProxy @Override public Context createSubcontext(final String name) throws NamingException { final Context context = getDelegate(); - return new RetryingContext( getSchedule(), getMaxRetries()) { + return new RetryingContext(getSchedule(), getMaxRetries()) { @Override public Context newDelegate() throws NamingException { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java index a38016b..760c29f 100644 --- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java +++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/ldap/RetryingLdapContext.java @@ -56,7 +56,7 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements */ @Override public ExtendedResponse extendedOperation(final ExtendedRequest request) throws NamingException { - return (ExtendedResponse) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()){ + return (ExtendedResponse) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @Override public Object operation() throws NamingException { return ((LdapContext) getDelegate()).extendedOperation(request); @@ -69,7 +69,7 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements */ @Override public Control[] getConnectControls() throws NamingException { - return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()){ + return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @Override public Object operation() throws NamingException { return ((LdapContext) getDelegate()).getConnectControls(); @@ -82,7 +82,7 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements */ @Override public Control[] getRequestControls() throws NamingException { - return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()){ + return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @Override public Object operation() throws NamingException { return ((LdapContext) getDelegate()).getRequestControls(); @@ -95,7 +95,7 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements */ @Override public Control[] getResponseControls() throws NamingException { - return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()){ + return (Control[]) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @Override public Object operation() throws NamingException { return ((LdapContext) getDelegate()).getResponseControls(); @@ -123,7 +123,7 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements */ @Override public void reconnect(final Control[] connCtls) throws NamingException { - new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()){ + new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @Override public Object operation() throws NamingException { ((LdapContext) getDelegate()).reconnect(connCtls); @@ -137,7 +137,7 @@ public abstract class RetryingLdapContext extends RetryingDirContext implements */ @Override public void setRequestControls(final Control[] requestControls) throws NamingException { - new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()){ + new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, getSchedule(), getMaxRetries()) { @Override public Object operation() throws NamingException { ((LdapContext) getDelegate()).setRequestControls(requestControls); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java b/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java index b0d2e0d..4a03fe1 100644 --- a/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java @@ -31,7 +31,7 @@ import org.junit.rules.ExpectedException; public class ConcurrentTestRunnerTest { - public static final ConcurrentTestRunner.BiConsumer EMPTY_BI_CONSUMER = (threadNumber, step) -> {}; + public static final ConcurrentTestRunner.BiConsumer EMPTY_BI_CONSUMER = (threadNumber, step) -> { }; public static final int DEFAULT_AWAIT_TIME = 100; @Rule http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java index f07736e..d6e656e 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java @@ -132,7 +132,7 @@ public class CassandraSieveRepository implements SieveRepository { public void setActive(String user, String name) throws ScriptNotFoundException { CompletableFuture<Boolean> activateNewScript = unactivateOldScript(user) - .thenCompose( any -> updateScriptActivation(user, name, true) + .thenCompose(any -> updateScriptActivation(user, name, true) .thenCompose(CompletableFutureUtil.composeIfTrue( () -> cassandraActiveScriptDAO.activate(user, name)))); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
