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

25
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/AbstractVascBackendProxy.java
View file

@ -23,7 +23,6 @@
package net.forwardfire.vasc.backend.proxy;
import java.io.Serializable;
import java.util.Map;
import net.forwardfire.vasc.backend.VascBackend;
import net.forwardfire.vasc.backend.VascBackendException;
@ -94,14 +93,6 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
return backend.isReadOnly();
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state)
*/
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
return backend.fetchTotalExecuteSize(state);
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#isSortable()
*/
@ -215,22 +206,6 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
return backend.isRecordMoveable();
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#executePageSummary()
*/
@Override
public Map<String, Object> executePageSummary() {
return backend.executePageSummary();
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#executeTotalSummary()
*/
@Override
public Map<String, Object> executeTotalSummary() {
return backend.executeTotalSummary();
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#hasPageSummary()
*/

16
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyCache.java
View file

@ -38,7 +38,6 @@ import net.forwardfire.vasc.backend.VascBackendState;
*/
public class VascBackendProxyCache extends AbstractVascBackendProxy {
private Long records = null;
private VascBackendResult<Serializable> data = null;
private String searchString = null;
private Map<String,Object> dataState = null;
@ -89,7 +88,7 @@ public class VascBackendProxyCache extends AbstractVascBackendProxy {
changed = true;
}
sortDir = state.isSortAscending();
if (state.getPageSizeMax()==pageSizeMax) {
changed = true;
}
@ -139,15 +138,6 @@ public class VascBackendProxyCache extends AbstractVascBackendProxy {
return data;
}
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
boolean changed = isStateChanged(state);
if (records==null | changed) {
records = backend.fetchTotalExecuteSize(state);
}
return records;
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#delete(java.lang.Object)
*/
@ -156,7 +146,7 @@ public class VascBackendProxyCache extends AbstractVascBackendProxy {
requestFlush = true;
super.delete(object);
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#merge(java.lang.Object)
*/
@ -165,7 +155,7 @@ public class VascBackendProxyCache extends AbstractVascBackendProxy {
requestFlush = true;
return super.merge(object);
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#persist(java.lang.Object)
*/

25
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyEventExecutor.java
View file

@ -72,7 +72,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy {
listeners.add(listener);
}
}
public void addVascEntryBackendEventListener(VascEntryBackendEventListener listener) {
listeners.add(listener);
}
@ -113,7 +113,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy {
super.delete(object);
fireVascEvent(VascBackendEventType.POST_DELETE,object);
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#doRecordMoveDownById(net.forwardfire.vasc.backend.VascBackendState, java.lang.Object)
*/
@ -124,7 +124,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy {
fireVascEvent(VascBackendEventType.POST_MOVE_DOWN,result);
return result;
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#doRecordMoveUpById(net.forwardfire.vasc.backend.VascBackendState, java.lang.Object)
*/
@ -135,7 +135,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy {
fireVascEvent(VascBackendEventType.POST_MOVE_UP,result);
return result;
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#execute(net.forwardfire.vasc.backend.VascBackendState)
*/
@ -146,18 +146,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy {
fireVascEvent(VascBackendEventType.POST_EXECUTE,result);
return result;
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#fetchTotalExecuteSize(net.forwardfire.vasc.backend.VascBackendState)
*/
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
fireVascEvent(VascBackendEventType.PRE_TOTAL_EXECUTE_SIZE,state);
Long result = super.fetchTotalExecuteSize(state);
fireVascEvent(VascBackendEventType.POST_TOTAL_EXECUTE_SIZE,result);
return result;
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#merge(java.lang.Object)
*/
@ -168,7 +157,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy {
fireVascEvent(VascBackendEventType.POST_MERGE,result);
return result;
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#persist(java.lang.Object)
*/
@ -177,5 +166,5 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy {
fireVascEvent(VascBackendEventType.PRE_PERSIST,object);
super.persist(object);
fireVascEvent(VascBackendEventType.POST_PERSIST,object);
}
}
}

9
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyFilter.java
View file

@ -41,7 +41,6 @@ import net.forwardfire.vasc.core.VascEntry;
*/
public class VascBackendProxyFilter extends AbstractVascBackendProxy {
private long records = 0;
private List<VascProxyFilter> filters = null;
/**
@ -97,12 +96,6 @@ public class VascBackendProxyFilter extends AbstractVascBackendProxy {
}
}
}
records = search.size();
return new DefaultVascBackendResult<Serializable>(search);
}
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
return records;
return new DefaultVascBackendResult<Serializable>(search,search.size());
}
}

11
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyPaged.java
View file

@ -39,8 +39,6 @@ import net.forwardfire.vasc.backend.VascBackendState;
*/
public class VascBackendProxyPaged extends AbstractVascBackendProxy {
private long records = 0;
/**
* @see java.lang.Object#clone()
*/
@ -77,7 +75,6 @@ public class VascBackendProxyPaged extends AbstractVascBackendProxy {
VascBackendResult<Serializable> allData = backend.execute(state);
int pageSize = state.getPageSize();
if (pageSize==0) {
records = allData.getPageData().size();
return allData;
}
List<Serializable> paged = new ArrayList<Serializable>(state.getPageSize());
@ -90,12 +87,6 @@ public class VascBackendProxyPaged extends AbstractVascBackendProxy {
Serializable o = allData.getPageData().get(i);
paged.add(o);
}
records = allData.getPageData().size();
return new DefaultVascBackendResult<Serializable>(paged);
}
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
return records;
return new DefaultVascBackendResult<Serializable>(paged,allData.getPageData().size());
}
}

5
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxySearch.java
View file

@ -137,9 +137,4 @@ public class VascBackendProxySearch extends AbstractVascBackendProxy {
//records = search.size();
return new DefaultVascBackendResult<Serializable>(search);
}
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
return backend.fetchTotalExecuteSize(state);
}
}

23
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyTimerLogger.java
View file

@ -69,17 +69,6 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy {
}
}
@Override
public long fetchTotalExecuteSize(VascBackendState state) {
long t1 = System.currentTimeMillis();
try {
return backend.fetchTotalExecuteSize(state);
} finally {
long t2 = System.currentTimeMillis();
logger.log(logLevel,"vasc-fetchTotalExecuteSize backend: "+getId()+" in "+(t2-t1)+" ms");
}
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#doRecordMoveDownById(net.forwardfire.vasc.backend.VascBackendState, java.lang.Object)
*/
@ -93,7 +82,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy {
logger.log(logLevel,"vasc-doRecordMoveDownById backend: "+getId()+" in "+(t2-t1)+" ms");
}
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#doRecordMoveUpById(net.forwardfire.vasc.backend.VascBackendState, java.lang.Object)
*/
@ -107,7 +96,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy {
logger.log(logLevel,"vasc-doRecordMoveUpById backend: "+getId()+" in "+(t2-t1)+" ms");
}
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#delete(java.lang.Object)
*/
@ -121,7 +110,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy {
logger.log(logLevel,"vasc-delete backend: "+getId()+" in "+(t2-t1)+" ms");
}
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#merge(java.lang.Object)
*/
@ -135,7 +124,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy {
logger.log(logLevel,"vasc-merge backend: "+getId()+" in "+(t2-t1)+" ms");
}
}
/**
* @see net.forwardfire.vasc.backend.proxy.AbstractVascBackendProxy#persist(java.lang.Object)
*/
@ -149,14 +138,14 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy {
logger.log(logLevel,"vasc-persist backend: "+getId()+" in "+(t2-t1)+" ms");
}
}
/**
* @return the logLevel
*/
public Level getLogLevel() {
return logLevel;
}
/**
* @param logLevel the logLevel to set
*/

2
vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryBackendEventListener.java
View file

@ -42,7 +42,6 @@ public interface VascEntryBackendEventListener extends Serializable {
PRE_DELETE,
PRE_PROVIDE_FIELD_VALUE,
PRE_PROVIDE_RECORD_CREATOR,
PRE_TOTAL_EXECUTE_SIZE,
PRE_MOVE_DOWN,
PRE_MOVE_UP,
@ -52,7 +51,6 @@ public interface VascEntryBackendEventListener extends Serializable {
POST_DELETE,
POST_PROVIDE_FIELD_VALUE,
POST_PROVIDE_RECORD_CREATOR,
POST_TOTAL_EXECUTE_SIZE,
POST_MOVE_DOWN,
POST_MOVE_UP
}

3
vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/SetParameterBackendListener.java
View file

@ -65,8 +65,7 @@ public class SetParameterBackendListener implements VascEntryBackendEventListene
VascBackendEventType.PRE_MERGE,
VascBackendEventType.PRE_MOVE_DOWN,
VascBackendEventType.PRE_MOVE_UP,
VascBackendEventType.PRE_PERSIST,
VascBackendEventType.PRE_TOTAL_EXECUTE_SIZE
VascBackendEventType.PRE_PERSIST
};
}

27
vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java
View file

@ -27,6 +27,7 @@ import java.util.Date;
import java.util.logging.Logger;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.backend.VascBackendResult;
import net.forwardfire.vasc.backend.VascBackendState;
import net.forwardfire.vasc.backend.proxy.VascProxyFilter;
import net.forwardfire.vasc.core.VascEntry;
@ -225,25 +226,25 @@ public class DefaultVascFrontendActions implements VascFrontendActions {
}
}
// Always update total records
Long total = entry.getVascFrontendController().getVascEntryState().getVascBackend().fetchTotalExecuteSize(backendState);
entry.getVascFrontendController().getVascEntryState().setTotalBackendRecords(total);
VascBackendResult<Serializable> result;
try {
result = entry.getVascFrontendController().getVascEntryState().getVascBackend().execute(backendState);
} catch (VascBackendException ve) {
throw new VascFrontendException(ve);
}
// Set data in frontend
entry.getVascFrontendController().getVascEntryState().setEntryDataList(result.getPageData());
entry.getVascFrontendController().getVascEntryState().setTotalBackendRecords(result.getTotalSize());
// check if we need to change the current page if table size if changed in between
int pages = new Long(total/backendState.getPageSize()).intValue();
int pages = new Long(result.getTotalSize()/backendState.getPageSize()).intValue();
if (backendState.getPageIndex() > pages) {
backendState.setPageIndex(pages);
}
try {
// Execute to get data.
entry.getVascFrontendController().getVascEntryState().setEntryDataList(entry.getVascFrontendController().getVascEntryState().getVascBackend().execute(backendState).getPageData());
// Fire event post read
entry.getVascFrontendController().fireVascFrontendEvent(entry,VascEntryFrontendEventListener.VascFrontendEventType.POST_READ, null);
} catch (VascBackendException ve) {
throw new VascFrontendException(ve);
}
// Fire event post read
entry.getVascFrontendController().fireVascFrontendEvent(entry,VascEntryFrontendEventListener.VascFrontendEventType.POST_READ, null);
}
@Override