From 630ad66ff1e0c199f079a9725152f84ef05b6210 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 8 Jul 2016 15:01:39 +1200 Subject: [PATCH] #763 - Internal Code cleanup - remove redundant null checking etc --- .../ebean/config/dbplatform/H2HistoryTrigger.java | 4 ---- src/main/java/com/avaje/ebean/util/StringHelper.java | 2 +- .../autotune/service/ProfileOriginNodeUsage.java | 3 +-- .../ebeaninternal/server/deploy/DeployParser.java | 8 ++++---- .../server/deploy/id/ImportedIdEmbedded.java | 6 ++---- .../server/deploy/parse/AnnotationClass.java | 12 +++++------- .../server/persist/BatchedPstmtHolder.java | 5 ++--- .../server/querydefn/OrmQueryDetailParser.java | 3 +-- 8 files changed, 16 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/H2HistoryTrigger.java b/src/main/java/com/avaje/ebean/config/dbplatform/H2HistoryTrigger.java index 2e091dead..1eb4a459b 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/H2HistoryTrigger.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/H2HistoryTrigger.java @@ -9,9 +9,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; /** * H2 database trigger used to populate history tables to support the @History feature. @@ -54,7 +52,6 @@ public class H2HistoryTrigger implements Trigger { insertSql.append("insert into ").append(tableName).append(HISTORY_SUFFIX).append(" ("); int count = 0; - List columns = new ArrayList(); while (rs.next()) { if (++count > 1) { insertSql.append(","); @@ -66,7 +63,6 @@ public class H2HistoryTrigger implements Trigger { this.effectEndPosition = count - 1; } insertSql.append(columnName); - columns.add(columnName); } insertSql.append(") values ("); for (int i = 0; i < count; i++) { diff --git a/src/main/java/com/avaje/ebean/util/StringHelper.java b/src/main/java/com/avaje/ebean/util/StringHelper.java index fb2996eda..24fcabbfc 100644 --- a/src/main/java/com/avaje/ebean/util/StringHelper.java +++ b/src/main/java/com/avaje/ebean/util/StringHelper.java @@ -398,7 +398,7 @@ public class StringHelper { int additionalSize, int startPos, int endPos) { if (source == null) { - return source; + return null; } char match0 = match.charAt(0); diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index 2292cc31f..b61372bee 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -45,9 +45,8 @@ public class ProfileOriginNodeUsage { if (path != null) { ElPropertyValue elGetValue = rootDesc.getElGetValue(path); if (elGetValue == null) { - desc = null; logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.getName()); - + return; } else { BeanProperty beanProperty = elGetValue.getBeanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java index fc35878a7..cd3197628 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java @@ -51,14 +51,14 @@ public abstract class DeployParser { */ public abstract Set getIncludes(); - public void setEncrypted(boolean encrytped) { - this.encrypted = encrytped; - } + public void setEncrypted(boolean encrypted) { + this.encrypted = encrypted; + } public String parse(String source) { if (source == null) { - return source; + return null; } pos = -1; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index 820d99f2f..fff0d126c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -144,15 +144,13 @@ public class ImportedIdEmbedded implements ImportedId { */ public BeanProperty findMatchImport(String matchDbColumn) { - BeanProperty p = null; for (int i = 0; i < imported.length; i++) { - p = imported[i].findMatchImport(matchDbColumn); + BeanProperty p = imported[i].findMatchImport(matchDbColumn); if (p != null) { return p; } } - - return p; + return null; } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java index 33358f9e1..d1d6a1354 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java @@ -68,13 +68,11 @@ public class AnnotationClass extends AnnotationParser { if (override != null) { String propertyName = override.name(); Column column = override.column(); - if (column != null) { - DeployBeanProperty beanProperty = descriptor.getBeanProperty(propertyName); - if (beanProperty == null) { - logger.error("AttributeOverride property [" + propertyName + "] not found on " + descriptor.getFullName()); - } else { - readColumn(column, beanProperty); - } + DeployBeanProperty beanProperty = descriptor.getBeanProperty(propertyName); + if (beanProperty == null) { + logger.error("AttributeOverride property [" + propertyName + "] not found on " + descriptor.getFullName()); + } else { + readColumn(column, beanProperty); } } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java index 3bbced5ee..2f682e215 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java @@ -105,7 +105,7 @@ public class BatchedPstmtHolder { firstError = ex; errorSql = bs.getSql(); } else { - logger.error(null, ex); + logger.error("Error executing batched PreparedStatement", ex); } isError = true; @@ -113,8 +113,7 @@ public class BatchedPstmtHolder { try { bs.close(); } catch (SQLException ex) { - // error closing PreparedStatement - logger.error(null, ex); + logger.error("Error closing batched PreparedStatement", ex); } } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java index 25967fdc7..83e0c04b4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java @@ -146,11 +146,10 @@ public class OrmQueryDetailParser { } private void readSelect() { - String path = null; String props = parser.nextWord(); if (props.startsWith("(")) { props = props.substring(1, props.length() - 1); - OrmQueryProperties base = new OrmQueryProperties(path, props); + OrmQueryProperties base = new OrmQueryProperties(null, props); detail.setBase(base); parser.nextWord(); } else {