Fix Eclise and checkstyle warnings and errors
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/dcac68a6 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/dcac68a6 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/dcac68a6 Branch: refs/heads/master Commit: dcac68a682331163182b02a40077ac49d7dd2133 Parents: 2c37d15 Author: Raphael Ouazana <raphael.ouaz...@linagora.com> Authored: Mon Apr 30 15:00:20 2018 +0200 Committer: benwa <btell...@linagora.com> Committed: Thu May 3 14:13:06 2018 +0700 ---------------------------------------------------------------------- .../apache/james/protocols/lmtp/AbstractLMTPServerTest.java | 1 - .../james/protocols/smtp/core/AbstractHookableCmdHandler.java | 6 ++++++ .../apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java | 6 ++++++ .../apache/james/protocols/smtp/AbstractSMTPServerTest.java | 1 - .../org/apache/james/protocols/smtp/utils/TestMessageHook.java | 1 - .../java/org/apache/james/rrt/lib/ThrowingRewriterTest.java | 1 - .../org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java | 4 ++-- .../domainlist/lib/AbstractDomainListPrivateMethodsTest.java | 3 --- .../jmap/methods/integration/GetMessageListMethodTest.java | 4 ++-- .../main/java/org/apache/james/smtpserver/jmx/HookStats.java | 2 ++ 10 files changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java index 7b95967..29bdb9d 100644 --- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java +++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java @@ -46,7 +46,6 @@ import org.apache.james.protocols.smtp.MailEnvelope; import org.apache.james.protocols.smtp.SMTPProtocol; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; -import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.hook.MessageHook; import org.apache.james.protocols.smtp.utils.TestMessageHook; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/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 3c42bb3..8a5a869 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 @@ -215,6 +215,9 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james. return Optional.of("Temporary problem. Please try again later"); case OK: return Optional.of("Command accepted"); + case DECLINED: + case NONE: + break; } if (returnCode.isDisconnected()) { return Optional.of("Server disconnected"); @@ -230,6 +233,9 @@ public abstract class AbstractHookableCmdHandler<HookT extends org.apache.james. return Optional.of(SMTPRetCode.LOCAL_ERROR); case OK: return Optional.of(SMTPRetCode.MAIL_OK); + case DECLINED: + case NONE: + break; } if (returnCode.isDisconnected()) { return Optional.of(SMTPRetCode.TRANSACTION_FAILED); http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/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 9be25c4..e24796e 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 @@ -468,6 +468,9 @@ public class AuthCmdHandler return Optional.of("Temporary problem. Please try again later"); case OK: return Optional.of("Authentication Succesfull"); + case DECLINED: + case NONE: + break; } return Optional.empty(); } @@ -480,6 +483,9 @@ public class AuthCmdHandler return Optional.of(SMTPRetCode.LOCAL_ERROR); case OK: return Optional.of(SMTPRetCode.AUTH_OK); + case DECLINED: + case NONE: + break; } return Optional.empty(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/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 9ff4519..966347e 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 @@ -48,7 +48,6 @@ import org.apache.james.protocols.api.handler.WiringException; import org.apache.james.protocols.api.utils.ProtocolServerUtils; import org.apache.james.protocols.smtp.hook.HeloHook; import org.apache.james.protocols.smtp.hook.HookResult; -import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.hook.MailHook; import org.apache.james.protocols.smtp.hook.MessageHook; import org.apache.james.protocols.smtp.hook.RcptHook; http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java index 123cd22..d0f63ef 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java @@ -26,7 +26,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.smtp.MailEnvelope; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; -import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.hook.MessageHook; public class TestMessageHook implements MessageHook { http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/server/data/data-api/src/test/java/org/apache/james/rrt/lib/ThrowingRewriterTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/test/java/org/apache/james/rrt/lib/ThrowingRewriterTest.java b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/ThrowingRewriterTest.java index 8bcf06e..c3d3af5 100644 --- a/server/data/data-api/src/test/java/org/apache/james/rrt/lib/ThrowingRewriterTest.java +++ b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/ThrowingRewriterTest.java @@ -19,7 +19,6 @@ package org.apache.james.rrt.lib; -import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.james.core.User; http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java index a601b65..e4dc88a 100644 --- a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java +++ b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java @@ -116,7 +116,7 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable { List<KeyValue> keyValues = result.list(); if (keyValues != null) { for (KeyValue keyValue : keyValues) { - String email = Bytes.toString(keyValue.getRow()); + MappingSource email = MappingSource.parse(Bytes.toString(keyValue.getRow())); Mappings mappings = MappingsImpl.from( Optional.ofNullable( @@ -124,7 +124,7 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable { .orElse(MappingsImpl.empty())) .addAll(Splitter.on(COLUMN_SEPARATOR).split(Bytes.toString(keyValue.getValue()))) .build(); - map.put(MappingSource.parse(email), mappings); + map.put(email, mappings); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java index ad50f8b..abc0f32 100644 --- a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java @@ -26,10 +26,7 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import java.net.InetAddress; -import java.util.Arrays; import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.core.Domain; http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java index 0bf5c62..d27cdcd 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java @@ -2004,7 +2004,7 @@ public abstract class GetMessageListMethodTest { public void getMessageListFileNameFilterShouldReturnOnlyMessagesWithMatchingAttachmentFileNames() throws Exception { mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox"); - ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"), + mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"), MessageManager.AppendCommand.builder() .build(Message.Builder.of() .setSubject("test") @@ -2071,7 +2071,7 @@ public abstract class GetMessageListMethodTest { public void getMessageListTextFilterShouldReturnOnlyMessagesWithMatchingAttachmentFileNames() throws Exception { mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox"); - ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"), + mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"), MessageManager.AppendCommand.builder() .build(Message.Builder.of() .setSubject("test") http://git-wip-us.apache.org/repos/asf/james-project/blob/dcac68a6/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java index 86b4e7a..0fffa10 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java @@ -70,6 +70,8 @@ public class HookStats extends StandardMBean implements HookStatsMBean, Disposab case OK: ok.incrementAndGet(); break; + case NONE: + break; } all.incrementAndGet(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
