diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeContext.java b/src/main/java/io/ebeaninternal/server/persist/MergeContext.java index 8de5b7ee4..d02a0944b 100644 --- a/src/main/java/io/ebeaninternal/server/persist/MergeContext.java +++ b/src/main/java/io/ebeaninternal/server/persist/MergeContext.java @@ -26,6 +26,14 @@ class MergeContext { this.clientGeneratedIds = clientGeneratedIds; } + public SpiEbeanServer getServer() { + return server; + } + + public SpiTransaction getTransaction() { + return transaction; + } + /** * Add to the list of beans to delete. */ diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java index d8bcba0ee..5c7f74876 100644 --- a/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java +++ b/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java @@ -139,7 +139,12 @@ class MergeHandler { throw new PersistenceException("merge path [" + path + "] is not a ToMany or ToOne property of " + targetDesc.getFullName()); } if (prop instanceof BeanPropertyAssocMany) { - return new MergeNodeAssocMany(fullPath, (BeanPropertyAssocMany) prop); + BeanPropertyAssocMany assocMany = (BeanPropertyAssocMany) prop; + if (assocMany.isManyToMany()) { + return new MergeNodeAssocManyToMany(fullPath, assocMany); + } else { + return new MergeNodeAssocOneToMany(fullPath, assocMany); + } } else { return new MergeNodeAssocOne(fullPath, (BeanPropertyAssocOne) prop); } diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNode.java b/src/main/java/io/ebeaninternal/server/persist/MergeNode.java index 0f7e47a48..1bcede098 100644 --- a/src/main/java/io/ebeaninternal/server/persist/MergeNode.java +++ b/src/main/java/io/ebeaninternal/server/persist/MergeNode.java @@ -6,6 +6,8 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import java.util.Collection; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; @@ -50,6 +52,22 @@ abstract class MergeNode { return null; } + /** + * Return the outline beans as a map keyed by Id values. + */ + Map toMap(Collection outlines) { + + Map outlineMap = new HashMap<>(); + if (outlines != null) { + for (Object out : outlines) { + EntityBean outlineBean = (EntityBean) out; + Object outlineId = targetDescriptor.getId(outlineBean); + outlineMap.put(outlineId, outlineBean); + } + } + return outlineMap; + } + /** * Add to the query to fetch the Ids values for the foreign keys basically. */ diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java new file mode 100644 index 000000000..043b735cc --- /dev/null +++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java @@ -0,0 +1,82 @@ +package io.ebeaninternal.server.persist; + +import io.ebean.SqlUpdate; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.IntersectionTable; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * Node for processing merge on ManyToMany properties. + */ +class MergeNodeAssocManyToMany extends MergeNode { + + private final BeanPropertyAssocMany many; + + MergeNodeAssocManyToMany(String fullPath, BeanPropertyAssocMany property) { + super(fullPath, property); + this.many = property; + } + + public void merge(MergeRequest request) { + + EntityBean parentBean = request.getBean(); + + Collection beans = many.getRawCollection(parentBean); + Collection outlines = many.getRawCollection(request.getOutline()); + + Map outlineIds = toMap(outlines); + + List additions = new ArrayList<>(); + if (beans != null) { + for (Object bean : beans) { + EntityBean entityBean = (EntityBean) bean; + Object beanId = targetDescriptor.getId(entityBean); + if (beanId != null) { + if (outlineIds.remove(beanId) == null) { + additions.add(entityBean); + } + } + } + } + + // any remaining are considered deletes + List deletions = new ArrayList<>(outlineIds.values()); + + SpiEbeanServer server = request.getServer(); + SpiTransaction transaction = request.getTransaction(); + + IntersectionTable intersectionTable = many.intersectionTable(); + + if (!deletions.isEmpty()) { + transaction.flushBatch(); + + SqlUpdate delete = intersectionTable.delete(server, false); + for (EntityBean deletion : deletions) { + many.intersectionBind(delete, parentBean, deletion); + delete.addBatch(); + } + delete.execute(); + } + + if (!additions.isEmpty()) { + transaction.flushBatch(); + + SqlUpdate insert = intersectionTable.insert(server, false); + for (EntityBean addition : additions) { + many.intersectionBind(insert, parentBean, addition); + insert.addBatch(); + } + insert.execute(); + } + + many.resetMany(parentBean); + } + +} diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java similarity index 73% rename from src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java rename to src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java index d6e1a8e8f..4c894cd0f 100644 --- a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocMany.java +++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java @@ -10,11 +10,11 @@ import java.util.Map; /** * Node for processing merge on ToMany properties. */ -class MergeNodeAssocMany extends MergeNode { +class MergeNodeAssocOneToMany extends MergeNode { private final BeanPropertyAssocMany many; - MergeNodeAssocMany(String fullPath, BeanPropertyAssocMany property) { + MergeNodeAssocOneToMany(String fullPath, BeanPropertyAssocMany property) { super(fullPath, property); this.many = property; } @@ -24,14 +24,7 @@ class MergeNodeAssocMany extends MergeNode { Collection beans = many.getRawCollection(request.getBean()); Collection outlines = many.getRawCollection(request.getOutline()); - Map outlineIds = new HashMap<>(); - if (outlines != null) { - for (Object outline : outlines) { - EntityBean outlineBean = (EntityBean) outline; - Object outlineId = targetDescriptor.getId(outlineBean); - outlineIds.put(outlineId, outlineBean); - } - } + Map outlineIds = toMap(outlines); if (beans != null) { for (Object bean : beans) { diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java b/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java index 303ccb382..1826e749e 100644 --- a/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java +++ b/src/main/java/io/ebeaninternal/server/persist/MergeRequest.java @@ -1,6 +1,8 @@ package io.ebeaninternal.server.persist; import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiTransaction; /** * Request object used for processing the merge. @@ -18,6 +20,20 @@ class MergeRequest { this.outline = outline; } + /** + * Return the associated server. + */ + SpiEbeanServer getServer() { + return context.getServer(); + } + + /** + * Return the associated transaction. + */ + public SpiTransaction getTransaction() { + return context.getTransaction(); + } + /** * Create a sub request with the given beans (to cascade the processing). */