You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2018/04/25 08:55:38 UTC
[19/24] james-project git commit: JAMES-2381 Constants in HookResult
should be public
JAMES-2381 Constants in HookResult should be public
Enforce constant usage rather than a constructor.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/914220b9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/914220b9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/914220b9
Branch: refs/heads/master
Commit: 914220b96d69950397a396e0bafcb56ebc0aacc6
Parents: aa7b7c7
Author: benwa <bt...@linagora.com>
Authored: Mon Apr 23 11:19:11 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Wed Apr 25 10:54:25 2018 +0200
----------------------------------------------------------------------
.../protocols/lmtp/AbstractLMTPServerTest.java | 4 +--
.../AbstractAuthRequiredToRelayRcptHook.java | 2 +-
...tSenderAuthIdentifyVerificationRcptHook.java | 2 +-
.../AcceptRecipientIfRelayingIsAllowed.java | 4 +--
.../smtp/core/DataLineMessageHookHandler.java | 3 +-
.../smtp/core/PostmasterAbuseRcptHook.java | 4 +--
.../smtp/core/esmtp/AuthCmdHandler.java | 2 +-
.../smtp/core/esmtp/MailSizeEsmtpExtension.java | 2 +-
.../core/fastfail/AbstractGreylistHandler.java | 4 +--
.../core/fastfail/AbstractValidRcptHandler.java | 4 +--
.../smtp/core/fastfail/DNSRBLHandler.java | 2 +-
.../smtp/core/fastfail/MaxRcptHandler.java | 2 +-
.../core/fastfail/MaxUnknownCmdHandler.java | 2 +-
.../fastfail/ResolvableEhloHeloHandler.java | 4 +--
.../smtp/core/fastfail/SpamTrapHandler.java | 6 ++--
.../fastfail/SupressDuplicateRcptHandler.java | 2 +-
.../core/fastfail/ValidSenderDomainHandler.java | 2 +-
.../james/protocols/smtp/hook/HookResult.java | 32 ++++----------------
.../james/protocols/smtp/hook/SimpleHook.java | 8 ++---
.../protocols/smtp/AbstractSMTPServerTest.java | 20 ++++++------
.../protocols/smtp/utils/TestMessageHook.java | 2 +-
.../AddDefaultAttributesMessageHook.java | 3 +-
.../james/smtpserver/MailPriorityHandler.java | 3 +-
.../SenderAuthIdentifyVerificationRcptHook.java | 3 +-
.../james/smtpserver/SetMimeHeaderHandler.java | 3 +-
.../smtpserver/UsersRepositoryAuthHook.java | 2 +-
.../fastfail/JDBCGreylistHandler.java | 3 +-
.../james/smtpserver/fastfail/SPFHandler.java | 4 +--
.../fastfail/SpamAssassinHandler.java | 2 +-
.../smtpserver/fastfail/URIRBLHandler.java | 2 +-
.../james/smtpserver/fastfail/ValidRcptMX.java | 4 +--
31 files changed, 58 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/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 f022a00..7b95967 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
@@ -344,10 +344,10 @@ public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest {
@Override
public HookResult deliver(SMTPSession session, MailAddress recipient, MailEnvelope envelope) {
if (RCPT1.equals(recipient.toString())) {
- return new HookResult(HookReturnCode.deny());
+ return HookResult.DENY;
} else {
delivered.add(envelope);
- return new HookResult(HookReturnCode.ok());
+ return HookResult.OK;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java
index 6f435ec..684b447 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java
@@ -60,7 +60,7 @@ public abstract class AbstractAuthRequiredToRelayRcptHook implements RcptHook {
}
}
- return HookResult.declined();
+ return HookResult.DECLINED;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
index 4e381d4..1d063eb 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
@@ -58,7 +58,7 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements
return INVALID_AUTH;
}
}
- return HookResult.declined();
+ return HookResult.DECLINED;
}
public String retrieveSender(MailAddress sender, MailAddress senderAddress) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java
index a0ce730..2391572 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java
@@ -34,9 +34,9 @@ public class AcceptRecipientIfRelayingIsAllowed implements RcptHook {
public HookResult doRcpt(SMTPSession session, MailAddress sender,
MailAddress rcpt) {
if (session.isRelayingAllowed()) {
- return HookResult.ok();
+ return HookResult.OK;
}
- return HookResult.declined();
+ return HookResult.DECLINED;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
index 7b99366..f650221 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
@@ -41,7 +41,6 @@ import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookResultHook;
-import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.MessageHook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -153,7 +152,7 @@ public class DataLineMessageHookHandler implements DataLineFilter, ExtensibleHan
}
// Not queue the message!
- return AbstractHookableCmdHandler.calcDefaultSMTPResponse(new HookResult(HookReturnCode.deny()));
+ return AbstractHookableCmdHandler.calcDefaultSMTPResponse(HookResult.DECLINED);
}
return null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
index 0b14614..540568e 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java
@@ -37,9 +37,9 @@ public class PostmasterAbuseRcptHook implements RcptHook {
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (rcpt.getLocalPart().equalsIgnoreCase("postmaster") || rcpt.getLocalPart().equalsIgnoreCase("abuse")) {
LOGGER.debug("Sender allowed");
- return HookResult.ok();
+ return HookResult.OK;
} else {
- return HookResult.declined();
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/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 1992bf0..9be25c4 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
@@ -549,7 +549,7 @@ public class AuthCmdHandler
public HookResult doMailParameter(SMTPSession session, String paramName, String paramValue) {
// Ignore the AUTH command.
// TODO we should at least check for correct syntax and put the result in session
- return HookResult.declined();
+ return HookResult.DECLINED;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
index 2c7e7ba..9a38a26 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
@@ -188,7 +188,7 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
LOGGER.error("Rejected message from {} from {} exceeding system maximum message size of {}", session.getAttachment(SMTPSession.SENDER, State.Transaction), session.getRemoteAddress().getAddress().getHostAddress(), session.getConfiguration().getMaxMessageSize());
return QUOTA_EXCEEDED;
} else {
- return HookResult.declined();
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
index d1ba16e..b8d0afe 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
@@ -135,7 +135,7 @@ public abstract class AbstractGreylistHandler implements RcptHook {
// just log the exception
LOGGER.error("Error on greylist method: {}", e.getMessage());
}
- return HookResult.declined();
+ return HookResult.DECLINED;
}
/**
@@ -217,6 +217,6 @@ public abstract class AbstractGreylistHandler implements RcptHook {
} else {
LOGGER.info("IpAddress {} is allowed to send. Skip greylisting.", session.getRemoteAddress().getAddress().getHostAddress());
}
- return HookResult.declined();
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
index 291e832..35f752c 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
@@ -39,12 +39,12 @@ public abstract class AbstractValidRcptHandler implements RcptHook {
@Override
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (!isLocalDomain(session, rcpt.getDomain())) {
- return HookResult.declined();
+ return HookResult.DECLINED;
}
if (!isValidRecipient(session, rcpt)) {
return reject(rcpt);
}
- return HookResult.declined();
+ return HookResult.DECLINED;
}
public HookResult reject(MailAddress rcpt) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
index 2d91e2b..ac5ce2f 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
@@ -195,7 +195,7 @@ public class DNSRBLHandler implements RcptHook {
}
}
- return HookResult.declined();
+ return HookResult.DECLINED;
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
index 01f9737..fa45f99 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
@@ -58,7 +58,7 @@ public class MaxRcptHandler implements RcptHook {
return MAX_RCPT;
} else {
- return HookResult.declined();
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
index 7652c09..e12682e 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java
@@ -70,7 +70,7 @@ public class MaxUnknownCmdHandler implements UnknownHook {
} else {
- return HookResult.declined();
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
index 13a83c5..b87bf41 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
@@ -99,14 +99,14 @@ public class ResolvableEhloHeloHandler implements RcptHook, HeloHook {
SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG)
+ " Provided EHLO/HELO " + session.getAttachment(SMTPSession.CURRENT_HELO_NAME, State.Connection) + " can not resolved.");
} else {
- return HookResult.declined();
+ return HookResult.DECLINED;
}
}
@Override
public HookResult doHelo(SMTPSession session, String helo) {
checkEhloHelo(session, helo);
- return HookResult.declined();
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
index 1b93046..77324ce 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
@@ -72,17 +72,17 @@ public class SpamTrapHandler implements RcptHook {
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
String address = session.getRemoteAddress().getAddress().getHostAddress();
if (isBlocked(address, session)) {
- return HookResult.deny();
+ return HookResult.DENY;
} else {
if (spamTrapRecips.contains(rcpt.toString().toLowerCase(Locale.US))) {
addIp(address, session);
- return HookResult.deny();
+ return HookResult.DENY;
}
}
- return HookResult.declined();
+ return HookResult.DECLINED;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
index 99e757d..9e40e95 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
@@ -66,6 +66,6 @@ public class SupressDuplicateRcptHandler implements RcptHook {
LOGGER.debug("Duplicate recipient not add to recipient list: {}", rcpt);
return new HookResult(HookReturnCode.ok(), SMTPRetCode.MAIL_OK, responseBuffer.toString());
}
- return HookResult.declined();
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java
index c99a1a0..2f8c0a4 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java
@@ -39,7 +39,7 @@ public abstract class ValidSenderDomainHandler implements MailHook {
return new HookResult(HookReturnCode.deny(),
SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.ADDRESS_SYNTAX_SENDER) + " sender " + sender + " contains a domain with no valid MX records");
} else {
- return HookResult.declined();
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java
index 048cc92..7069799 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java
@@ -27,31 +27,11 @@ import java.util.Optional;
*/
public final class HookResult {
- private static final HookResult DECLINED = new HookResult(HookReturnCode.declined());
- private static final HookResult OK = new HookResult(HookReturnCode.ok());
- private static final HookResult DENY = new HookResult(HookReturnCode.deny());
- private static final HookResult DENYSOFT = new HookResult(HookReturnCode.denySoft());
- private static final HookResult DISCONNECT = new HookResult(new HookReturnCode(HookReturnCode.Action.NONE, HookReturnCode.ConnectionStatus.Disconnected));
-
- public static HookResult declined() {
- return DECLINED;
- }
-
- public static HookResult ok() {
- return OK;
- }
-
- public static HookResult deny() {
- return DENY;
- }
-
- public static HookResult denysoft() {
- return DENYSOFT;
- }
-
- public static HookResult disconnect() {
- return DISCONNECT;
- }
+ public static final HookResult DECLINED = new HookResult(HookReturnCode.declined());
+ public static final HookResult OK = new HookResult(HookReturnCode.ok());
+ public static final HookResult DENY = new HookResult(HookReturnCode.deny());
+ public static final HookResult DENYSOFT = new HookResult(HookReturnCode.denySoft());
+ public static final HookResult DISCONNECT = new HookResult(new HookReturnCode(HookReturnCode.Action.NONE, HookReturnCode.ConnectionStatus.Disconnected));
private final HookReturnCode result;
private final String smtpRetCode;
@@ -69,7 +49,7 @@ public final class HookResult {
this(result, null, smtpDescription);
}
- public HookResult(HookReturnCode result) {
+ private HookResult(HookReturnCode result) {
this(result, null, null);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java
index b0d6033..2364253 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java
@@ -49,7 +49,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook {
*/
@Override
public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
- return new HookResult(HookReturnCode.ok());
+ return HookResult.OK;
}
/**
@@ -57,7 +57,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook {
*/
@Override
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
@@ -66,7 +66,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook {
*/
@Override
public HookResult doMail(SMTPSession session, MailAddress sender) {
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
@@ -75,7 +75,7 @@ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook {
*/
@Override
public HookResult doHelo(SMTPSession session, String helo) {
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/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 36082bd..9ff4519 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
@@ -501,7 +501,7 @@ public abstract class AbstractSMTPServerTest {
@Override
public HookResult doHelo(SMTPSession session, String helo) {
- return new HookResult(HookReturnCode.deny());
+ return HookResult.DENY;
}
};
@@ -549,7 +549,7 @@ public abstract class AbstractSMTPServerTest {
@Override
public HookResult doHelo(SMTPSession session, String helo) {
- return new HookResult(HookReturnCode.denySoft());
+ return HookResult.DENYSOFT;
}
};
@@ -596,7 +596,7 @@ public abstract class AbstractSMTPServerTest {
@Override
public HookResult doMail(SMTPSession session, MailAddress sender) {
- return new HookResult(HookReturnCode.deny());
+ return HookResult.DENY;
}
};
@@ -646,7 +646,7 @@ public abstract class AbstractSMTPServerTest {
@Override
public HookResult doMail(SMTPSession session, MailAddress sender) {
- return new HookResult(HookReturnCode.denySoft());
+ return HookResult.DENYSOFT;
}
};
@@ -698,9 +698,9 @@ public abstract class AbstractSMTPServerTest {
@Override
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (RCPT1.equals(rcpt.toString())) {
- return new HookResult(HookReturnCode.deny());
+ return HookResult.DENY;
} else {
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
}
@@ -762,9 +762,9 @@ public abstract class AbstractSMTPServerTest {
@Override
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (RCPT1.equals(rcpt.toString())) {
- return new HookResult(HookReturnCode.denySoft());
+ return HookResult.DENYSOFT;
} else {
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
}
@@ -860,7 +860,7 @@ public abstract class AbstractSMTPServerTest {
@Override
public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
- return new HookResult(HookReturnCode.deny());
+ return HookResult.DENY;
}
@@ -924,7 +924,7 @@ public abstract class AbstractSMTPServerTest {
@Override
public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
- return new HookResult(HookReturnCode.denySoft());
+ return HookResult.DENYSOFT;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/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 34cf60f..123cd22 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
@@ -36,7 +36,7 @@ public class TestMessageHook implements MessageHook {
@Override
public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
queued.add(mail);
- return new HookResult(HookReturnCode.ok());
+ return HookResult.OK;
}
public List<MailEnvelope> getQueued() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
index 1b2c572..da701fa 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
@@ -22,7 +22,6 @@ import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
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.server.core.MailImpl;
import org.apache.mailet.Mail;
@@ -61,7 +60,7 @@ public class AddDefaultAttributesMessageHook implements JamesMessageHook {
mail.setAttribute(SMTP_AUTH_NETWORK_NAME, "true");
}
}
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
index e2df42b..4959b9e 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
@@ -32,7 +32,6 @@ import org.apache.james.core.MailAddress;
import org.apache.james.protocols.api.handler.ProtocolHandler;
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.queue.api.MailPrioritySupport;
import org.apache.mailet.Mail;
@@ -74,7 +73,7 @@ public class MailPriorityHandler implements JamesMessageHook, ProtocolHandler {
if (p != null) {
mail.setAttribute(MailPrioritySupport.MAIL_PRIORITY, p);
}
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
index cbdd726..5cfb7f1 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
@@ -29,7 +29,6 @@ import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook;
import org.apache.james.protocols.smtp.hook.HookResult;
-import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
@@ -69,7 +68,7 @@ public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthId
if (nSession.verifyIdentity()) {
return super.doRcpt(session, sender, rcpt);
} else {
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
index 6c70749..0868af8 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
@@ -26,7 +26,6 @@ import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.protocols.api.handler.ProtocolHandler;
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.mailet.Mail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,7 +80,7 @@ public class SetMimeHeaderHandler implements JamesMessageHook, ProtocolHandler {
LOGGER.error(me.getMessage());
}
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
index 152ad96..6c90c25 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
@@ -70,7 +70,7 @@ public class UsersRepositoryAuthHook implements AuthHook {
} catch (UsersRepositoryException e) {
LOGGER.info("Unable to access UsersRepository", e);
}
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
index 152825b..37c8252 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
@@ -45,7 +45,6 @@ import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler;
import org.apache.james.protocols.smtp.hook.HookResult;
-import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.util.TimeConverter;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
@@ -360,7 +359,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
} else {
LOGGER.info("IpAddress {} is whitelisted. Skip greylisting.", session.getRemoteAddress().getAddress().getHostAddress());
}
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
index 207529d..20f1eda 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
@@ -157,13 +157,13 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco
return new HookResult(HookReturnCode.denySoft(), SMTPRetCode.LOCAL_ERROR, DSNStatus.getStatus(DSNStatus.TRANSIENT, DSNStatus.NETWORK_DIR_SERVER) + " " + "Temporarily rejected: Problem on SPF lookup");
}
}
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
@Override
public HookResult doMail(SMTPSession session, MailAddress sender) {
doSPFCheck(session, sender);
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
index bdcfd3b..b9be7ba 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
@@ -152,7 +152,7 @@ public class SpamAssassinHandler implements JamesMessageHook, ProtocolHandler {
} catch (MessagingException e) {
LOGGER.error(e.getMessage());
}
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
index 5e331f9..5efa576 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
@@ -131,7 +131,7 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
}
} else {
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/914220b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
index 9844ff5..940c3b9 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
@@ -98,7 +98,7 @@ public class ValidRcptMX implements RcptHook, ProtocolHandler {
try {
mx = dnsService.findMXRecords(domain.name()).iterator();
} catch (TemporaryResolutionException e1) {
- return new HookResult(HookReturnCode.denySoft());
+ return HookResult.DENYSOFT;
}
if (mx != null && mx.hasNext()) {
@@ -118,7 +118,7 @@ public class ValidRcptMX implements RcptHook, ProtocolHandler {
}
}
}
- return new HookResult(HookReturnCode.declined());
+ return HookResult.DECLINED;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org