[JAMES-3836] implements guice bindings for JPAMailRepository
diff --git a/server/container/guice/jpa-common/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java b/server/container/guice/jpa-common/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java
index 99ac66d..bb6a0ff 100644
--- a/server/container/guice/jpa-common/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java
+++ b/server/container/guice/jpa-common/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java
@@ -20,15 +20,18 @@
package org.apache.james.modules.data;
import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
+import org.apache.james.mailrepository.api.MailRepositoryFactory;
import org.apache.james.mailrepository.api.MailRepositoryUrlStore;
import org.apache.james.mailrepository.api.Protocol;
import org.apache.james.mailrepository.jpa.JPAMailRepository;
+import org.apache.james.mailrepository.jpa.JPAMailRepositoryFactory;
import org.apache.james.mailrepository.jpa.JPAMailRepositoryUrlStore;
import org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration;
import com.google.common.collect.ImmutableList;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
+import com.google.inject.multibindings.Multibinder;
public class JPAMailRepositoryModule extends AbstractModule {
@@ -43,5 +46,8 @@
ImmutableList.of(new Protocol("jpa")),
JPAMailRepository.class.getName(),
new BaseHierarchicalConfiguration()));
+
+ Multibinder.newSetBinder(binder(), MailRepositoryFactory.class)
+ .addBinding().to(JPAMailRepositoryFactory.class);
}
}
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/JPAMailRepository.java b/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/JPAMailRepository.java
index 702b661..575592e 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/JPAMailRepository.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/JPAMailRepository.java
@@ -87,6 +87,15 @@
this.entityManagerFactory = entityManagerFactory;
}
+ public JPAMailRepository(EntityManagerFactory entityManagerFactory, MailRepositoryUrl url) throws ConfigurationException {
+ this.entityManagerFactory = entityManagerFactory;
+ this.repositoryName = url.getPath().asString();
+ if (repositoryName.isEmpty()) {
+ throw new ConfigurationException(
+ "Malformed destinationURL - Must be of the format 'jpa://<repositoryName>'. Was passed " + url);
+ }
+ }
+
public String getRepositoryName() {
return repositoryName;
}
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/JPAMailRepositoryFactory.java b/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/JPAMailRepositoryFactory.java
new file mode 100644
index 0000000..09bb004
--- /dev/null
+++ b/server/data/data-jpa/src/main/java/org/apache/james/mailrepository/jpa/JPAMailRepositoryFactory.java
@@ -0,0 +1,52 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.mailrepository.jpa;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManagerFactory;
+
+import org.apache.james.mailrepository.api.MailRepository;
+import org.apache.james.mailrepository.api.MailRepositoryFactory;
+import org.apache.james.mailrepository.api.MailRepositoryUrl;
+
+import com.github.fge.lambdas.Throwing;
+
+public class JPAMailRepositoryFactory implements MailRepositoryFactory {
+ private final EntityManagerFactory entityManagerFactory;
+
+ @Inject
+ public JPAMailRepositoryFactory(EntityManagerFactory entityManagerFactory) {
+ this.entityManagerFactory = entityManagerFactory;
+ }
+
+ @Override
+ public Class<? extends MailRepository> mailRepositoryClass() {
+ return JPAMailRepository.class;
+ }
+
+ @Override
+ public MailRepository create(MailRepositoryUrl url) {
+ // Injecting the url here is redundant since the class is also a
+ // Configurable and the mail repository store will call #configure()
+ // with the same effect. However, this paves the way to drop the
+ // Configurable aspect in the future.
+ return Throwing.supplier(() -> new JPAMailRepository(entityManagerFactory, url)).sneakyThrow().get();
+ }
+}
