mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-17 22:56:28 +00:00
#115 - Mapping - Add support for @ElementCollection enhancement
Add embedded bean support
This commit is contained in:
1 parent
cca837bcfa
commit
57870aaa05
30 files changed
+1247
-243
No files matched your search
@@ -906,10 +906,10 @@ public final class DefaultPersister implements Persister {
|
||||
return new SaveManyBeans(insertedParent, many, parentBean, request, this);
|
||||
|
||||
} else if (many.getManyType().isMap()) {
|
||||
return new SaveManySimpleMap(insertedParent, many, parentBean, request);
|
||||
return new SaveManyElementCollectionMap(insertedParent, many, parentBean, request);
|
||||
|
||||
} else {
|
||||
return new SaveManySimpleCollection(insertedParent, many, parentBean, request);
|
||||
return new SaveManyElementCollection(insertedParent, many, parentBean, request);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package io.ebeaninternal.server.persist;
|
||||
|
||||
import io.ebean.bean.BeanCollection;
|
||||
import io.ebean.bean.EntityBean;
|
||||
import io.ebeaninternal.api.SpiEbeanServer;
|
||||
import io.ebeaninternal.api.SpiTransaction;
|
||||
@@ -34,4 +35,17 @@ abstract class SaveManyBase {
|
||||
*/
|
||||
abstract void save();
|
||||
|
||||
void resetModifyState() {
|
||||
if (value instanceof BeanCollection<?>) {
|
||||
modifyListenReset((BeanCollection<?>) value);
|
||||
}
|
||||
}
|
||||
|
||||
void modifyListenReset(BeanCollection<?> c) {
|
||||
if (insertedParent) {
|
||||
// after insert set the modify listening mode for private owned etc
|
||||
c.setModifyListening(many.getModifyListenMode());
|
||||
}
|
||||
c.modifyReset();
|
||||
}
|
||||
}
|
||||
@@ -89,20 +89,6 @@ class SaveManyBeans extends SaveManyBase {
|
||||
return BeanCollection.ModifyListenMode.REMOVALS == many.getModifyListenMode();
|
||||
}
|
||||
|
||||
private void modifyListenReset(BeanCollection<?> c) {
|
||||
if (insertedParent) {
|
||||
// after insert set the modify listening mode for private owned etc
|
||||
c.setModifyListening(many.getModifyListenMode());
|
||||
}
|
||||
c.modifyReset();
|
||||
}
|
||||
|
||||
private void resetModifyState() {
|
||||
if (value instanceof BeanCollection<?>) {
|
||||
modifyListenReset((BeanCollection<?>) value);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Save the details from a OneToMany collection.
|
||||
*/
|
||||
|
||||
+11
-8
@@ -12,9 +12,9 @@ import java.util.Collection;
|
||||
/**
|
||||
* Save details for a simple scalar element collection.
|
||||
*/
|
||||
class SaveManySimpleCollection extends SaveManyBase {
|
||||
class SaveManyElementCollection extends SaveManyBase {
|
||||
|
||||
SaveManySimpleCollection(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
|
||||
SaveManyElementCollection(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
|
||||
super(insertedParent, many, parentBean, request);
|
||||
}
|
||||
|
||||
@@ -22,16 +22,18 @@ class SaveManySimpleCollection extends SaveManyBase {
|
||||
void save() {
|
||||
|
||||
Collection<?> collection = BeanCollectionUtil.getActualEntries(value);
|
||||
if (collection == null) {
|
||||
if (collection == null || !BeanCollectionUtil.isModified(value)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Object parentId = request.getBeanId();
|
||||
|
||||
SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
|
||||
|
||||
SpiEbeanServer server = request.getServer();
|
||||
server.execute(sqlDelete, transaction);
|
||||
|
||||
if (!insertedParent) {
|
||||
SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
|
||||
server.execute(sqlDelete, transaction);
|
||||
}
|
||||
|
||||
transaction.depth(+1);
|
||||
|
||||
@@ -40,11 +42,12 @@ class SaveManySimpleCollection extends SaveManyBase {
|
||||
|
||||
for (Object value : collection) {
|
||||
|
||||
sqlInsert.setParameter(1, parentId);
|
||||
sqlInsert.setParameter(2, value);
|
||||
sqlInsert.setNextParameter(parentId);
|
||||
many.bindElementValue(sqlInsert, value);
|
||||
server.execute(sqlInsert, transaction);
|
||||
}
|
||||
|
||||
transaction.depth(-1);
|
||||
resetModifyState();
|
||||
}
|
||||
}
|
||||
+13
-10
@@ -13,9 +13,9 @@ import java.util.Set;
|
||||
/**
|
||||
* Save details for a simple scalar map element collection.
|
||||
*/
|
||||
class SaveManySimpleMap extends SaveManyBase {
|
||||
class SaveManyElementCollectionMap extends SaveManyBase {
|
||||
|
||||
SaveManySimpleMap(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
|
||||
SaveManyElementCollectionMap(boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
|
||||
super(insertedParent, many, parentBean, request);
|
||||
}
|
||||
|
||||
@@ -23,17 +23,19 @@ class SaveManySimpleMap extends SaveManyBase {
|
||||
@Override
|
||||
void save() {
|
||||
|
||||
Set<Map.Entry<?, ?>> entries = (Set<Map.Entry<?, ?>>)BeanCollectionUtil.getActualEntries(value);
|
||||
if (entries == null) {
|
||||
Set<Map.Entry<?, ?>> entries = (Set<Map.Entry<?, ?>>) BeanCollectionUtil.getActualEntries(value);
|
||||
if (entries == null || !BeanCollectionUtil.isModified(value)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Object parentId = request.getBeanId();
|
||||
|
||||
SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
|
||||
|
||||
SpiEbeanServer server = request.getServer();
|
||||
server.execute(sqlDelete, transaction);
|
||||
|
||||
if (!insertedParent) {
|
||||
SqlUpdate sqlDelete = many.deleteByParentId(parentId, null);
|
||||
server.execute(sqlDelete, transaction);
|
||||
}
|
||||
|
||||
transaction.depth(+1);
|
||||
|
||||
@@ -41,12 +43,13 @@ class SaveManySimpleMap extends SaveManyBase {
|
||||
SqlUpdate sqlInsert = server.createSqlUpdate(insert);
|
||||
|
||||
for (Map.Entry<?, ?> entry : entries) {
|
||||
sqlInsert.setParameter(1, parentId);
|
||||
sqlInsert.setParameter(2, entry.getKey());
|
||||
sqlInsert.setParameter(3, entry.getValue());
|
||||
sqlInsert.setNextParameter(parentId);
|
||||
sqlInsert.setNextParameter(entry.getKey());
|
||||
many.bindElementValue(sqlInsert, entry.getValue());
|
||||
server.execute(sqlInsert, transaction);
|
||||
}
|
||||
|
||||
transaction.depth(-1);
|
||||
resetModifyState();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user