Fix for #150 - Stateless update - property changed in BeanPersistAdapter

preUpdate not included in update
This commit is contained in:
Rob Bygrave committed 2014-06-20 23:49:29 +12:00
1 parent dd83bc4d26
commit c5ea93fb8e
2 files changed
+20 -21

No files matched your search

@@ -79,8 +79,6 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
private boolean notifyCache; private boolean notifyCache;
private boolean deleteMissingChildren; private boolean deleteMissingChildren;
private final Set<String> dirtyPropertyNames;
/** /**
* Flag used to detect when only many properties where updated via a cascade. Used to ensure * Flag used to detect when only many properties where updated via a cascade. Used to ensure
@@ -102,6 +100,9 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
this.beanManager = mgr; this.beanManager = mgr;
this.beanDescriptor = mgr.getBeanDescriptor(); this.beanDescriptor = mgr.getBeanDescriptor();
this.beanPersistListener = beanDescriptor.getPersistListener(); this.beanPersistListener = beanDescriptor.getPersistListener();
this.bean = bean;
this.parentBean = parentBean;
this.controller = beanDescriptor.getPersistController();
if (PersistRequest.Type.DETERMINE != type) { if (PersistRequest.Type.DETERMINE != type) {
this.type = type; this.type = type;
@@ -111,18 +112,11 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
this.persistCascade = t.isPersistCascade(); this.persistCascade = t.isPersistCascade();
} }
if (this.type == Type.UPDATE && intercept.isNew() ) { if (this.type == Type.UPDATE) {
// 'stateless update' - set bean up for doing update if (intercept.isNew() ) {
intercept.setNewBeanForUpdate(); // 'stateless update' - set loaded properties as dirty
} intercept.setNewBeanForUpdate();
}
// derive the set of property names now as we will pass them to a beanPersistListener later
this.dirtyPropertyNames = (beanPersistListener == null) ? null : intercept.getDirtyPropertyNames();
this.bean = bean;
this.parentBean = parentBean;
this.controller = beanDescriptor.getPersistController();
if (Type.UPDATE == type) {
// Mark Mutable scalar properties (like Hstore) as dirty where necessary // Mark Mutable scalar properties (like Hstore) as dirty where necessary
beanDescriptor.checkMutableProperties(intercept); beanDescriptor.checkMutableProperties(intercept);
} }
@@ -197,7 +191,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
return beanPersistListener.inserted(bean); return beanPersistListener.inserted(bean);
case UPDATE: case UPDATE:
return beanPersistListener.updated(bean, dirtyPropertyNames); return beanPersistListener.updated(bean, intercept.getDirtyPropertyNames());
case DELETE: case DELETE:
return beanPersistListener.deleted(bean); return beanPersistListener.deleted(bean);
@@ -286,6 +280,16 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
public void setDeleteMissingChildren(boolean deleteMissingChildren) { public void setDeleteMissingChildren(boolean deleteMissingChildren) {
this.deleteMissingChildren = deleteMissingChildren; this.deleteMissingChildren = deleteMissingChildren;
} }
/**
* Prepare the update after potential modifications in a BeanPersistController.
*/
public void postControllerPrepareUpdate() {
if (intercept.isNew() && controller != null) {
// 'stateless update' - set dirty properties modified in controller preUpdate
intercept.setNewBeanForUpdate();
}
}
/** /**
* Used to skip updates if we know the bean is not dirty. This is the case * Used to skip updates if we know the bean is not dirty. This is the case
@@ -64,8 +64,6 @@ public final class DefaultPersistExecute implements PersistExecute {
BeanPersistController controller = request.getBeanController(); BeanPersistController controller = request.getBeanController();
if (controller == null || controller.preInsert(request)) { if (controller == null || controller.preInsert(request)) {
persister.insert(request); persister.insert(request);
// NOTE: the persister fires the postInsert so that this
// occurs before ebeanIntercept.setLoaded(true)
} }
} }
@@ -79,9 +77,8 @@ public final class DefaultPersistExecute implements PersistExecute {
BeanPersistController controller = request.getBeanController(); BeanPersistController controller = request.getBeanController();
if (controller == null || controller.preUpdate(request)) { if (controller == null || controller.preUpdate(request)) {
request.postControllerPrepareUpdate();
persister.update(request); persister.update(request);
// NOTE: the persister fires the postUpdate so that this
// occurs before ebeanIntercept.setLoaded(true)
} }
} }
@@ -95,9 +92,7 @@ public final class DefaultPersistExecute implements PersistExecute {
BeanPersistController controller = request.getBeanController(); BeanPersistController controller = request.getBeanController();
if (controller == null || controller.preDelete(request)) { if (controller == null || controller.preDelete(request)) {
persister.delete(request); persister.delete(request);
// NOTE: the persister fires the postDelete
} }
} }