diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 1b8eea7bd..6cfd8eb42 100644 --- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -267,7 +267,6 @@ public final class DefaultPersister implements Persister { final BeanDescriptor desc; final Transaction transaction; - final BeanProperty draftDirty; final List draftUpdates = new ArrayList<>(); /** @@ -288,7 +287,6 @@ public final class DefaultPersister implements Persister { DraftHandler(BeanDescriptor desc, Transaction transaction) { this.desc = desc; this.transaction = transaction; - this.draftDirty = desc.getDraftDirty(); } /** @@ -1288,8 +1286,8 @@ public final class DefaultPersister implements Persister { return new PersistRequestBean(server, bean, parentBean, mgr, (SpiTransaction) t, persistExecute, type, flags); } - PersistRequestBean createDeleteRemoved(T bean, Transaction t, PersistRequest.Type type, int flags) { - return createDeleteRequest(bean, t, type, Flags.unsetRecurse(flags)); + PersistRequestBean createDeleteRemoved(T bean, Transaction t, int flags) { + return createDeleteRequest(bean, t, PersistRequest.Type.DELETE, Flags.unsetRecurse(flags)); } private PersistRequestBean createDeleteRequest(EntityBean bean, Transaction t, Type type) { diff --git a/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java b/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java index 0cad9918a..e086e2630 100644 --- a/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java +++ b/src/main/java/io/ebeaninternal/server/persist/DeleteIdRequest.java @@ -14,6 +14,7 @@ class DeleteIdRequest implements BeanDeleteIdRequest { DeleteIdRequest(SpiEbeanServer server, Transaction transaction, Object id) { this.server = server; this.transaction = transaction; + this.id = id; } void setId(Object id) { diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index 5acd88ba7..034a74910 100644 --- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -356,7 +356,7 @@ public class SaveManyBeans extends SaveManyBase { EntityBean eb = (EntityBean) removedBean; if (!eb._ebean_getIntercept().isNew()) { // only delete if the bean was loaded meaning that it is known to exist in the DB - persister.deleteRequest(persister.createDeleteRemoved(removedBean, transaction, PersistRequest.Type.DELETE, request.getFlags())); + persister.deleteRequest(persister.createDeleteRemoved(removedBean, transaction, request.getFlags())); } } } diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java index b7dfc8bf9..953c6ab84 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java @@ -24,10 +24,7 @@ final class DeleteMeta { private final Bindable version; private final Bindable tenantId; - private final String tableName; - DeleteMeta(BeanDescriptor desc, BindableId id, Bindable version, Bindable tenantId) { - this.tableName = desc.getBaseTable(); this.id = id; this.version = version; this.tenantId = tenantId; @@ -46,13 +43,6 @@ final class DeleteMeta { } } - /** - * Return the table name. - */ - public String getTableName() { - return tableName; - } - /** * Bind the request based on the concurrency mode. */