JAMES-2636 Wildcard definition needs to be covered by MappingSource This constant was only used by tests and made the API confusing. Refactoring this was easy.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9a4ce2fb Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9a4ce2fb Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9a4ce2fb Branch: refs/heads/master Commit: 9a4ce2fb37396bb9d4ae43f41206e664447351a5 Parents: 5392ad9 Author: Benoit Tellier <btell...@linagora.com> Authored: Fri Jan 4 09:39:08 2019 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Tue Jan 8 14:45:33 2019 +0700 ---------------------------------------------------------------------- .../james/rrt/api/RecipientRewriteTable.java | 21 -------------------- .../james/rrt/lib/RewriteTablesStepdefs.java | 13 +++++++++--- 2 files changed, 10 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/9a4ce2fb/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java index cba17a4..fed9ea0 100644 --- a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java +++ b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java @@ -35,27 +35,6 @@ import com.google.common.base.Preconditions; */ public interface RecipientRewriteTable { - interface Domains { - - Domain WILDCARD = new Domain(RecipientRewriteTable.WILDCARD) { - - @Override - public String name() { - throw new IllegalStateException(); - } - - @Override - public String toString() { - return "Domain : * (Wildcard)"; - } - }; - } - - /** - * The wildcard used for alias domain mappings - */ - String WILDCARD = "*"; - void addMapping(MappingSource source, Mapping mapping) throws RecipientRewriteTableException; void removeMapping(MappingSource source, Mapping mapping) throws RecipientRewriteTableException; http://git-wip-us.apache.org/repos/asf/james-project/blob/9a4ce2fb/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java index a2e83b7..6c59812 100644 --- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java +++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java @@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.List; import org.apache.james.core.Domain; -import org.apache.james.rrt.api.RecipientRewriteTable; import org.apache.james.rrt.api.RecipientRewriteTable.ErrorMappingException; import org.apache.james.rrt.api.RecipientRewriteTableException; @@ -56,6 +55,10 @@ public class RewriteTablesStepdefs { @Given("store \"([^\"]*)\" address mapping for user \"([^\"]*)\" at domain \"([^\"]*)\"") public void storeAddressMappingForUserAtDomain(String address, String user, String domain) throws Throwable { MappingSource source = MappingSource.fromUser(user, domain); + storeAddressMappingForUserAtDomain(address, source); + } + + private void storeAddressMappingForUserAtDomain(String address, MappingSource source) throws RecipientRewriteTableException { rewriteTable.addAddressMapping(source, address); } @@ -67,7 +70,7 @@ public class RewriteTablesStepdefs { @Given("store \"([^\"]*)\" address mapping as wildcard for domain \"([^\"]*)\"") public void storeAddressMappingAsWildcardAtDomain(String address, String domain) throws Throwable { - storeAddressMappingForUserAtDomain(address, RecipientRewriteTable.WILDCARD, domain); + storeAddressMappingForUserAtDomain(address, MappingSource.fromDomain(Domain.of(domain))); } @Given("store \"([^\"]*)\" alias domain mapping for domain \"([^\"]*)\"") @@ -106,6 +109,10 @@ public class RewriteTablesStepdefs { @When("user \"([^\"]*)\" at domain \"([^\"]*)\" removes a address mapping \"([^\"]*)\"") public void userAtDomainRemovesAddressMapping(String user, String domain, String address) throws Throwable { MappingSource source = MappingSource.fromUser(user, domain); + userAtDomainRemovesAddressMapping(address, source); + } + + private void userAtDomainRemovesAddressMapping(String address, MappingSource source) throws RecipientRewriteTableException { rewriteTable.removeAddressMapping(source, address); } @@ -129,7 +136,7 @@ public class RewriteTablesStepdefs { @When("wildcard address mapping \"([^\"]*)\" at domain \"([^\"]*)\" is removed") public void removeWildcardAddressMappingAtDomain(String address, String domain) throws Throwable { - userAtDomainRemovesAddressMapping(RecipientRewriteTable.WILDCARD, domain, address); + userAtDomainRemovesAddressMapping(address, MappingSource.fromDomain(Domain.of(domain))); } @When("alias domain mapping \"([^\"]*)\" for \"([^\"]*)\" domain is removed") --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
