diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java index aa8c72b5a..b75e305e4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java @@ -38,13 +38,10 @@ public final class BeanCollectionUtil { // returns a collection of beans return bc.getActualEntries(); } - - if (o instanceof Map) { - // yes, we want the entrySet (to set the keys) - return ((Map) o).entrySet(); - - } else if (o instanceof Collection) { + if (o instanceof Collection) { return ((Collection) o); + } else if (o instanceof Map) { + return ((Map) o).entrySet(); } throw new PersistenceException("expecting a Map or Collection but got " + o.getClass().getName()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index 5b6858e78..44c9777b4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -37,6 +37,7 @@ final class SaveManyBeans extends SaveManyBase { private final boolean hasOrderColumn; private int sortOrder; private boolean insertAllChildren; + private boolean forceOrphanRemoval; SaveManyBeans(DefaultPersister persister, boolean insertedParent, BeanPropertyAssocMany many, EntityBean parentBean, PersistRequestBean request) { super(persister, insertedParent, many, parentBean, request); @@ -141,7 +142,7 @@ final class SaveManyBeans extends SaveManyBase { } private boolean forcedUpdateOrphanRemoval() { - return !insertedParent && many.isOrphanRemoval() && request.isForcedUpdate(); + return !insertedParent && many.isOrphanRemoval() && (forceOrphanRemoval || request.isForcedUpdate()); } private void saveAllBeans(final BeanProperty orderColumn) { @@ -228,8 +229,10 @@ final class SaveManyBeans extends SaveManyBase { if (detailBean instanceof EntityBean) { Object id = targetDescriptor.id(detailBean); if (!isNullOrZero(id)) { - // remember the Id (other details not in the collection) will be removed - detailIds.add(id); + if (!forceOrphanRemoval || !((EntityBean)detailBean)._ebean_getIntercept().isNew()) { + // remember the Id (other details not in the collection) will be removed + detailIds.add(id); + } } } } @@ -359,7 +362,9 @@ final class SaveManyBeans extends SaveManyBase { if (!hasOrderColumn) { c.modifyReset(); } - if (modifyRemovals != null && !modifyRemovals.isEmpty()) { + if (modifyRemovals == null || modifyRemovals.isEmpty()) { + forceOrphanRemoval = !insertedParent && isChangedProperty(); + } else { for (Object removedBean : modifyRemovals) { if (removedBean instanceof EntityBean) { EntityBean eb = (EntityBean) removedBean; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyStatelessUpdateResultsInSoftDelete.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyStatelessUpdateResultsInSoftDelete.java index e6e86e5dd..b747cb904 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyStatelessUpdateResultsInSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyStatelessUpdateResultsInSoftDelete.java @@ -5,10 +5,7 @@ import io.ebean.DB; import io.ebean.test.LoggedSql; import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; -import org.tests.o2m.dm.GoodsEntity; -import org.tests.o2m.dm.PersonEntity; -import org.tests.o2m.dm.WorkflowEntity; -import org.tests.o2m.dm.WorkflowOperationEntity; +import org.tests.o2m.dm.*; import java.io.StringWriter; import java.util.List; @@ -235,4 +232,63 @@ class TestOneToManyStatelessUpdateResultsInSoftDelete extends BaseTestCase { assertThat(readGoods.getWorkflowEntity().getOperations()).hasSize(0); } } + + @Test + void setArrayListDoInsertInsteadUpdate() { + var attachment1 = new Attachment(); + attachment1.setName("File1"); + var attachment2 = new Attachment(); + attachment2.setName("File2"); + + var goods = new GoodsEntity(); + goods.setName("goods1"); + goods.setAttachments(List.of(attachment1, attachment2)); + + DB.save(goods); + + String goodAsJson = DB.json().toJson(goods); + var marshaledGoods = DB.json().toBean(GoodsEntity.class, goodAsJson); + var attachment3a = new Attachment(); + attachment3a.setName("File3"); + marshaledGoods.getAttachments().add(attachment3a); + + var persistedGoods = DB.find(GoodsEntity.class, goods.getId()); + + // this was not deleting orphans and so the inserts throw exception due primary key conflict + persistedGoods.setAttachments(marshaledGoods.getAttachments()); + LoggedSql.start(); + try { + logger.info("Saving goods with set new attachments list"); + DB.save(persistedGoods); + } catch (Exception e) { + logger.error("Insert instead update", e); + } + var sql = LoggedSql.collect(); + assertThat(sql.get(0)).contains("delete from attachment where goods_entity_id = ?"); + + persistedGoods = DB.find(GoodsEntity.class, goods.getId()); + + // this works good using .clear() and .addAll() + // because here we are mutating the collection, it detects the + // orphan removals occurring via the .clear() + marshaledGoods = DB.json().toBean(GoodsEntity.class, goodAsJson); + var attachment3b = new Attachment(); + attachment3b.setName("File3"); + marshaledGoods.getAttachments().add(attachment3b); + + persistedGoods.getAttachments().clear(); + persistedGoods.getAttachments().addAll(marshaledGoods.getAttachments()); + LoggedSql.collect(); + try { + logger.info("Saving goods with clear/added attachments"); + DB.save(persistedGoods); + } catch (Exception e) { + logger.error("Insert instead update", e); + } + sql = LoggedSql.stop(); + assertThat(sql.get(0)).contains("delete from attachment where id=?"); + + var persistedGoods2 = DB.find(GoodsEntity.class, goods.getId()); + assertThat(persistedGoods2.getAttachments()).hasSize(3); + } } diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java b/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java new file mode 100644 index 000000000..411695428 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java @@ -0,0 +1,16 @@ +package org.tests.o2m.dm; + +import javax.persistence.Entity; + +@Entity +public class Attachment extends HistoryColumns { + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java index ab29d5435..28482c805 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java @@ -1,8 +1,7 @@ package org.tests.o2m.dm; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import javax.persistence.*; +import java.util.List; @Entity public class GoodsEntity extends HistoryColumns { @@ -11,6 +10,9 @@ public class GoodsEntity extends HistoryColumns { @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true) private WorkflowEntity workflowEntity; + @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) + private List attachments; + public String getName() { return name; } @@ -26,4 +28,12 @@ public class GoodsEntity extends HistoryColumns { public void setWorkflowEntity(WorkflowEntity workflowEntity) { this.workflowEntity = workflowEntity; } + + public List getAttachments() { + return attachments; + } + + public void setAttachments(List attachments) { + this.attachments = attachments; + } }