You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2016/11/18 09:54:14 UTC
[21/29] james-project git commit: JAMES-1842: require inject on
persistence unit
JAMES-1842: require inject on persistence unit
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0e5cf23b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0e5cf23b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0e5cf23b
Branch: refs/heads/master
Commit: 0e5cf23b5d8a605545e44b8a8fa53ff8c764f45a
Parents: 59f7382
Author: Quynh Nguyen <qn...@linagora.com>
Authored: Wed Nov 16 09:36:32 2016 +0700
Committer: Quynh Nguyen <qn...@linagora.com>
Committed: Fri Nov 18 09:25:35 2016 +0700
----------------------------------------------------------------------
.../james/rrt/jpa/JPARecipientRewriteTable.java | 28 +++++++++++---------
.../james/user/jpa/JPAUsersRepository.java | 2 ++
2 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0e5cf23b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
index 0b04e59..936e804 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityTransaction;
@@ -31,8 +32,8 @@ import javax.persistence.PersistenceUnit;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.jpa.model.JPARecipientRewrite;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
-import org.apache.james.rrt.lib.Mappings;
-import org.apache.james.rrt.lib.MappingsImpl;
+import org.apache.james.rrt.lib.Mappings;
+import org.apache.james.rrt.lib.MappingsImpl;
/**
* Class responsible to implement the Virtual User Table in database with JPA
@@ -50,6 +51,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
*
* @param entityManagerFactory
*/
+ @Inject
@PersistenceUnit(unitName="James")
public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) {
this.entityManagerFactory = entityManagerFactory;
@@ -62,10 +64,10 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
protected void addMappingInternal(String user, String domain, String mapping) throws RecipientRewriteTableException {
String fixedUser = getFixedUser(user);
String fixedDomain = getFixedDomain(domain);
- Mappings map = getUserDomainMappings(fixedUser, fixedDomain);
+ Mappings map = getUserDomainMappings(fixedUser, fixedDomain);
if (map != null && map.size() != 0) {
- Mappings updatedMappings = MappingsImpl.from(map).add(mapping).build();
- doUpdateMapping(fixedUser, fixedDomain, updatedMappings.serialize());
+ Mappings updatedMappings = MappingsImpl.from(map).add(mapping).build();
+ doUpdateMapping(fixedUser, fixedDomain, updatedMappings.serialize());
} else {
doAddMapping(fixedUser, fixedDomain, mapping);
}
@@ -111,7 +113,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
* @throws RecipientRewriteTableException
* @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddress(java.lang.String, java.lang.String)
*/
- protected Mappings getUserDomainMappingsInternal(String user, String domain) throws RecipientRewriteTableException {
+ protected Mappings getUserDomainMappingsInternal(String user, String domain) throws RecipientRewriteTableException {
EntityManager entityManager = entityManagerFactory.createEntityManager();
final EntityTransaction transaction = entityManager.getTransaction();
try {
@@ -120,7 +122,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
List<JPARecipientRewrite> virtualUsers = entityManager.createNamedQuery("selectUserDomainMapping").setParameter("user", user).setParameter("domain", domain).getResultList();
transaction.commit();
if (virtualUsers.size() > 0) {
- return MappingsImpl.fromRawString(virtualUsers.get(0).getTargetAddress());
+ return MappingsImpl.fromRawString(virtualUsers.get(0).getTargetAddress());
}
} catch (PersistenceException e) {
getLogger().debug("Failed to get user domain mappings", e);
@@ -139,17 +141,17 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
* @throws RecipientRewriteTableException
* @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#getAllMappingsInternal()
*/
- protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException {
+ protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException {
EntityManager entityManager = entityManagerFactory.createEntityManager();
final EntityTransaction transaction = entityManager.getTransaction();
- Map<String, Mappings> mapping = new HashMap<String, Mappings>();
+ Map<String, Mappings> mapping = new HashMap<String, Mappings>();
try {
transaction.begin();
@SuppressWarnings("unchecked")
List<JPARecipientRewrite> virtualUsers = entityManager.createNamedQuery("selectAllMappings").getResultList();
transaction.commit();
for (JPARecipientRewrite virtualUser : virtualUsers) {
- mapping.put(virtualUser.getUser() + "@" + virtualUser.getDomain(), MappingsImpl.fromRawString(virtualUser.getTargetAddress()));
+ mapping.put(virtualUser.getUser() + "@" + virtualUser.getDomain(), MappingsImpl.fromRawString(virtualUser.getTargetAddress()));
}
if (mapping.size() > 0)
return mapping;
@@ -173,10 +175,10 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
protected void removeMappingInternal(String user, String domain, String mapping) throws RecipientRewriteTableException {
String fixedUser = getFixedUser(user);
String fixedDomain = getFixedDomain(domain);
- Mappings map = getUserDomainMappings(fixedUser, fixedDomain);
+ Mappings map = getUserDomainMappings(fixedUser, fixedDomain);
if (map != null && map.size() > 1) {
- Mappings updatedMappings = map.remove(mapping);
- doUpdateMapping(fixedUser, fixedDomain, updatedMappings.serialize());
+ Mappings updatedMappings = map.remove(mapping);
+ doUpdateMapping(fixedUser, fixedDomain, updatedMappings.serialize());
} else {
doRemoveMapping(fixedUser, fixedDomain, mapping);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0e5cf23b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
index ba8b3a3..11d674b 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.Iterator;
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 JPAUsersRepository extends AbstractUsersRepository {
* @param entityManagerFactory
* the entityManager to set
*/
+ @Inject
@PersistenceUnit(unitName="James")
public final void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) {
this.entityManagerFactory = entityManagerFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org