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:36 UTC
[17/24] james-project git commit: JAMES-2381 Use constructor based
injection for ValidRcptHandler
JAMES-2381 Use constructor based injection for ValidRcptHandler
We could furthermore rely on some final fields.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8931070b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8931070b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8931070b
Branch: refs/heads/master
Commit: 8931070b41ad2ec12ef72880063b056f1bc807f9
Parents: a4dd49b
Author: benwa <bt...@linagora.com>
Authored: Mon Apr 23 09:36:11 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Wed Apr 25 10:54:25 2018 +0200
----------------------------------------------------------------------
.../smtpserver/fastfail/ValidRcptHandler.java | 41 +++-----------------
.../james/smtpserver/ValidRcptHandlerTest.java | 5 +--
2 files changed, 6 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8931070b/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 bb2ac01..46c5fb9 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
@@ -44,50 +44,19 @@ import org.slf4j.LoggerFactory;
public class ValidRcptHandler extends AbstractValidRcptHandler implements ProtocolHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(ValidRcptHandler.class);
- private UsersRepository users;
-
- private RecipientRewriteTable vut;
+ private final UsersRepository users;
+ private final RecipientRewriteTable vut;
+ private final DomainList domains;
private boolean useVut = true;
- private DomainList domains;
-
- /**
- * Gets the users repository.
- *
- * @return the users
- */
- public final UsersRepository getUsers() {
- return users;
- }
-
- /**
- * Sets the users repository.
- *
- * @param users
- * the users to set
- */
@Inject
- public final void setUsersRepository(UsersRepository users) {
+ public ValidRcptHandler(UsersRepository users, RecipientRewriteTable vut, DomainList domains) {
this.users = users;
- }
-
- /**
- * Sets the virtual user table store.
- *
- * @param vut
- * the tableStore to set
- */
- @Inject
- public final void setRecipientRewriteTable(RecipientRewriteTable vut) {
this.vut = vut;
- }
-
- @Inject
- public void setDomainList(DomainList domains) {
this.domains = domains;
}
-
+
public void setRecipientRewriteTableSupport(boolean useVut) {
this.useVut = useVut;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/8931070b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
index 3a0213c..b18b873 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
@@ -64,10 +64,7 @@ public class ValidRcptHandlerTest {
memoryRecipientRewriteTable = new MemoryRecipientRewriteTable();
memoryRecipientRewriteTable.setDomainList(memoryDomainList);
- handler = new ValidRcptHandler();
- handler.setUsersRepository(users);
- handler.setRecipientRewriteTable(memoryRecipientRewriteTable);
- handler.setDomainList(memoryDomainList);
+ handler = new ValidRcptHandler(users, memoryRecipientRewriteTable, memoryDomainList);
validUserEmail = new MailAddress(VALID_USER + "@localhost");
user1mail = new MailAddress(USER1 + "@localhost");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org