#115 - Mapping - Add support for @ElementCollection enhancement

Initial support - simple List.
This commit is contained in:
Rob Bygrave committed 2018-03-20 14:22:29 +13:00
1 parent c44931ea25
commit 74a9019535
79 files changed
+1891 -805

No files matched your search

@@ -29,6 +29,7 @@ import io.ebeaninternal.server.deploy.BeanManager;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
import io.ebeaninternal.server.deploy.BeanPropertySimpleCollection;
import io.ebeaninternal.server.deploy.IntersectionRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -869,8 +870,7 @@ public final class DefaultPersister implements Persister {
SpiTransaction t = request.getTransaction();
// exported ones with cascade save
BeanPropertyAssocOne<?>[] expOnes = desc.propertiesOneExportedSave();
for (BeanPropertyAssocOne<?> prop : expOnes) {
for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
// check for partial beans
if (request.isLoadedProperty(prop)) {
EntityBean detailBean = prop.getValueAsEntityBean(parentBean);
@@ -886,12 +886,11 @@ public final class DefaultPersister implements Persister {
}
// many's with cascade save
BeanPropertyAssocMany<?>[] manys = desc.propertiesManySave();
boolean insertedParent = request.isInsertedParent();
for (BeanPropertyAssocMany<?> many : manys) {
for (BeanPropertyAssocMany<?> many : desc.propertiesManySave()) {
// check that property is loaded and collection should be cascaded to
if (request.isLoadedProperty(many) && !many.isSkipSaveBeanCollection(parentBean, insertedParent)) {
saveMany(new SaveManyPropRequest(insertedParent, many, parentBean, request));
saveMany2(insertedParent, many, parentBean, request);
if (!insertedParent) {
request.addUpdatedManyProperty(many);
}
@@ -899,6 +898,18 @@ public final class DefaultPersister implements Persister {
}
}
private void saveMany2(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
saveMany(saveManyRequest(insertedParent, many, parentBean, request));
}
private SaveManyPropRequest saveManyRequest(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
if (many instanceof BeanPropertySimpleCollection) {
return new SaveManySimpleCollection(insertedParent, many, parentBean, request);
} else {
return new SaveManyPropRequest(insertedParent, many, parentBean, request);
}
}
private void saveMany(SaveManyPropRequest saveMany) {
if (saveMany.getMany().hasJoinTable()) {
@@ -1131,8 +1142,7 @@ public final class DefaultPersister implements Persister {
}
// Many's with delete cascade
BeanPropertyAssocMany<?>[] manys = desc.propertiesManyDelete();
for (BeanPropertyAssocMany<?> many : manys) {
for (BeanPropertyAssocMany<?> many : desc.propertiesManyDelete()) {
if (many.hasJoinTable()) {
if (!softDelete) {
// delete associated rows from intersection table (but not during soft delete)
@@ -21,11 +21,11 @@ import java.util.Map;
*/
class SaveManyPropRequest {
private final PersistRequestBean<?> request;
final PersistRequestBean<?> request;
private final boolean insertedParent;
private final BeanPropertyAssocMany<?> many;
private final EntityBean parentBean;
private final SpiTransaction transaction;
final BeanPropertyAssocMany<?> many;
final EntityBean parentBean;
final SpiTransaction transaction;
private final boolean cascade;
private final boolean deleteMissingChildren;
private final boolean publish;
@@ -35,8 +35,8 @@ class SaveManyPropRequest {
private final boolean isMap;
private final boolean saveRecurseSkippable;
private Collection<?> collection;
private DefaultPersister persister;
Collection<?> collection;
DefaultPersister persister;
private boolean deleteMissing;
private int sortOrder;
@@ -127,7 +127,7 @@ class SaveManyPropRequest {
}
}
private void processDetails() {
void processDetails() {
BeanProperty orderColumn = null;
boolean hasOrderColumn = many.hasOrderColumn();
@@ -0,0 +1,39 @@
package io.ebeaninternal.server.persist;
import io.ebean.SqlUpdate;
import io.ebean.bean.EntityBean;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.server.core.PersistRequestBean;
import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
class SaveManySimpleCollection extends SaveManyPropRequest {
SaveManySimpleCollection(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
super(insertedParent, many, parentBean, request);
}
@Override
void processDetails() {
Object parentId = request.getBeanId();
SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
SpiEbeanServer server = request.getServer();
server.execute(sqlDelete, transaction);
transaction.depth(+1);
String insert = many.insertElementCollection();
SqlUpdate sqlInsert = server.createSqlUpdate(insert);
for (Object value : collection) {
sqlInsert.setParameter(1, parentId);
sqlInsert.setParameter(2, value);
server.execute(sqlInsert, transaction);
}
transaction.depth(-1);
}
}