diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java index 0e2c814ac..5dee3339b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java @@ -25,6 +25,7 @@ public class DeleteHandler extends DmlHandler { /** * Generate and bind the delete statement. */ + @Override public void bind() throws SQLException { sql = meta.getSql(persistRequest); @@ -44,11 +45,13 @@ public class DeleteHandler extends DmlHandler { /** * Execute the delete non-batch. */ + @Override public void execute() throws SQLException, OptimisticLockException { int rowCount = dataBind.executeUpdate(); checkRowCount(rowCount); } + @Override public void registerDerivedRelationship(DerivedRelationshipData assocBean) { throw new RuntimeException("Never called on delete"); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java index c88cf50cb..46a913ee3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java @@ -63,6 +63,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { } } + @Override public PersistRequestBean getPersistRequest() { return persistRequest; } @@ -70,11 +71,13 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { /** * Get the sql and bind the statement. */ + @Override public abstract void bind() throws SQLException; /** * Execute now for non-batch execution. */ + @Override public abstract void execute() throws SQLException; /** @@ -95,6 +98,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { /** * Add this for batch execution. */ + @Override public void addBatch() throws SQLException { PstmtBatch pstmtBatch = persistRequest.getPstmtBatch(); if (pstmtBatch != null) { @@ -107,6 +111,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { /** * Close the underlying statement. */ + @Override public void close() { try { if (dataBind != null) { @@ -120,6 +125,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { /** * Return the bind log. */ + @Override public String getBindLog() { return bindLog == null ? "" : bindLog.toString(); } @@ -128,6 +134,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { * Set the Id value that was bound. This value is used for logging summary * level information. */ + @Override public void setIdValue(Object idValue) { persistRequest.setBoundId(idValue); } @@ -147,7 +154,8 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { /** * Bind a raw value. Used to bind the discriminator column. */ - public void bind(String propName, Object value, int sqlType) throws SQLException { + @Override + public void bind(Object value, int sqlType) throws SQLException { if (logLevelSql) { if (value == null) { bindLog.append("null"); @@ -164,6 +172,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { dataBind.setObject(value, sqlType); } + @Override public void bindNoLog(Object value, int sqlType, String logPlaceHolder) throws SQLException { if (logLevelSql) { bindLog.append(logPlaceHolder).append(" "); @@ -174,6 +183,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { /** * Bind the value to the preparedStatement. */ + @Override public void bind(Object value, BeanProperty prop) throws SQLException { bindInternal(logLevelSql, value, prop); } @@ -181,6 +191,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { /** * Bind the value to the preparedStatement without logging. */ + @Override public void bindNoLog(Object value, BeanProperty prop) throws SQLException { bindInternal(false, value, prop); } @@ -212,6 +223,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { * generation. *

*/ + @Override public void registerUpdateGenValue(BeanProperty prop, EntityBean bean, Object value) { if (updateGenValues == null) { updateGenValues = new ArrayList(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java index bf34f458a..c35acb0ef 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java @@ -61,6 +61,7 @@ public class InsertHandler extends DmlHandler { /** * Generate and bind the insert statement. */ + @Override public void bind() throws SQLException { BeanDescriptor desc = persistRequest.getBeanDescriptor(); @@ -123,6 +124,7 @@ public class InsertHandler extends DmlHandler { * Execute the insert in a normal non batch fashion. Additionally using * getGeneratedKeys if required. */ + @Override public void execute() throws SQLException, OptimisticLockException { int rc = dataBind.executeUpdate(); if (useGeneratedKeys) { @@ -225,6 +227,7 @@ public class InsertHandler extends DmlHandler { } } + @Override public void registerDerivedRelationship(DerivedRelationshipData derivedRelationship) { persistRequest.getTransaction().registerDerivedRelationship(derivedRelationship); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java index 1a5cfe9a8..3da51254f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java @@ -27,6 +27,7 @@ public class UpdateHandler extends DmlHandler { /** * Generate and bind the update statement. */ + @Override public void bind() throws SQLException { SpiUpdatePlan updatePlan = meta.getUpdatePlan(persistRequest); @@ -73,6 +74,7 @@ public class UpdateHandler extends DmlHandler { } } + @Override public void registerDerivedRelationship(DerivedRelationshipData derivedRelationship) { persistRequest.getTransaction().registerDerivedRelationship(derivedRelationship); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java index 34b2fb596..2cd2f726d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java @@ -29,17 +29,20 @@ public class BindableDiscriminator implements Bindable { return columnName + " = " + discValue; } + @Override public void addToUpdate(PersistRequestBean request, List list) { throw new PersistenceException("Never called (only for inserts)"); } + @Override public void dmlAppend(GenerateDmlRequest request) { request.appendColumn(columnName); } + @Override public void dmlBind(BindableRequest bindRequest, EntityBean bean) throws SQLException { - bindRequest.bind(columnName, discValue, sqlType); + bindRequest.bind(discValue, sqlType); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java index f46ccb48e..bc1e9c03a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java @@ -32,7 +32,7 @@ public interface BindableRequest { /** * Bind a raw value. Used to bind the discriminator column. */ - void bind(String propName, Object value, int sqlType) throws SQLException; + void bind(Object value, int sqlType) throws SQLException; /** * Bind a raw value with a placeHolder to put into the transaction log.