#466 - Delete of @Draftable bean ... means also delete matching live bean (aka delete has automatic publish behavior)

This commit is contained in:
Robin Bygrave committed 2015-11-26 00:49:18 +13:00
1 parent 8620dbf337
commit 872f0e21cb
2 files changed
+29 -1

No files matched your search

@@ -421,6 +421,20 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
return beanDescriptor.getId(entityBean);
}
/**
* Create and return a new reference bean matching this beans Id value.
*/
public T createReference() {
return beanDescriptor.createReference(Boolean.FALSE, getBeanId());
}
/**
* Return true if the bean type is a Draftable.
*/
public boolean isDraftable() {
return beanDescriptor.isDraftable();
}
/**
* Return the parent bean for cascading save with unidirectional relationship.
*/
@@ -33,6 +33,7 @@ import com.avaje.ebeaninternal.server.deploy.ManyType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.persistence.OptimisticLockException;
import javax.persistence.PersistenceException;
import java.util.ArrayList;
import java.util.Collection;
@@ -59,6 +60,8 @@ import java.util.Set;
*/
public final class DefaultPersister implements Persister {
private static final Logger SUM = LoggerFactory.getLogger("org.avaje.ebean.SUM");
private static final Logger PUB = LoggerFactory.getLogger("org.avaje.ebean.PUB");
private static final Logger logger = LoggerFactory.getLogger(DefaultPersister.class);
@@ -498,7 +501,18 @@ public final class DefaultPersister implements Persister {
*/
public void delete(EntityBean bean, Transaction t) {
deleteRequest(createRequest(bean, t, PersistRequest.Type.DELETE));
PersistRequestBean<EntityBean> request = createRequest(bean, t, Type.DELETE);
deleteRequest(request);
if (request.isDraftable()) {
// we have just deleting a draft bean so now we need to delete the
// associated 'live' bean. This is effectively an 'automatic publish'.
try {
deleteRequest(createRequest(request.createReference(), t, Type.DELETE, true));
} catch (OptimisticLockException e) {
SUM.debug("Ignore OptimisticLockException - did not delete live row as draft not published for bean:{} id:{}", request.getFullName(), request.getBeanId());
}
}
}
private void deleteRequest(PersistRequestBean<?> req) {