#405 - ENH: Add @ReadAudit and associated functionality for auditing reads including queries and L2 cache access

This commit is contained in:
Robin Bygrave committed 2015-09-03 13:54:52 +12:00
1 parent c292da736b
commit 54172aec6c
54 files changed
+2020 -200

No files matched your search

@@ -84,6 +84,28 @@ public interface IdBinder {
*/
Object[] getBindValues(Object idValue);
/**
* For EmbeddedId convert the idValue into a simple map.
* Otherwise the idValue is just returned as is.
* <p>
* This is used to provide a simple JSON serializable version of the id value.
* </p>
*/
Object getIdForJson(EntityBean idValue);
/**
* For EmbeddedId the value is assumed to be a Map and this is
* takes the values from the map and builds an embedded id bean.
* <p>
* For other simple id's this just returns the value (no conversion required).
* </p>
* <p>
* This is used to provide a simple JSON serializable version of the id value.
* </p>
*/
Object convertIdFromJson(Object value);
/**
* Return the id values for a given bean.
*/
@@ -171,4 +193,8 @@ public interface IdBinder {
*/
Object convertSetId(Object idValue, EntityBean bean);
/**
* Cast or convert the Id value if necessary.
*/
Object convertId(Object idValue);
}
@@ -15,7 +15,9 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.sql.SQLException;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* Bind an Id that is an Embedded bean.
@@ -225,6 +227,36 @@ public final class IdBinderEmbedded implements IdBinder {
return bindvalues;
}
/**
* Convert from embedded bean to Map.
*/
@Override
public Object getIdForJson(EntityBean bean) {
EntityBean ebValue = (EntityBean)embIdProperty.getValue(bean);
Map<String,Object> map = new LinkedHashMap<String, Object>();
for (int i = 0; i < props.length; i++) {
map.put(props[i].getName(), props[i].getValue(ebValue));
}
return map;
}
/**
* Convert back from a Map to embedded bean.
*/
public Object convertIdFromJson(Object value) {
Map<String,Object> map = (Map<String, Object>)value;
EntityBean idValue = idDesc.createEntityBean();
for (int i = 0; i < props.length; i++) {
Object val = map.get(props[i].getName());
props[i].setValue(idValue, val);
}
return idValue;
}
public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
for (int i = 0; i < props.length; i++) {
Object embFieldValue = props[i].getValue((EntityBean) value);
@@ -386,6 +418,12 @@ public final class IdBinderEmbedded implements IdBinder {
return sb.toString();
}
@Override
public Object convertId(Object idValue) {
// can not cast/convert if it is embedded
return idValue;
}
public Object convertSetId(Object idValue, EntityBean bean) {
// can not cast/convert if it is embedded
@@ -98,6 +98,16 @@ public final class IdBinderEmpty implements IdBinder {
return new Object[]{idValue};
}
@Override
public Object getIdForJson(EntityBean bean) {
return null;
}
@Override
public Object convertIdFromJson(Object value) {
return value;
}
public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
}
@@ -124,6 +134,11 @@ public final class IdBinderEmpty implements IdBinder {
return idValue;
}
@Override
public Object convertId(Object idValue) {
return idValue;
}
public Object readData(DataInput dataOutput) throws IOException {
return null;
}
@@ -131,6 +131,17 @@ public final class IdBinderSimple implements IdBinder {
request.addBindValue(value);
}
@Override
public Object getIdForJson(EntityBean bean) {
return idProperty.getValue(bean);
}
@Override
public Object convertIdFromJson(Object value) {
// handle simple type conversion if required
return convertId(value);
}
public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
sqlUpdate.addParameter(value);
}
@@ -193,6 +204,14 @@ public final class IdBinderSimple implements IdBinder {
return sb.toString();
}
public Object convertId(Object idValue) {
if (!idValue.getClass().equals(expectedType)) {
return scalarType.toBeanType(idValue);
}
return idValue;
}
public Object convertSetId(Object idValue, EntityBean bean) {
if (!idValue.getClass().equals(expectedType)) {