ff-attic/imxmi
2
0
Fork 0
Code Activity

Removed old total fetch method.

Browse source
This commit is contained in:
Willem Cazander 2014-08-24 12:49:32 +02:00
parent 5bbd8e4ef3
commit e14b484ca5
18 changed files with 77 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

18
vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlHibernateVascBackend.java
View file

@ -75,11 +75,13 @@ public class XpqlHibernateVascBackend<DATA_OBJECT extends Serializable> extends
Session getHibernateSession() {
return hibernateSessionProvider.getHibernateSession();
}
@SuppressWarnings("unchecked")
@Override
public VascBackendResult<DATA_OBJECT> execute(VascBackendState state) throws VascBackendException {
return new DefaultVascBackendResult<DATA_OBJECT>(executeList(state),fetchTotalExecuteSize(state));
}
private List<DATA_OBJECT> executeList(VascBackendState state) throws VascBackendException {
// Copy parameters
for (String key:state.getDataParameterKeys()) {
Object value = state.getDataParameter(key);
@ -111,7 +113,7 @@ public class XpqlHibernateVascBackend<DATA_OBJECT extends Serializable> extends
List<DATA_OBJECT> data = q.list();
s.getTransaction().commit();
return new DefaultVascBackendResult<DATA_OBJECT>(data);
return data;
} finally {
if (s!=null) {
//em.close();
@ -202,12 +204,8 @@ public class XpqlHibernateVascBackend<DATA_OBJECT extends Serializable> extends
}
return true;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state)
*/
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
private long fetchTotalExecuteSize(VascBackendState state) {
Session s = getHibernateSession();
try {
s.getTransaction().begin();

17
vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java
View file

@ -76,9 +76,13 @@ public class XpqlPersistanceVascBackend<DATA_OBJECT extends Serializable> extend
return entityManagerProvider.getEntityManager();
}
@SuppressWarnings("unchecked")
@Override
public VascBackendResult<DATA_OBJECT> execute(VascBackendState state) throws VascBackendException {
return new DefaultVascBackendResult<DATA_OBJECT>(executeList(state),fetchTotalExecuteSize(state));
}
@SuppressWarnings("unchecked")
private List<DATA_OBJECT> executeList(VascBackendState state) throws VascBackendException {
// Copy parameters
for (String key:state.getDataParameterKeys()) {
@ -112,8 +116,7 @@ public class XpqlPersistanceVascBackend<DATA_OBJECT extends Serializable> extend
if (emTransaction) {
em.getTransaction().commit();
}
VascBackendResult<DATA_OBJECT> result = new DefaultVascBackendResult<DATA_OBJECT>(data);
return result;
return data;
} finally {
if (em!=null) {
//em.close();
@ -205,12 +208,8 @@ public class XpqlPersistanceVascBackend<DATA_OBJECT extends Serializable> extend
}
return true;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state)
*/
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
private long fetchTotalExecuteSize(VascBackendState state) {
EntityManager em = getEntityManager();
try {
Query q = em.createQuery(queryTotal.toPreparedSQL(queryTotal));