Repository: airavata Updated Branches: refs/heads/develop c62df28df -> 073e45698
fixing JPA issue Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/073e4569 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/073e4569 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/073e4569 Branch: refs/heads/develop Commit: 073e45698b8545782a1d647e0664b639fa64e53b Parents: c62df28 Author: scnakandala <[email protected]> Authored: Thu Nov 10 13:11:37 2016 -0500 Committer: scnakandala <[email protected]> Committed: Thu Nov 10 13:11:37 2016 -0500 ---------------------------------------------------------------------- .../db/repositories/AbstractRepository.java | 18 +++++++++--------- .../db/repositories/EntityRepository.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/073e4569/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java index 9f5a706..d0117ef 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java @@ -54,7 +54,7 @@ public abstract class AbstractRepository<T, E, Id> { public T update(T t) throws SharingRegistryException { Mapper mapper = ObjectMapperSingleton.getInstance(); E entity = mapper.map(t, dbEntityGenericClass); - E persistedCopy = JPAUtils.execute(entityManager -> entityManager.merge(entity)); + E persistedCopy = (new JPAUtils()).execute(entityManager -> entityManager.merge(entity)); return mapper.map(persistedCopy, thriftGenericClass); } @@ -66,11 +66,11 @@ public abstract class AbstractRepository<T, E, Id> { } public boolean delete(Id id) throws SharingRegistryException { - JPAUtils.execute(entityManager -> { - E entity = entityManager.find(dbEntityGenericClass, id); - entityManager.remove(entity); - return entity; - }); + (new JPAUtils()).execute(entityManager -> { + E entity = entityManager.find(dbEntityGenericClass, id); + entityManager.remove(entity); + return entity; + }); return true; } @@ -81,7 +81,7 @@ public abstract class AbstractRepository<T, E, Id> { } public T get(Id id) throws SharingRegistryException { - E entity = JPAUtils.execute(entityManager -> entityManager + E entity = (new JPAUtils()).execute(entityManager -> entityManager .find(dbEntityGenericClass, id)); Mapper mapper = ObjectMapperSingleton.getInstance(); if(entity == null) @@ -103,7 +103,7 @@ public abstract class AbstractRepository<T, E, Id> { public List<T> select(Map<String, String> filters, int offset, int limit) throws SharingRegistryException { String queryString = getSelectQuery(filters); int newLimit = limit < 0 ? DBConstants.SELECT_MAX_ROWS: limit; - List resultSet = JPAUtils.execute(entityManager -> entityManager.createQuery(queryString).setFirstResult(offset) + List resultSet = (new JPAUtils()).execute(entityManager -> entityManager.createQuery(queryString).setFirstResult(offset) .setMaxResults(newLimit).getResultList()); Mapper mapper = ObjectMapperSingleton.getInstance(); List<T> gatewayList = new ArrayList<>(); @@ -113,7 +113,7 @@ public abstract class AbstractRepository<T, E, Id> { public List<T> select(String queryString, int offset, int limit) throws SharingRegistryException { int newLimit = limit < 0 ? DBConstants.SELECT_MAX_ROWS: limit; - List resultSet = JPAUtils.execute(entityManager -> entityManager.createQuery(queryString).setFirstResult(offset) + List resultSet = (new JPAUtils()).execute(entityManager -> entityManager.createQuery(queryString).setFirstResult(offset) .setMaxResults(newLimit).getResultList()); Mapper mapper = ObjectMapperSingleton.getInstance(); List<T> gatewayList = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/airavata/blob/073e4569/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java index add80a8..2fe15ef 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java @@ -107,7 +107,7 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E final String nativeQuery = query; int newLimit = limit < 0 ? DBConstants.SELECT_MAX_ROWS: limit; - List<Object[]> temp = JPAUtils.execute(entityManager -> entityManager.createNativeQuery(nativeQuery).setFirstResult(offset) + List<Object[]> temp = (new JPAUtils()).execute(entityManager -> entityManager.createNativeQuery(nativeQuery).setFirstResult(offset) .setMaxResults(newLimit).getResultList()); List<Entity> resultSet = new ArrayList<>();
