This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b2faf772d01c38550f1f55d070fc4315cc45eeff Author: Benoit Tellier <[email protected]> AuthorDate: Wed Mar 18 10:11:53 2020 +0700 JAMES-3113 LocalResources: cosmetic fixes - Visibility - Location --- .../james/mailetcontainer/impl/JamesMailetContext.java | 1 - .../mailetcontainer/{ => impl}/LocalResources.java | 18 +++++++++--------- .../META-INF/spring/mailetcontainer-context.xml | 2 +- .../mailetcontainer/impl/JamesMailetContextTest.java | 1 - 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java index 5d513a4..f4bb580 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java @@ -53,7 +53,6 @@ import org.apache.james.domainlist.api.DomainListException; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.Disposable; import org.apache.james.lifecycle.api.LifecycleUtil; -import org.apache.james.mailetcontainer.LocalResources; import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.MailQueueFactory; import org.apache.james.server.core.MailImpl; diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/LocalResources.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java similarity index 89% rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/LocalResources.java rename to server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java index ce83023..7cdeab5 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/LocalResources.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mailetcontainer; +package org.apache.james.mailetcontainer.impl; import java.util.EnumSet; import java.util.Locale; @@ -39,22 +39,22 @@ import org.slf4j.LoggerFactory; import com.github.fge.lambdas.Throwing; -public class LocalResources { +class LocalResources { private static final Logger LOGGER = LoggerFactory.getLogger(LocalResources.class); private static final EnumSet<Mapping.Type> ALIAS_TYPES = EnumSet.of(Mapping.Type.Alias, Mapping.Type.DomainAlias); - private final UsersRepository localusers; + private final UsersRepository localUsers; private final DomainList domains; private final RecipientRewriteTable recipientRewriteTable; @Inject - public LocalResources(UsersRepository localusers, DomainList domains, RecipientRewriteTable recipientRewriteTable) { - this.localusers = localusers; + LocalResources(UsersRepository localUsers, DomainList domains, RecipientRewriteTable recipientRewriteTable) { + this.localUsers = localUsers; this.domains = domains; this.recipientRewriteTable = recipientRewriteTable; } - public boolean isLocalServer(Domain domain) { + boolean isLocalServer(Domain domain) { try { return domains.containsDomain(domain); } catch (DomainListException e) { @@ -63,7 +63,7 @@ public class LocalResources { } } - public boolean isLocalUser(String name) { + boolean isLocalUser(String name) { if (name == null) { return false; } @@ -84,7 +84,7 @@ public class LocalResources { } } - public boolean isLocalEmail(MailAddress mailAddress) { + boolean isLocalEmail(MailAddress mailAddress) { if (mailAddress != null) { if (!isLocalServer(mailAddress.getDomain())) { return false; @@ -100,7 +100,7 @@ public class LocalResources { } private boolean isLocaluser(MailAddress mailAddress) throws UsersRepositoryException { - return localusers.contains(localusers.getUser(mailAddress)); + return localUsers.contains(localUsers.getUser(mailAddress)); } private boolean isLocalAlias(MailAddress mailAddress) throws UsersRepositoryException, RecipientRewriteTable.ErrorMappingException, RecipientRewriteTableException { diff --git a/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml b/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml index 783aab9..cbab870 100644 --- a/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml +++ b/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml @@ -33,7 +33,7 @@ it is used - Seems like a Spring bug. --> <bean id="mailetcontext" class="org.apache.james.mailetcontainer.impl.JamesMailetContext" autowire="byType"/> - <bean id="localResources" class="org.apache.james.mailetcontainer.LocalResources" autowire="byType"/> + <bean id="localResources" class="org.apache.james.mailetcontainer.impl.LocalResources" autowire="byType"/> <bean id="mailspooler" class="org.apache.james.mailetcontainer.impl.JamesMailSpooler" autowire="byType"/> </beans> diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java index 87ac492..9cbf559 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java @@ -38,7 +38,6 @@ import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.lib.DomainListConfiguration; import org.apache.james.domainlist.memory.MemoryDomainList; -import org.apache.james.mailetcontainer.LocalResources; import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.MailQueueFactory; import org.apache.james.rrt.memory.MemoryRecipientRewriteTable; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
