From 7f2c705b949b51524f30e743ff9b70f4426c8a7c Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 31 Jul 2015 13:42:09 +1200 Subject: [PATCH] No effective change - remove unused --- .../ebean/config/dbplatform/SqlLimiter.java | 5 ---- .../ebeaninternal/server/el/ElFilter.java | 5 ++-- .../server/el/ElMatchBuilder.java | 12 +++------ .../server/el/ElPropertyChain.java | 15 +++-------- .../ebeaninternal/server/el/ElSetValue.java | 10 ------- .../lib/util/StringParsingException.java | 15 ----------- .../server/persist/Constant.java | 27 ------------------- .../server/query/CQueryBuilder.java | 3 +-- .../server/query/CQueryBuilderRawSql.java | 2 +- .../ebeaninternal/server/query/Constants.java | 27 ------------------- 10 files changed, 12 insertions(+), 109 deletions(-) delete mode 100644 src/main/java/com/avaje/ebeaninternal/server/el/ElSetValue.java delete mode 100644 src/main/java/com/avaje/ebeaninternal/server/lib/util/StringParsingException.java delete mode 100644 src/main/java/com/avaje/ebeaninternal/server/persist/Constant.java delete mode 100644 src/main/java/com/avaje/ebeaninternal/server/query/Constants.java diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java b/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java index 22831b4ae..a5ab3944b 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java @@ -13,11 +13,6 @@ public interface SqlLimiter { */ char NEW_LINE = '\n'; - /** - * The carriage return character. - */ - char CARRIAGE_RETURN = '\r'; - /** * Add the SQL limiting statements around the query. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java index 6769a9854..6e7ec56ce 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java @@ -160,12 +160,11 @@ public final class ElFilter implements Filter { matches.add(new ElMatchBuilder.Lt(value, comparator)); return this; } - - + public Filter regex(String propertyName, String regEx) { return regex(propertyName, regEx, 0); } - + public Filter regex(String propertyName, String regEx, int options) { ElPropertyValue elGetValue = getElGetValue(propertyName); diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElMatchBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElMatchBuilder.java index 277b5153c..b0b7ffb51 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElMatchBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElMatchBuilder.java @@ -175,15 +175,11 @@ class ElMatchBuilder { public boolean isMatch(T bean) { - Object value = elGetValue.elGetValue((EntityBean)bean); - if (value == null){ - return false; - } - - return set.contains(value); - } - + Object value = elGetValue.elGetValue((EntityBean) bean); + return value != null && set.contains(value); + } } + /** * Equal To. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java index 57849026d..a081bb284 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java @@ -97,13 +97,6 @@ public class ElPropertyChain implements ElPropertyValue { return StringHelper.replaceString(el, ROOT_ELPREFIX, "${"+prefix+"}"); } } - - /** - * Full ElGetValue support. - */ - public boolean isDeployOnly() { - return false; - } /** * Return true if there is a many property from sinceProperty to @@ -262,18 +255,18 @@ public class ElPropertyChain implements ElPropertyValue { public void elSetLoaded(EntityBean bean) { - + for (int i = 0; i < last; i++) { bean = (EntityBean)chain[i].elGetValue(bean); if (bean == null){ break; } - } + } if (bean != null){ - ((EntityBean)bean)._ebean_getIntercept().setLoaded(); + bean._ebean_getIntercept().setLoaded(); } } - + public void elSetValue(EntityBean bean, Object value, boolean populate) { EntityBean prevBean = bean; diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElSetValue.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElSetValue.java deleted file mode 100644 index ebc2075a7..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElSetValue.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.avaje.ebeaninternal.server.el; - -public interface ElSetValue { - - /** - * Set the value to the bean. - */ - void elSetValue(Object bean, Object value); - -} diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringParsingException.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringParsingException.java deleted file mode 100644 index fb0a2e4c7..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringParsingException.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.avaje.ebeaninternal.server.lib.util; - - -/** - * A general string parsing exception. - */ -public class StringParsingException extends RuntimeException { - - static final long serialVersionUID = -3070423471260426402L; - - public StringParsingException(String message) { - super(message); - } -} - diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/Constant.java b/src/main/java/com/avaje/ebeaninternal/server/persist/Constant.java deleted file mode 100644 index 944bd6e4c..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/Constant.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.avaje.ebeaninternal.server.persist; - -/** - * Contants used in persist. - */ -public interface Constant { - - /** - * An INSERT clause. - */ - static final int IN_INSERT = 1; - - /** - * An UPDATE SET clause. - */ - static final int IN_UPDATE_SET = 2; - - /** - * An UPDATE WHERE clause. - */ - static final int IN_UPDATE_WHERE = 3; - - /** - * A DELETE WHERE clause. - */ - static final int IN_DELETE_WHERE = 4; -} diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java index e70a3b9e8..77ffe0fe6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java @@ -25,14 +25,13 @@ import com.avaje.ebeaninternal.server.querydefn.OrmQueryLimitRequest; import javax.persistence.PersistenceException; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; /** * Generates the SQL SELECT statements taking into account the physical * deployment properties. */ -public class CQueryBuilder implements Constants { +public class CQueryBuilder { private final String tableAliasPlaceHolder; private final String columnAliasPrefix; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilderRawSql.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilderRawSql.java index b639ca602..bc625a237 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilderRawSql.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilderRawSql.java @@ -11,7 +11,7 @@ import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.querydefn.OrmQueryLimitRequest; import com.avaje.ebeaninternal.server.util.BindParamsParser; -public class CQueryBuilderRawSql implements Constants { +public class CQueryBuilderRawSql { private final SqlLimiter sqlLimiter; private final DatabasePlatform dbPlatform; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/Constants.java b/src/main/java/com/avaje/ebeaninternal/server/query/Constants.java deleted file mode 100644 index ad743da59..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/query/Constants.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.avaje.ebeaninternal.server.query; - -/** - * Constants used in find processing. - */ -public interface Constants { - - /** - * literal used for SQL LIMIT in MySql and Postgres. - */ - static final String LIMIT = "limit"; - - /** - * Literal used for SQL LIMIT OFFSET clause in MySql and Postgres. - */ - static final String OFFSET = "offset"; - - /** - * ROW_NUMBER() OVER (ORDER BY - */ - static final String ROW_NUMBER_OVER = "row_number() over (order by "; - - /** - * ) as rn, - */ - static final String ROW_NUMBER_AS = ") as rn, "; -}