From 93f13113e66c2d4c1835f0ccce2ffcb5eb875652 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Sat, 1 Aug 2015 17:51:04 +1200 Subject: [PATCH] No effective change - code cleanup - return void (unused return values) --- .../core/OnBootupClassSearchMatcher.java | 22 ------------------- .../server/deploy/BeanDescriptor.java | 4 ++-- .../server/deploy/BeanDescriptorManager.java | 12 +++++----- .../ebeaninternal/server/lib/util/Dnode.java | 3 +-- .../server/persist/dml/DmlHandler.java | 17 ++++++-------- .../persist/dmlbind/BindableRequest.java | 9 ++++---- .../ebeaninternal/server/type/DataBind.java | 4 ++-- 7 files changed, 21 insertions(+), 50 deletions(-) delete mode 100644 src/main/java/com/avaje/ebeaninternal/server/core/OnBootupClassSearchMatcher.java diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/OnBootupClassSearchMatcher.java b/src/main/java/com/avaje/ebeaninternal/server/core/OnBootupClassSearchMatcher.java deleted file mode 100644 index d003cdb88..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/core/OnBootupClassSearchMatcher.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.avaje.ebeaninternal.server.core; - -import com.avaje.ebeaninternal.server.util.ClassPathSearchMatcher; - -/** - * Matcher used for searching for Embeddable, Entity and ScalarTypes in the - * class path. - */ -public class OnBootupClassSearchMatcher implements ClassPathSearchMatcher { - - BootupClasses classes = new BootupClasses(); - - public boolean isMatch(Class cls) { - - return classes.isMatch(cls); - } - - public BootupClasses getOnBootupClasses() { - return classes; - } - -} diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java index 60a268c83..dc55a6f66 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java @@ -1057,8 +1057,8 @@ public class BeanDescriptor implements MetaBeanInfo { return namedQueries.get(name); } - public DeployNamedQuery addNamedQuery(DeployNamedQuery deployNamedQuery) { - return namedQueries.put(deployNamedQuery.getName(), deployNamedQuery); + public void addNamedQuery(DeployNamedQuery deployNamedQuery) { + namedQueries.put(deployNamedQuery.getName(), deployNamedQuery); } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java index 48e2ad87a..fb2de2201 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -1038,7 +1038,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { /** * Set the Identity generation mechanism. */ - private IdType setIdGeneration(DeployBeanDescriptor desc) { + private void setIdGeneration(DeployBeanDescriptor desc) { if (desc.propertiesId().size() == 0) { // bean doesn't have an Id property @@ -1046,7 +1046,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { // expecting an id property logger.warn(Message.msg("deploy.nouid", desc.getFullName())); } - return null; + return; } if (IdType.SEQUENCE.equals(desc.getIdType()) && !dbIdentity.isSupportsSequence()) { @@ -1069,21 +1069,21 @@ public class BeanDescriptorManager implements BeanDescriptorMap { String genName = desc.getIdGeneratorName(); if (UuidIdGenerator.AUTO_UUID.equals(genName)) { desc.setIdGenerator(uuidIdGenerator); - return IdType.GENERATOR; + return; } } if (desc.getBaseTable() == null) { // no base table so not going to set Identity // of sequence information - return null; + return; } if (IdType.IDENTITY.equals(desc.getIdType())) { // used when getGeneratedKeys is not supported (SQL Server 2000) String selectLastInsertedId = dbIdentity.getSelectLastInsertedId(desc.getBaseTable()); desc.setSelectLastInsertedId(selectLastInsertedId); - return IdType.IDENTITY; + return; } String seqName = desc.getIdGeneratorName(); @@ -1098,8 +1098,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap { // create the sequence based IdGenerator IdGenerator seqIdGen = createSequenceIdGenerator(seqName); desc.setIdGenerator(seqIdGen); - - return IdType.SEQUENCE; } private IdGenerator createSequenceIdGenerator(String seqName) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/Dnode.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/Dnode.java index 02a65852b..440e285f8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/Dnode.java +++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/Dnode.java @@ -55,7 +55,7 @@ public class Dnode { /** * Generate this node as xml to the buffer. */ - public StringBuilder generate(StringBuilder sb) { + public void generate(StringBuilder sb) { if (sb == null) { sb = new StringBuilder(); } @@ -85,7 +85,6 @@ public class Dnode { } sb.append(""); } - return sb; } /** 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 7668103f3..cc838bbd3 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 @@ -147,7 +147,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { /** * Bind a raw value. Used to bind the discriminator column. */ - public Object bind(String propName, Object value, int sqlType) throws SQLException { + public void bind(String propName, Object value, int sqlType) throws SQLException { if (logLevelSql) { if (value == null) { bindLog.append("null"); @@ -162,32 +162,30 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { bindLog.append(","); } dataBind.setObject(value, sqlType); - return value; } - public Object bindNoLog(Object value, int sqlType, String logPlaceHolder) throws SQLException { + public void bindNoLog(Object value, int sqlType, String logPlaceHolder) throws SQLException { if (logLevelSql) { bindLog.append(logPlaceHolder).append(" "); } dataBind.setObject(value, sqlType); - return value; } /** * Bind the value to the preparedStatement. */ - public Object bind(Object value, BeanProperty prop) throws SQLException { - return bindInternal(logLevelSql, value, prop); + public void bind(Object value, BeanProperty prop) throws SQLException { + bindInternal(logLevelSql, value, prop); } /** * Bind the value to the preparedStatement without logging. */ - public Object bindNoLog(Object value, BeanProperty prop) throws SQLException { - return bindInternal(false, value, prop); + public void bindNoLog(Object value, BeanProperty prop) throws SQLException { + bindInternal(false, value, prop); } - private Object bindInternal(boolean log, Object value, BeanProperty prop) throws SQLException { + private void bindInternal(boolean log, Object value, BeanProperty prop) throws SQLException { if (log) { if (prop.isLob()) { @@ -203,7 +201,6 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { } // do the actual binding to PreparedStatement prop.bind(dataBind, value); - return value; } /** 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 90bf9a0b1..f46ccb48e 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 @@ -27,23 +27,22 @@ public interface BindableRequest { * logicalType to dbType. *

*/ - Object bind(Object value, BeanProperty prop) throws SQLException; + void bind(Object value, BeanProperty prop) throws SQLException; /** * Bind a raw value. Used to bind the discriminator column. */ - Object bind(String propName, Object value, int sqlType) throws SQLException; + void bind(String propName, Object value, int sqlType) throws SQLException; /** * Bind a raw value with a placeHolder to put into the transaction log. */ - Object bindNoLog(Object value, int sqlType, String logPlaceHolder) throws SQLException; + void bindNoLog(Object value, int sqlType, String logPlaceHolder) throws SQLException; /** * Bind the value to the preparedStatement without logging. */ - Object bindNoLog(Object value, BeanProperty prop) throws SQLException; - + void bindNoLog(Object value, BeanProperty prop) throws SQLException; /** * Register the value from a update GeneratedValue. This can only be set to diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DataBind.java b/src/main/java/com/avaje/ebeaninternal/server/type/DataBind.java index aabfe38a0..dbd2a6bf9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DataBind.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/DataBind.java @@ -44,8 +44,8 @@ public class DataBind { return ++pos; } - public int decrementPos() { - return ++pos; + public void decrementPos() { + ++pos; } public int executeUpdate() throws SQLException {