Refactor - no effective change - remove un-required callback from PersistExecute to PersistRequestBean

This commit is contained in:
Rob Bygrave committed 2016-11-03 23:42:43 +13:00
1 parent 8c500c5836
commit a1b4af2716
3 files changed
+6 -54

No files matched your search

@@ -647,7 +647,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
}
switch (type) {
case INSERT:
persistExecute.executeInsertBean(this);
executeInsert();
return -1;
case UPDATE:
@@ -655,16 +655,16 @@ public final class PersistRequestBean<T> 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);
@@ -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.
* </p>
*/
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 <T> void executeInsertBean(PersistRequestBean<T> request) {
request.executeInsert();
}
/**
* execute the bean update request.
*/
public <T> void executeUpdateBean(PersistRequestBean<T> request) {
request.executeUpdate();
}
/**
* execute the bean delete request.
*/
public <T> int executeDeleteBean(PersistRequestBean<T> request) {
return request.executeDelete();
}
@Override
public <T> void executeSoftDeleteBean(PersistRequestBean<T> request) {
request.executeSoftDelete();
}
/**
* Execute the updateSqlRequest
*/
@@ -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.
*/
<T> void executeInsertBean(PersistRequestBean<T> request);
/**
* Execute a Bean update.
*/
<T> void executeUpdateBean(PersistRequestBean<T> request);
/**
* Execute a Bean delete.
*/
<T> int executeDeleteBean(PersistRequestBean<T> request);
/**
* Execute soft delete.
*/
<T> void executeSoftDeleteBean(PersistRequestBean<T> request);
/**
* Execute a Update.
*/