From 53cf6c162ca0dc2bb2a8b9bab7fbd4bf896435dc Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 31 Jul 2015 14:51:34 +1200 Subject: [PATCH] No effective change - code cleanup - simplify if --- .../java/com/avaje/ebean/DRawSqlParser.java | 11 +-------- .../server/autofetch/TunedQueryInfo.java | 7 ++---- .../server/deploy/DRawSqlSelectBuilder.java | 23 +++++-------------- .../deploy/DRawSqlSelectColumnsParser.java | 5 +--- .../server/deploy/DeployParser.java | 10 ++------ .../ebeaninternal/server/persist/DmlUtil.java | 14 +++-------- .../server/querydefn/OrmQueryDetail.java | 6 +---- .../server/querydefn/SimpleTextParser.java | 12 +--------- 8 files changed, 17 insertions(+), 71 deletions(-) diff --git a/src/main/java/com/avaje/ebean/DRawSqlParser.java b/src/main/java/com/avaje/ebean/DRawSqlParser.java index 7a537836b..4c4729b01 100644 --- a/src/main/java/com/avaje/ebean/DRawSqlParser.java +++ b/src/main/java/com/avaje/ebean/DRawSqlParser.java @@ -98,16 +98,7 @@ class DRawSqlParser { } private boolean hasPlaceHolders() { - if (placeHolderWhere > -1) { - return true; - } - if (placeHolderAndWhere > -1) { - return true; - } - if (placeHolderHaving > -1) { - return true; - } - return placeHolderAndHaving > -1; + return placeHolderWhere > -1 || placeHolderAndWhere > -1 || placeHolderHaving > -1 || placeHolderAndHaving > -1; } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java index a6ed7e675..93f12ea54 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java @@ -94,11 +94,8 @@ public class TunedQueryInfo implements Serializable { * Return true if the fetches are essentially the same. */ public boolean isSame(OrmQueryDetail newQueryDetail) { - if (tunedDetail == null) { - return false; - } - return tunedDetail.isAutoFetchEqual(newQueryDetail); - } + return tunedDetail != null && tunedDetail.isAutoFetchEqual(newQueryDetail); + } /** * Tune the query by replacing its OrmQueryDetail with a tuned one. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java index 9e0f1e55f..1490a400c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java @@ -90,13 +90,11 @@ public class DRawSqlSelectBuilder { debug("Parsing sql-select in " + getErrName()); } - if (hasPlaceHolders()) { - - } else { - // parse the sql for the keywords... - // select, from, where, having, group by, order by - parseSqlFindKeywords(true); - } + if (!hasPlaceHolders()) { + // parse the sql for the keywords... + // select, from, where, having, group by, order by + parseSqlFindKeywords(true); + } List selectColumns = findSelectColumns(meta.getColumnMapping()); whereExprPos = findWhereExprPosition(); @@ -140,16 +138,7 @@ public class DRawSqlSelectBuilder { } private boolean hasPlaceHolders() { - if (placeHolderWhere > -1) { - return true; - } - if (placeHolderAndWhere > -1) { - return true; - } - if (placeHolderHaving > -1) { - return true; - } - return placeHolderAndHaving > -1; + return placeHolderWhere > -1 || placeHolderAndWhere > -1 || placeHolderHaving > -1 || placeHolderAndHaving > -1; } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java index 7e118b07c..838b22f9e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java @@ -212,10 +212,7 @@ public final class DRawSqlSelectColumnsParser { } private boolean isMatch(BeanProperty prop, String columnLabel) { - if (columnLabel.equalsIgnoreCase(prop.getDbColumn())) { - return true; - } - return columnLabel.equalsIgnoreCase(prop.getName()); + return columnLabel.equalsIgnoreCase(prop.getDbColumn()) || columnLabel.equalsIgnoreCase(prop.getName()); } private int nextComma() { 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 a4b974557..fc35878a7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java @@ -161,14 +161,8 @@ public abstract class DeployParser { * return true if the char is a letter, digit or underscore. */ private boolean isWordPart(char ch) { - if (Character.isLetterOrDigit(ch)) { - return true; - - } else if (ch == UNDERSCORE) { - return true; - - } else return ch == PERIOD; - } + return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD; + } private boolean isWordStart(char ch) { return Character.isLetter(ch); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DmlUtil.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DmlUtil.java index 644fb9904..c1b74091b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DmlUtil.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/DmlUtil.java @@ -9,15 +9,7 @@ public class DmlUtil { /** * Return true if the value is null or a Numeric 0 (for primitive int's and long's) or Option empty. */ - public static boolean isNullOrZero(Object value){ - if (value == null){ - return true; - } - - if (value instanceof Number){ - return ((Number)value).longValue() == 0l; - } - - return false; - } + public static boolean isNullOrZero(Object value) { + return value == null || value instanceof Number && ((Number) value).longValue() == 0l; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java index f5570ea34..49add2bf9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -127,11 +127,7 @@ public class OrmQueryDetail implements Serializable { } public boolean containsProperty(String property) { - if (baseProps == null) { - return true; - } else { - return baseProps.isIncluded(property); - } + return baseProps == null || baseProps.isIncluded(property); } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/SimpleTextParser.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/SimpleTextParser.java index c5bd7d042..4d0ac8f99 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/SimpleTextParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/SimpleTextParser.java @@ -135,17 +135,7 @@ public class SimpleTextParser { } private boolean isWordTerminator(char c, boolean isOperator) { - if (Character.isWhitespace(c)) { - return true; - } - if (isOperator(c)) { - return !isOperator; - } - if (c == '(') { - return true; - } - - return isOperator; + return Character.isWhitespace(c) || (isOperator(c) ? !isOperator : c == '(' || isOperator); } private boolean isOperator(char c) {