Repository: james-project Updated Branches: refs/heads/master ff231f907 -> 776fc33ac
JAMES-2366 rename checkMapping to make it clear it checks entry doesn't already exist Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bfec1afe Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bfec1afe Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bfec1afe Branch: refs/heads/master Commit: bfec1afecd1b27db9862bd51e953ad4bc3184e54 Parents: 565c6a2 Author: Matthieu Baechler <matth...@apache.org> Authored: Wed Apr 18 16:42:15 2018 +0200 Committer: Matthieu Baechler <matth...@apache.org> Committed: Tue Apr 24 14:45:26 2018 +0200 ---------------------------------------------------------------------- .../james/rrt/lib/AbstractRecipientRewriteTable.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/bfec1afe/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java index d028eca..5f7d9d7 100644 --- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java +++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java @@ -182,7 +182,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT } Mapping mapping = Mapping.regex(regex); - checkMapping(user, domain, mapping); + checkDuplicateMapping(user, domain, mapping); LOGGER.info("Add regex mapping => {} for user: {} domain: {}", regex, user, domain.name()); addMapping(user, domain, mapping); @@ -200,7 +200,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT .appendDomainFromThrowingSupplierIfNone(this::defaultDomain); checkHasValidAddress(mapping); - checkMapping(user, domain, mapping); + checkDuplicateMapping(user, domain, mapping); LOGGER.info("Add address mapping => {} for user: {} domain: {}", mapping, user, domain.name()); addMapping(user, domain, mapping); @@ -233,7 +233,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT public void addErrorMapping(String user, Domain domain, String error) throws RecipientRewriteTableException { Mapping mapping = Mapping.error(error); - checkMapping(user, domain, mapping); + checkDuplicateMapping(user, domain, mapping); LOGGER.info("Add error mapping => {} for user: {} domain: {}", error, user, domain.name()); addMapping(user, domain, mapping); @@ -263,7 +263,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT .appendDomainFromThrowingSupplierIfNone(this::defaultDomain); checkHasValidAddress(mapping); - checkMapping(user, domain, mapping); + checkDuplicateMapping(user, domain, mapping); LOGGER.info("Add forward mapping => {} for user: {} domain: {}", mapping, user, domain.name()); addMapping(user, domain, mapping); @@ -284,7 +284,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT .appendDomainFromThrowingSupplierIfNone(this::defaultDomain); checkHasValidAddress(mapping); - checkMapping(user, domain, mapping); + checkDuplicateMapping(user, domain, mapping); LOGGER.info("Add forward mapping => {} for user: {} domain: {}", mapping, user, domain.name()); addMapping(user, domain, mapping); @@ -313,7 +313,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT */ protected abstract Mappings mapAddress(String user, Domain domain) throws RecipientRewriteTableException; - private void checkMapping(String user, Domain domain, Mapping mapping) throws RecipientRewriteTableException { + private void checkDuplicateMapping(String user, Domain domain, Mapping mapping) throws RecipientRewriteTableException { Mappings mappings = getUserDomainMappings(user, domain); if (mappings != null && mappings.contains(mapping)) { throw new RecipientRewriteTableException("Mapping " + mapping + " for user " + user + " domain " + domain + " already exist!"); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
