From d6973ed88da6d873078ac8bca304b590688fea48 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 31 Jul 2015 20:56:26 +1200 Subject: [PATCH] No effective change - code cleanup - remove unused throws exception --- .../server/core/DatabasePlatformFactory.java | 2 +- .../ebeaninternal/server/persist/Binder.java | 2 +- .../server/persist/dml/DeleteMeta.java | 2 +- .../server/persist/dml/DmlBeanPersister.java | 6 +-- .../server/persist/dml/PersistHandler.java | 46 +++++++++---------- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java index a65ba6b21..a79961e68 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java @@ -50,7 +50,7 @@ public class DatabasePlatformFactory { /** * Lookup the platform by name. */ - private DatabasePlatform byDatabaseName(String dbName) throws SQLException { + private DatabasePlatform byDatabaseName(String dbName) { dbName = dbName.toLowerCase(); if (dbName.equals("postgres") || dbName.equals("postgres9")) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java index 0bd8fc391..d02b51724 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java @@ -212,7 +212,7 @@ public class Binder { /** * Binds the value to the statement according to the data type. */ - private void bindSimpleData(DataBind b, int dataType, Object data) throws SQLException { + private void bindSimpleData(DataBind b, int dataType, Object data) { try { switch (dataType) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java index f3855e6d2..5ec7e9443 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java @@ -69,7 +69,7 @@ public final class DeleteMeta { /** * get or generate the sql based on the concurrency mode. */ - public String getSql(PersistRequestBean request) throws SQLException { + public String getSql(PersistRequestBean request) { if (id.isEmpty()) { throw new IllegalStateException("Can not deleteById on " + request.getFullName() + " as no @Id property"); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java index 87099bb63..cbef1343b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java @@ -88,11 +88,7 @@ public final class DmlBeanPersister implements BeanPersister { } finally { if (!batched && handler != null) { - try { - handler.close(); - } catch (SQLException e) { - logger.error(null, e); - } + handler.close(); } } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java index 9854b233d..0731d5351 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java @@ -6,29 +6,29 @@ import java.sql.SQLException; * Implementation API for insert update and delete handlers. */ public interface PersistHandler { - - /** - * Return the bind log. - */ - String getBindLog(); - /** - * Get the sql and bind the statement. - */ - void bind() throws SQLException; - - /** - * Add this for batch execution. - */ - void addBatch() throws SQLException; + /** + * Return the bind log. + */ + String getBindLog(); - /** - * Execute now for non-batch execution. - */ - void execute() throws SQLException; - - /** - * Close resources including underlying preparedStatement. - */ - void close() throws SQLException; + /** + * Get the sql and bind the statement. + */ + void bind() throws SQLException; + + /** + * Add this for batch execution. + */ + void addBatch() throws SQLException; + + /** + * Execute now for non-batch execution. + */ + void execute() throws SQLException; + + /** + * Close resources including underlying preparedStatement. + */ + void close(); }