This is an automated email from the ASF dual-hosted git repository. jhelou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 66a7e64cc13e8efdb466cd4d70aef289d101ab42 Author: Jean Helou <[email protected]> AuthorDate: Mon Oct 3 22:30:22 2022 +0200 [JAMES-3836] exposes MailRepositoryLoader interface in mailRepository api module The interface doesn't depend on any injection specific mechanisms and this avoids pulling in the memory module when it's not needed. --- .../org/apache/james/modules/server/GuiceMailRepositoryLoader.java | 2 +- .../org/apache/james/modules/server/MailStoreRepositoryModule.java | 2 +- .../org/apache/james/mailrepository/api}/MailRepositoryLoader.java | 6 +----- .../james/mailrepository/memory/MemoryMailRepositoryStore.java | 1 + .../james/mailrepository/memory/SimpleMailRepositoryLoader.java | 1 + 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/server/container/guice/common/src/main/java/org/apache/james/modules/server/GuiceMailRepositoryLoader.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/GuiceMailRepositoryLoader.java index 2c62334cee..e2feffb5f1 100644 --- a/server/container/guice/common/src/main/java/org/apache/james/modules/server/GuiceMailRepositoryLoader.java +++ b/server/container/guice/common/src/main/java/org/apache/james/modules/server/GuiceMailRepositoryLoader.java @@ -20,9 +20,9 @@ package org.apache.james.modules.server; import org.apache.james.mailrepository.api.MailRepository; +import org.apache.james.mailrepository.api.MailRepositoryLoader; import org.apache.james.mailrepository.api.MailRepositoryStore; import org.apache.james.mailrepository.api.MailRepositoryUrl; -import org.apache.james.mailrepository.memory.MailRepositoryLoader; import org.apache.james.utils.ClassName; import org.apache.james.utils.GuiceGenericLoader; diff --git a/server/container/guice/common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java index 1d43329811..cd9fbf9eed 100644 --- a/server/container/guice/common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java +++ b/server/container/guice/common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java @@ -24,8 +24,8 @@ import javax.inject.Provider; import org.apache.commons.configuration2.HierarchicalConfiguration; import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.configuration2.tree.ImmutableNode; +import org.apache.james.mailrepository.api.MailRepositoryLoader; import org.apache.james.mailrepository.api.MailRepositoryStore; -import org.apache.james.mailrepository.memory.MailRepositoryLoader; import org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration; import org.apache.james.mailrepository.memory.MemoryMailRepositoryStore; import org.apache.james.server.core.configuration.ConfigurationProvider; diff --git a/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MailRepositoryLoader.java b/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryLoader.java similarity index 85% rename from server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MailRepositoryLoader.java rename to server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryLoader.java index 9e24f64f8c..511355f1a5 100644 --- a/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MailRepositoryLoader.java +++ b/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryLoader.java @@ -17,11 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mailrepository.memory; - -import org.apache.james.mailrepository.api.MailRepository; -import org.apache.james.mailrepository.api.MailRepositoryStore; -import org.apache.james.mailrepository.api.MailRepositoryUrl; +package org.apache.james.mailrepository.api; public interface MailRepositoryLoader { MailRepository load(String fullyQualifiedClassName, MailRepositoryUrl url) throws MailRepositoryStore.MailRepositoryStoreException; diff --git a/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStore.java b/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStore.java index 47f5bd2ab9..329cdb45f0 100644 --- a/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStore.java +++ b/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStore.java @@ -35,6 +35,7 @@ import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.Startable; import org.apache.james.mailrepository.api.Initializable; import org.apache.james.mailrepository.api.MailRepository; +import org.apache.james.mailrepository.api.MailRepositoryLoader; import org.apache.james.mailrepository.api.MailRepositoryPath; import org.apache.james.mailrepository.api.MailRepositoryStore; import org.apache.james.mailrepository.api.MailRepositoryUrl; diff --git a/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/SimpleMailRepositoryLoader.java b/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/SimpleMailRepositoryLoader.java index d4b587f924..a67acb5916 100644 --- a/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/SimpleMailRepositoryLoader.java +++ b/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/SimpleMailRepositoryLoader.java @@ -20,6 +20,7 @@ package org.apache.james.mailrepository.memory; import org.apache.james.mailrepository.api.MailRepository; +import org.apache.james.mailrepository.api.MailRepositoryLoader; import org.apache.james.mailrepository.api.MailRepositoryStore; import org.apache.james.mailrepository.api.MailRepositoryUrl; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
