JAMES-1842: Related JPA objects should be injectable
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3ed07d6a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3ed07d6a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3ed07d6a Branch: refs/heads/master Commit: 3ed07d6a8578eeebe8a26e48b14d1b50c4b7cff2 Parents: 978e722 Author: Quynh Nguyen <qngu...@linagora.com> Authored: Fri Oct 28 12:16:15 2016 +0700 Committer: Quynh Nguyen <qngu...@linagora.com> Committed: Fri Nov 18 09:25:34 2016 +0700 ---------------------------------------------------------------------- .../apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java | 2 ++ .../java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java | 3 +++ .../java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java | 2 ++ .../java/org/apache/james/mailbox/jpa/mail/JPAUidProvider.java | 2 ++ .../apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java | 3 +++ .../james/mailbox/lucene/search/LuceneMessageSearchIndex.java | 3 ++- .../main/java/org/apache/james/domainlist/jpa/JPADomainList.java | 2 ++ 7 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java index 9a219af..dfdd356 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java @@ -18,6 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.jpa; +import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -47,6 +48,7 @@ public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory private final UidProvider uidProvider; private final ModSeqProvider modSeqProvider; + @Inject public JPAMailboxSessionMapperFactory(EntityManagerFactory entityManagerFactory, UidProvider uidProvider, ModSeqProvider modSeqProvider) { this.entityManagerFactory = entityManagerFactory; this.uidProvider = uidProvider; http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java index bf5a0e6..8251052 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.mailbox.jpa; +import javax.inject.Inject; + import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.jpa.user.model.JPASubscription; import org.apache.james.mailbox.store.StoreSubscriptionManager; @@ -29,6 +31,7 @@ import org.apache.james.mailbox.store.user.model.Subscription; */ public class JPASubscriptionManager extends StoreSubscriptionManager { + @Inject public JPASubscriptionManager(JPAMailboxSessionMapperFactory mapperFactory) { super(mapperFactory); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java index 7d002d6..5896243 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java @@ -18,6 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.jpa.mail; +import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.PersistenceException; @@ -34,6 +35,7 @@ public class JPAModSeqProvider extends AbstractLockingModSeqProvider { private final EntityManagerFactory factory; + @Inject public JPAModSeqProvider(MailboxPathLocker locker, EntityManagerFactory factory) { super(locker); this.factory = factory; http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAUidProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAUidProvider.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAUidProvider.java index e7e5c21..08d391d 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAUidProvider.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAUidProvider.java @@ -18,6 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.jpa.mail; +import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.PersistenceException; @@ -37,6 +38,7 @@ public class JPAUidProvider extends AbstractLockingUidProvider { private final EntityManagerFactory factory; + @Inject public JPAUidProvider(MailboxPathLocker locker, EntityManagerFactory factory) { super(locker); this.factory = factory; http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java index 637731c..514a606 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java @@ -20,6 +20,8 @@ package org.apache.james.mailbox.jpa.openjpa; +import javax.inject.Inject; + import org.apache.james.mailbox.MailboxPathLocker; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.acl.GroupMembershipResolver; @@ -67,6 +69,7 @@ public class OpenJPAMailboxManager extends JPAMailboxManager { } } + @Inject public OpenJPAMailboxManager(JPAMailboxSessionMapperFactory mapperFactory, Authenticator authenticator, MailboxACLResolver aclResolver, GroupMembershipResolver groupMembershipResolver, MessageParser messageParser, MessageId.Factory messageIdFactory) { http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java index a1557bb..8a683d9 100644 --- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java +++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java @@ -37,6 +37,7 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; +import javax.inject.Inject; import javax.mail.Flags; import javax.mail.Flags.Flag; @@ -346,7 +347,7 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex { private boolean suffixMatch = false; - + @Inject public LuceneMessageSearchIndex(MessageMapperFactory factory, MailboxId.Factory mailboxIdFactory, Directory directory) throws CorruptIndexException, LockObtainFailedException, IOException { this(factory, mailboxIdFactory, directory, false, true); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java index f5cde85..489ae4a 100644 --- a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java +++ b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; +import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.EntityTransaction; @@ -52,6 +53,7 @@ public class JPADomainList extends AbstractDomainList { * * @param entityManagerFactory */ + @Inject @PersistenceUnit(unitName = "James") public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) { this.entityManagerFactory = entityManagerFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
