ff-attic/imxmi
2
0
Fork 0
Code Activity

WIP added backend generics so all is seriazible and started to make

Browse source 
execute return full result.
This commit is contained in:
Willem Cazander 2014-08-23 16:58:42 +02:00
parent 3bf185ad48
commit 90b81deb29
25 changed files with 109 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

11
vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackend.java
View file

@ -31,7 +31,9 @@ import java.util.HashMap;
import java.util.List;
import net.forwardfire.vasc.backend.AbstractVascBackend;
import net.forwardfire.vasc.backend.DefaultVascBackendResult;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.backend.VascBackendResult;
import net.forwardfire.vasc.backend.VascBackendState;
import net.forwardfire.vasc.backend.VascEntryFieldValue;
import net.forwardfire.vasc.backend.VascEntryRecordCreator;
@ -79,7 +81,7 @@ public class JdbcVascBackend extends AbstractVascBackend<HashMap<String,Object>>
/**
* @see net.forwardfire.vasc.backend.VascBackend#execute(VascBackendState state)
*/
public List<HashMap<String,Object>> execute(VascBackendState state) throws VascBackendException {
public VascBackendResult<HashMap<String,Object>> execute(VascBackendState state) throws VascBackendException {
JdbcConnectionProvider prov = getJdbcConnectionProvider();
List<HashMap<String,Object>> result = new ArrayList<HashMap<String,Object>>(50);
Connection connection = null;
@ -108,16 +110,17 @@ public class JdbcVascBackend extends AbstractVascBackend<HashMap<String,Object>>
}
}
}
return result;
return new DefaultVascBackendResult<HashMap<String,Object>>(result);
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#merge(java.lang.Object)
*/
public HashMap<String,Object> merge(HashMap<String,Object> object) throws VascBackendException {
return object;
}
/**
* @see net.forwardfire.vasc.backend.VascBackend#persist(java.lang.Object)
*/

6
vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackendXpql.java
View file

@ -31,7 +31,9 @@ import java.util.HashMap;
import java.util.List;
import net.forwardfire.vasc.backend.AbstractVascBackend;
import net.forwardfire.vasc.backend.DefaultVascBackendResult;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.backend.VascBackendResult;
import net.forwardfire.vasc.backend.VascBackendState;
import net.forwardfire.vasc.backend.VascEntryFieldValue;
import net.forwardfire.vasc.backend.VascEntryRecordCreator;
@ -90,7 +92,7 @@ public class JdbcVascBackendXpql extends AbstractVascBackend<HashMap<String,Obje
/**
* @see net.forwardfire.vasc.backend.VascBackend#execute(VascBackendState state)
*/
public List<HashMap<String,Object>> execute(VascBackendState state) throws VascBackendException {
public VascBackendResult<HashMap<String,Object>> execute(VascBackendState state) throws VascBackendException {
// Copy parameters
for (String key:state.getDataParameterKeys()) {
Object value = state.getDataParameter(key);
@ -120,7 +122,7 @@ public class JdbcVascBackendXpql extends AbstractVascBackend<HashMap<String,Obje
}
result.add(map);
}
return result;
return new DefaultVascBackendResult<HashMap<String,Object>>(result);
} catch (SQLException e) {
throw new VascBackendException(e);
} finally {