diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
index ac1886693..c38f9b257 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
@@ -647,7 +647,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP
}
switch (type) {
case INSERT:
- persistExecute.executeInsertBean(this);
+ executeInsert();
return -1;
case UPDATE:
@@ -655,16 +655,16 @@ public final class PersistRequestBean extends PersistRequest implements BeanP
// store the updated properties for sending later
updatedProperties = getUpdatedProperties();
}
- persistExecute.executeUpdateBean(this);
+ executeUpdate();
return -1;
case SOFT_DELETE:
prepareForSoftDelete();
- persistExecute.executeSoftDeleteBean(this);
+ executeSoftDelete();
return -1;
case DELETE:
- return persistExecute.executeDeleteBean(this);
+ return executeDelete();
default:
throw new RuntimeException("Invalid type " + type);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersistExecute.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersistExecute.java
index 060be3afd..467cbb193 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersistExecute.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersistExecute.java
@@ -1,7 +1,6 @@
package com.avaje.ebeaninternal.server.persist;
import com.avaje.ebeaninternal.api.SpiTransaction;
-import com.avaje.ebeaninternal.server.core.PersistRequestBean;
import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql;
import com.avaje.ebeaninternal.server.core.PersistRequestOrmUpdate;
import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql;
@@ -12,7 +11,7 @@ import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql;
* Supports the use of PreparedStatement batching.
*
*/
-public final class DefaultPersistExecute implements PersistExecute {
+final class DefaultPersistExecute implements PersistExecute {
private final ExeCallableSql exeCallableSql;
@@ -28,7 +27,7 @@ public final class DefaultPersistExecute implements PersistExecute {
/**
* Construct this DmlPersistExecute.
*/
- public DefaultPersistExecute(Binder binder, int defaultBatchSize) {
+ DefaultPersistExecute(Binder binder, int defaultBatchSize) {
this.exeOrmUpdate = new ExeOrmUpdate(binder);
this.exeUpdateSql = new ExeUpdateSql(binder);
@@ -42,32 +41,6 @@ public final class DefaultPersistExecute implements PersistExecute {
return new BatchControl(t, defaultBatchSize, true);
}
- /**
- * execute the bean insert request.
- */
- public void executeInsertBean(PersistRequestBean request) {
- request.executeInsert();
- }
-
- /**
- * execute the bean update request.
- */
- public void executeUpdateBean(PersistRequestBean request) {
- request.executeUpdate();
- }
-
- /**
- * execute the bean delete request.
- */
- public int executeDeleteBean(PersistRequestBean request) {
- return request.executeDelete();
- }
-
- @Override
- public void executeSoftDeleteBean(PersistRequestBean request) {
- request.executeSoftDelete();
- }
-
/**
* Execute the updateSqlRequest
*/
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java b/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java
index b4655df6a..ddfd2d41e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java
@@ -1,7 +1,6 @@
package com.avaje.ebeaninternal.server.persist;
import com.avaje.ebeaninternal.api.SpiTransaction;
-import com.avaje.ebeaninternal.server.core.PersistRequestBean;
import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql;
import com.avaje.ebeaninternal.server.core.PersistRequestOrmUpdate;
import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql;
@@ -20,26 +19,6 @@ public interface PersistExecute {
*/
BatchControl createBatchControl(SpiTransaction t);
- /**
- * Execute a Bean insert.
- */
- void executeInsertBean(PersistRequestBean request);
-
- /**
- * Execute a Bean update.
- */
- void executeUpdateBean(PersistRequestBean request);
-
- /**
- * Execute a Bean delete.
- */
- int executeDeleteBean(PersistRequestBean request);
-
- /**
- * Execute soft delete.
- */
- void executeSoftDeleteBean(PersistRequestBean request);
-
/**
* Execute a Update.
*/