github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1723 - Fix for TestUpdateCircularSave.testCircularCascade()

Browse Source
This commit is contained in:
rob bygrave
2019-06-10 23:31:47 +12:00
parent cc26afad13
commit 6e52bee91f
5 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+8
View File
@@ -223,6 +223,12 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
beanDescriptor.setDraftDirty(entityBean, true);
}
this.dirty = intercept.isDirty();
}
/**
* Init generated properties for soft delete (as it's an update).
*/
public void initForSoftDelete() {
initGeneratedProperties();
}
@@ -1370,6 +1376,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
* Set the request flags indicating this is an insert.
*/
public void flagInsert() {
initGeneratedProperties();
if (intercept.isNew()) {
flags = Flags.setInsertNormal(flags);
} else {
@@ -1381,6 +1388,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
* Unset the request insert flag indicating this is an update.
*/
public void flagUpdate() {
initGeneratedProperties();
if (intercept.isLoaded()) {
flags = Flags.setUpdateNormal(flags);
} else {
src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+31 -22
View File
@@ -377,7 +377,7 @@ public final class DefaultPersister implements Persister {
* Recursively delete the bean. This calls back to the EbeanServer.
*/
private int deleteRecurse(EntityBean detailBean, Transaction t, DeleteMode deleteMode) {
return deleteRequest(createRequest(detailBean, t, deleteMode.persistType()));
return deleteRequest(createDeleteRequest(detailBean, t, deleteMode.persistType()));
}
@Override
@@ -578,12 +578,11 @@ public final class DefaultPersister implements Persister {
public int delete(EntityBean bean, Transaction t, boolean permanent) {
Type deleteType = permanent ? Type.DELETE_PERMANENT : Type.DELETE;
PersistRequestBean<EntityBean> originalRequest = createRequest(bean, t, deleteType);
PersistRequestBean<EntityBean> originalRequest = createDeleteRequest(bean, t, deleteType);
if (originalRequest.isHardDeleteDraft()) {
// a hard delete of a draftable bean so first we need to delete the associated 'live' bean
// due to FK constraint and then after that execute the original delete of the draft bean
return deleteRequest(createPublishRequest(originalRequest.createReference(), t, Type.DELETE_PERMANENT, Flags.PUBLISH), originalRequest);
return deleteRequest(createDeleteRequest(originalRequest.createReference(), t, Type.DELETE_PERMANENT, Flags.PUBLISH), originalRequest);
} else {
// normal delete or soft delete
@@ -639,8 +638,8 @@ public final class DefaultPersister implements Persister {
t.depth(-1);
t.checkBatchEscalationOnCollection();
}
for (Object aBeanList : beanList) {
deleteRecurse((EntityBean) aBeanList, t, deleteMode);
for (Object bean : beanList) {
deleteRecurse((EntityBean) bean, t, deleteMode);
}
if (children) {
t.flushBatchOnCollection();
@@ -1248,21 +1247,11 @@ public final class DefaultPersister implements Persister {
return createRequestInternal(bean, t, type, Flags.ZERO);
}
/**
* Create the Persist Request Object additionally specifying the publish status.
*/
<T> PersistRequestBean<T> createPublishRequest(T bean, Transaction t, PersistRequest.Type type, int flags) {
return createRequestInternal(bean, t, type, Flags.unsetRecuse(flags));
}
/**
* Create the Persist Request Object additionally specifying the publish status.
*/
private <T> PersistRequestBean<T> createRequestInternal(T bean, Transaction t, PersistRequest.Type type, int flags) {
BeanManager<T> mgr = getBeanManager(bean);
if (mgr == null) {
throw new PersistenceException(errNotRegistered(bean.getClass()));
}
return createRequest(bean, t, null, mgr, type, flags);
}
@@ -1273,9 +1262,6 @@ public final class DefaultPersister implements Persister {
*/
private <T> PersistRequestBean<T> createRequestRecurse(T bean, Transaction t, Object parentBean, int flags) {
BeanManager<T> mgr = getBeanManager(bean);
if (mgr == null) {
throw new PersistenceException(errNotRegistered(bean.getClass()));
}
BeanDescriptor<T> desc = mgr.getBeanDescriptor();
EntityBean entityBean = (EntityBean) bean;
PersistRequest.Type type;
@@ -1298,6 +1284,23 @@ public final class DefaultPersister implements Persister {
private <T> PersistRequestBean<T> createRequest(T bean, Transaction t, Object parentBean, BeanManager<?> mgr,
PersistRequest.Type type, int flags) {
// no delete requests come here
return new PersistRequestBean(server, bean, parentBean, mgr, (SpiTransaction) t, persistExecute, type, flags);
}
<T> PersistRequestBean<T> createDeleteRemoved(T bean, Transaction t, PersistRequest.Type type, int flags) {
return createDeleteRequest(bean, t, type, Flags.unsetRecurse(flags));
}
@SuppressWarnings({"unchecked", "rawtypes"})
private <T> PersistRequestBean<T> createDeleteRequest(EntityBean bean, Transaction t, Type type) {
return createDeleteRequest(bean, t, type, Flags.ZERO);
}
@SuppressWarnings({"unchecked", "rawtypes"})
public <T> PersistRequestBean<T> createDeleteRequest(Object bean, Transaction t, PersistRequest.Type type, int flags) {
BeanManager<T> mgr = getBeanManager(bean);
if (type == Type.DELETE_PERMANENT) {
type = Type.DELETE;
} else if (type == Type.DELETE && mgr.getBeanDescriptor().isSoftDelete()) {
@@ -1305,7 +1308,9 @@ public final class DefaultPersister implements Persister {
type = Type.DELETE_SOFT;
}
return new PersistRequestBean(server, bean, parentBean, mgr, (SpiTransaction) t, persistExecute, type, flags);
PersistRequestBean<T> request = new PersistRequestBean<T>(server, (T)bean, null, mgr, (SpiTransaction) t, persistExecute, type, flags);
request.initForSoftDelete();
return request;
}
private String errNotRegistered(Class<?> beanClass) {
@@ -1323,8 +1328,12 @@ public final class DefaultPersister implements Persister {
* </p>
*/
@SuppressWarnings("unchecked")
private <T> BeanManager<T> getBeanManager(T bean) {
private <T> BeanManager<T> getBeanManager(Object bean) {
return (BeanManager<T>) beanDescriptorManager.getBeanManager(bean.getClass());
BeanManager<T> mgr = (BeanManager<T>) beanDescriptorManager.getBeanManager(bean.getClass());
if (mgr == null) {
throw new PersistenceException(errNotRegistered(bean.getClass()));
}
return mgr;
}
}
src/main/java/io/ebeaninternal/server/persist/Flags.java
+1 -1
View File
@@ -122,7 +122,7 @@ public final class Flags {
return set(state, RECURSE);
}
public static int unsetRecuse(int state) {
public static int unsetRecurse(int state) {
return unset(state, RECURSE);
}
src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+1 -1
View File
@@ -356,7 +356,7 @@ public class SaveManyBeans extends SaveManyBase {
EntityBean eb = (EntityBean) removedBean;
if (!eb._ebean_getIntercept().isNew()) {
// only delete if the bean was loaded meaning that it is known to exist in the DB
persister.deleteRequest(persister.createPublishRequest(removedBean, transaction, PersistRequest.Type.DELETE, request.getFlags()));
persister.deleteRequest(persister.createDeleteRemoved(removedBean, transaction, PersistRequest.Type.DELETE, request.getFlags()));
}
}
}