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

39
vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackend.java
View file

@ -23,9 +23,10 @@
package net.forwardfire.vasc.backend;
import java.io.Serializable;
import java.util.Map;
/**
* AbstractVascBackend.
*
*
* @author Willem Cazander
* @version 1.0 Aug 2, 2007
@ -59,14 +60,14 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
@Override
public void startBackend() {
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#stopBackend()
*/
@Override
public void stopBackend() {
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#isReadOnly()
*/
@ -74,7 +75,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
public boolean isReadOnly() {
return false;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#isPageable()
*/
@ -83,14 +84,6 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
return false;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state)
*/
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
return 0;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#isSearchable()
*/
@ -122,7 +115,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascBackendException {
return 0l;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#doRecordMoveUpById(java.lang.Object)
*/
@ -130,23 +123,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascBackendException {
return 0l;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#executePageSummary()
*/
@Override
public Map<String, Object> executePageSummary() {
return null;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#executeTotalSummary()
*/
@Override
public Map<String, Object> executeTotalSummary() {
return null;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#hasPageSummary()
*/
@ -154,7 +131,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
public boolean hasPageSummary() {
return false;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#hasTotalSummary()
*/

6
vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/DefaultVascBackendResult.java
View file

@ -35,7 +35,11 @@ import java.util.Map;
public final class DefaultVascBackendResult<DATA_OBJECT extends Serializable> extends AbstractVascBackendResult<DATA_OBJECT> {
public DefaultVascBackendResult(List<DATA_OBJECT> pageData) {
this(pageData,-1,null,null);
this(pageData,-1);
}
public DefaultVascBackendResult(List<DATA_OBJECT> pageData,long totalSize) {
this(pageData,totalSize,null,null);
}
public DefaultVascBackendResult(List<DATA_OBJECT> pageData, long totalSize,

8
vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/VascBackend.java
View file

@ -77,12 +77,6 @@ public interface VascBackend<DATA_OBJECT extends Serializable> {
* @return
*/
public boolean isPageable();
/**
* Returns the total amount of records.
* @return
*/
public long fetchTotalExecuteSize(VascBackendState state);
/**
* Defines if the backend supports pageing
@ -100,8 +94,6 @@ public interface VascBackend<DATA_OBJECT extends Serializable> {
public boolean hasPageSummary();
public Map<String,Object> executePageSummary();
public boolean hasTotalSummary();
public Map<String,Object> executeTotalSummary();
}

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));

16
vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelVascBackend.java
View file

@ -140,12 +140,8 @@ public class MetaModelVascBackend extends AbstractVascBackend<Row> {
public boolean isSortable() {
return true;
}
/**
* @see net.forwardfire.vasc.backend.AbstractVascBackend#fetchTotalExecuteSize(net.forwardfire.vasc.backend.VascBackendState)
*/
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
private long fetchTotalExecuteSize(VascBackendState state) {
Schema schema = dataContext.getDefaultSchema();
Table t = schema.getTableByName(table);
Query q = createFilterQuery(state,t,true);
@ -213,6 +209,10 @@ public class MetaModelVascBackend extends AbstractVascBackend<Row> {
@Override
public VascBackendResult<Row> execute(VascBackendState state) throws VascBackendException {
return new DefaultVascBackendResult<Row>(executeList(state),fetchTotalExecuteSize(state));
}
private List<Row> executeList(VascBackendState state) throws VascBackendException {
Schema schema = dataContext.getDefaultSchema();
Table t = schema.getTableByName(table);
if (t==null) {
@ -243,7 +243,7 @@ public class MetaModelVascBackend extends AbstractVascBackend<Row> {
DataSet ds = crudDataContext.executeQuery(q);
result.addAll(ds.toRows());
ds.close();
return new DefaultVascBackendResult<Row>(result);
return result;
}
DataSet ds = dataContext.executeQuery(q);
@ -261,7 +261,7 @@ public class MetaModelVascBackend extends AbstractVascBackend<Row> {
}
ds.close();
return new DefaultVascBackendResult<Row>(result);
return result;
}
@Override

14
vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascBackend.java
View file

@ -85,11 +85,7 @@ public class MongodbVascBackend extends AbstractVascBackend<BasicDBObject> {
return true;
}
/**
* @see net.forwardfire.vasc.backend.AbstractVascBackend#fetchTotalExecuteSize(net.forwardfire.vasc.backend.VascBackendState)
*/
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
private long fetchTotalExecuteSize(VascBackendState state) {
DBCollection coll = getDBCollection();
DBObject query = createFilterQuery(state);
long result = coll.count(query);
@ -105,9 +101,13 @@ public class MongodbVascBackend extends AbstractVascBackend<BasicDBObject> {
}
return query;
}
@Override
public VascBackendResult<BasicDBObject> execute(VascBackendState state) throws VascBackendException {
return new DefaultVascBackendResult<BasicDBObject>(executeList(state),fetchTotalExecuteSize(state));
}
private List<BasicDBObject> executeList(VascBackendState state) throws VascBackendException {
DBCollection coll = getDBCollection();
DBObject query = createFilterQuery(state);
DBCursor cur = coll.find(query);
@ -120,7 +120,7 @@ public class MongodbVascBackend extends AbstractVascBackend<BasicDBObject> {
DBObject row = cur.next();
result.add((BasicDBObject)row);
}
return new DefaultVascBackendResult<BasicDBObject>(result);
return result;
}
@Override