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:32 UTC
[13/24] james-project git commit: JAMES-2381 Rename ambiguous useVut
variable
JAMES-2381 Rename ambiguous useVut variable
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f88cc4bd
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f88cc4bd
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f88cc4bd
Branch: refs/heads/master
Commit: f88cc4bd50cd71f096139d02af1a761ea3289470
Parents: 8931070
Author: benwa <bt...@linagora.com>
Authored: Mon Apr 23 09:38:03 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Wed Apr 25 10:54:25 2018 +0200
----------------------------------------------------------------------
.../smtpserver/fastfail/ValidRcptHandler.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f88cc4bd/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
index 46c5fb9..8478118 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
@@ -45,20 +45,20 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc
private static final Logger LOGGER = LoggerFactory.getLogger(ValidRcptHandler.class);
private final UsersRepository users;
- private final RecipientRewriteTable vut;
+ private final RecipientRewriteTable recipientRewriteTable;
private final DomainList domains;
- private boolean useVut = true;
+ private boolean supportsRecipientRewriteTable = true;
@Inject
- public ValidRcptHandler(UsersRepository users, RecipientRewriteTable vut, DomainList domains) {
+ public ValidRcptHandler(UsersRepository users, RecipientRewriteTable recipientRewriteTable, DomainList domains) {
this.users = users;
- this.vut = vut;
+ this.recipientRewriteTable = recipientRewriteTable;
this.domains = domains;
}
- public void setRecipientRewriteTableSupport(boolean useVut) {
- this.useVut = useVut;
+ public void setSupportsRecipientRewriteTable(boolean supportsRecipientRewriteTable) {
+ this.supportsRecipientRewriteTable = supportsRecipientRewriteTable;
}
@Override
@@ -69,7 +69,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc
if (users.contains(username)) {
return true;
} else {
- return useVut && isRedirected(recipient, username);
+ return supportsRecipientRewriteTable && isRedirected(recipient, username);
}
} catch (UsersRepositoryException e) {
LOGGER.info("Unable to access UsersRepository", e);
@@ -81,7 +81,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc
LOGGER.debug("Unknown user {} check if it's an alias", username);
try {
- Mappings targetString = vut.getMappings(recipient.getLocalPart(), recipient.getDomain());
+ Mappings targetString = recipientRewriteTable.getMappings(recipient.getLocalPart(), recipient.getDomain());
if (!targetString.isEmpty()) {
return true;
@@ -107,8 +107,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc
@Override
public void init(Configuration config) throws ConfigurationException {
- setRecipientRewriteTableSupport(config.getBoolean("enableRecipientRewriteTable", true));
-
+ setSupportsRecipientRewriteTable(config.getBoolean("enableRecipientRewriteTable", true));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org