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 fa039444b..39ac47505 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java @@ -496,7 +496,7 @@ class CQueryBuilder { String idSql = desc.getIdBinderIdSql(); if (idSql.isEmpty()) { throw new IllegalStateException("Executing FindById query on entity bean " + desc.getName() - + " that doesn't have an @Id property??"); + + " that doesn't have an @Id property??"); } if (stripAlias) { // strip the table alias for use in update statement diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryDraftSupport.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryDraftSupport.java index be5a171a6..ef84db1db 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryDraftSupport.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryDraftSupport.java @@ -18,7 +18,7 @@ class CQueryDraftSupport { /** * Return the draft table associated to the base table. - * + *

* This returns null for entities that are not draftable and in that case * the usual base table is used. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java index 1c07a868e..3c95a3850 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java @@ -1,5 +1,6 @@ package com.avaje.ebeaninternal.server.query; +import com.avaje.ebean.QueryIterator; import com.avaje.ebean.ValuePair; import com.avaje.ebean.Version; import com.avaje.ebean.bean.BeanCollection; @@ -10,7 +11,6 @@ import com.avaje.ebean.config.dbplatform.DatabasePlatform; import com.avaje.ebeaninternal.api.SpiQuery; import com.avaje.ebeaninternal.server.core.DiffHelp; import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebean.QueryIterator; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.lib.util.Str; import com.avaje.ebeaninternal.server.persist.Binder; @@ -99,7 +99,7 @@ public class CQueryEngine { @SuppressWarnings("unchecked") private List findAttributeList(OrmQueryRequest request, CQueryFetchSingleAttribute rcQuery) { try { - List list = (List)rcQuery.findList(); + List list = (List) rcQuery.findList(); if (request.isLogSql()) { logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog()); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchSingleAttribute.java index 6e901c29a..997b5c12b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchSingleAttribute.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchSingleAttribute.java @@ -76,10 +76,10 @@ class CQueryFetchSingleAttribute { protected String getSummary() { StringBuilder sb = new StringBuilder(80); sb.append("FindAttr exeMicros[").append(executionTimeMicros) - .append("] rows[").append(rowCount) - .append("] type[").append(desc.getName()) - .append("] predicates[").append(predicates.getLogWhereSql()) - .append("] bind[").append(bindLog).append("]"); + .append("] rows[").append(rowCount) + .append("] type[").append(desc.getName()) + .append("] predicates[").append(predicates.getLogWhereSql()) + .append("] bind[").append(bindLog).append("]"); return sb.toString(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryHistorySupport.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryHistorySupport.java index 6a4e38437..a62ad346f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryHistorySupport.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryHistorySupport.java @@ -60,7 +60,7 @@ class CQueryHistorySupport { /** * Return the predicate appended to the end of the query. - * + *

* Note used for Oracle total recall etc with the more standard approach. */ String getAsOfPredicate(String tableAlias) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorSimple.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorSimple.java index 88dba323a..fac87a5a6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorSimple.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorSimple.java @@ -1,12 +1,11 @@ package com.avaje.ebeaninternal.server.query; -import java.sql.SQLException; - -import javax.persistence.PersistenceException; - import com.avaje.ebean.QueryIterator; import com.avaje.ebeaninternal.server.core.OrmQueryRequest; +import javax.persistence.PersistenceException; +import java.sql.SQLException; + /** * QueryIterator that does not require a buffer for secondary queries. */ @@ -44,4 +43,4 @@ class CQueryIteratorSimple implements QueryIterator { public void remove() { throw new PersistenceException("Remove not allowed"); } -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorWithBuffer.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorWithBuffer.java index 889912202..1ffdeac1c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorWithBuffer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorWithBuffer.java @@ -1,13 +1,12 @@ package com.avaje.ebeaninternal.server.query; -import java.sql.SQLException; -import java.util.ArrayList; - -import javax.persistence.PersistenceException; - import com.avaje.ebean.QueryIterator; import com.avaje.ebeaninternal.server.core.OrmQueryRequest; +import javax.persistence.PersistenceException; +import java.sql.SQLException; +import java.util.ArrayList; + /** * A QueryIterator that uses a buffer to execute secondary queries periodically. */ @@ -64,4 +63,4 @@ class CQueryIteratorWithBuffer implements QueryIterator { public void remove() { throw new PersistenceException("Remove not allowed"); } -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryOrderBy.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryOrderBy.java index 9bde80ff9..0d8be611b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryOrderBy.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryOrderBy.java @@ -1,7 +1,5 @@ package com.avaje.ebeaninternal.server.query; -import java.util.List; - import com.avaje.ebean.OrderBy; import com.avaje.ebean.OrderBy.Property; import com.avaje.ebeaninternal.api.SpiQuery; @@ -11,6 +9,8 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; import com.avaje.ebeaninternal.server.deploy.id.IdBinder; import com.avaje.ebeaninternal.server.el.ElPropertyValue; +import java.util.List; + /** * Creates the order by expression clause. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java index 7c1c86c41..e20e9c491 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java @@ -5,11 +5,11 @@ import com.avaje.ebean.config.dbplatform.SqlLimitResponse; import com.avaje.ebeaninternal.api.CQueryPlanKey; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.server.core.OrmQueryRequest; +import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.query.CQueryPlanStats.Snapshot; import com.avaje.ebeaninternal.server.type.DataBind; import com.avaje.ebeaninternal.server.type.DataReader; -import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; import com.avaje.ebeaninternal.server.type.RsetDataReader; import com.avaje.ebeaninternal.server.util.Md5; import org.slf4j.Logger; @@ -101,7 +101,7 @@ public class CQueryPlan { * Create a query plan for a raw sql query. */ CQueryPlan(OrmQueryRequest request, String sql, SqlTree sqlTree, - boolean rawSql, boolean rowNumberIncluded, String logWhereSql) { + boolean rawSql, boolean rowNumberIncluded, String logWhereSql) { this.server = request.getServer(); this.dataTimeZone = server.getDataTimeZone(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java index a46162571..36a55fcc9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java @@ -173,7 +173,7 @@ public final class CQueryPlanStats { private final List origins; Snapshot(CQueryPlan queryPlan, long count, long totalTime, long totalBeans, long maxTime, long startTime, long lastQueryTime, - List origins) { + List origins) { this.queryPlan = queryPlan; this.count = count; @@ -187,7 +187,7 @@ public final class CQueryPlanStats { public String toString() { return queryPlan + " count:" + count + " time:" + totalTime + " maxTime:" + maxTime + " beans:" + totalBeans - + " start:" + startTime + " lastQuery:" + lastQueryTime + " origins:" + origins; + + " start:" + startTime + " lastQuery:" + lastQueryTime + " origins:" + origins; } @Override @@ -257,4 +257,4 @@ public final class CQueryPlanStats { } -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java index 00f3b1703..dcd59eaa3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java @@ -114,7 +114,7 @@ public class CQueryPredicates { this.idValue = query.getId(); } - public String bind(PreparedStatement stmt, Connection connection) throws SQLException { + public String bind(PreparedStatement stmt, Connection connection) throws SQLException { return bind(binder.dataBind(stmt, connection)); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java index 58d2a3b75..e3011c17c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java @@ -70,10 +70,10 @@ class CQueryRowCount { //noinspection StringBufferReplaceableByString StringBuilder sb = new StringBuilder(80); sb.append("FindRowCount exeMicros[").append(executionTimeMicros) - .append("] rows[").append(rowCount) - .append("] type[").append(desc.getFullName()) - .append("] predicates[").append(predicates.getLogWhereSql()) - .append("] bind[").append(bindLog).append("]"); + .append("] rows[").append(rowCount) + .append("] type[").append(desc.getFullName()) + .append("] predicates[").append(predicates.getLogWhereSql()) + .append("] bind[").append(bindLog).append("]"); return sb.toString(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryUpdate.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryUpdate.java index 91b757d35..fb1abb580 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryUpdate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryUpdate.java @@ -62,10 +62,10 @@ class CQueryUpdate { public String getSummary() { StringBuilder sb = new StringBuilder(80); sb.append(type).append(" exeMicros[").append(executionTimeMicros) - .append("] rows[").append(rowCount) - .append("] type[").append(desc.getName()) - .append("] predicates[").append(predicates.getLogWhereSql()) - .append("] bind[").append(bindLog).append("]"); + .append("] rows[").append(rowCount) + .append("] type[").append(desc.getName()) + .append("] predicates[").append(predicates.getLogWhereSql()) + .append("] bind[").append(bindLog).append("]"); return sb.toString(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryIds.java b/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryIds.java index cfd1a7aa6..d8a6aec89 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryIds.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryIds.java @@ -1,12 +1,12 @@ package com.avaje.ebeaninternal.server.query; -import java.util.List; -import java.util.concurrent.Callable; - import com.avaje.ebean.Transaction; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.api.SpiQuery; +import java.util.List; +import java.util.concurrent.Callable; + /** * Represent the fetch Id's query as a Callable. * diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryList.java b/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryList.java index 8a1ed154e..352c63e8e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryList.java @@ -1,12 +1,12 @@ package com.avaje.ebeaninternal.server.query; -import java.util.List; -import java.util.concurrent.Callable; - import com.avaje.ebean.Transaction; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.api.SpiQuery; +import java.util.List; +import java.util.concurrent.Callable; + /** * Represent the findList query as a Callable. * diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryRowCount.java b/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryRowCount.java index 0eeeb105f..d583675da 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryRowCount.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryRowCount.java @@ -1,11 +1,11 @@ package com.avaje.ebeaninternal.server.query; -import java.util.concurrent.Callable; - import com.avaje.ebean.Transaction; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.api.SpiQuery; +import java.util.concurrent.Callable; + /** * Represent the findRowCount query as a Callable. * diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java index 5896f6165..e1af25150 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java @@ -55,7 +55,7 @@ class DefaultDbSqlContext implements DbSqlContext { * Construct for SELECT clause (with column alias settings). */ DefaultDbSqlContext(SqlTreeAlias alias, String tableAliasPlaceHolder, - String columnAliasPrefix, boolean alwaysUseColumnAlias, CQueryHistorySupport historySupport, CQueryDraftSupport draftSupport) { + String columnAliasPrefix, boolean alwaysUseColumnAlias, CQueryHistorySupport historySupport, CQueryDraftSupport draftSupport) { this.alias = alias; this.tableAliasPlaceHolder = tableAliasPlaceHolder; @@ -136,15 +136,15 @@ class DefaultDbSqlContext implements DbSqlContext { if (i > 0) { sb.append(" and "); } - + if (pair.getForeignSqlFormula() != null) { sb.append(StringHelper.replaceString(pair.getForeignSqlFormula(), tableAliasPlaceHolder, a2)); } else { sb.append(a2).append(".").append(pair.getForeignDbColumn()); } - + sb.append(" = "); - + if (pair.getLocalSqlFormula() != null) { sb.append(StringHelper.replaceString(pair.getLocalSqlFormula(), tableAliasPlaceHolder, a1)); } else { @@ -251,11 +251,11 @@ class DefaultDbSqlContext implements DbSqlContext { String tableAlias = tableAliasStack.peek(); String converted = StringHelper.replaceString(sqlFormulaSelect, tableAliasPlaceHolder, - tableAlias); + tableAlias); sb.append(COMMA); sb.append(converted); - + appendColumnAlias(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java index ee4024ee7..0cb102c09 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java @@ -1,5 +1,9 @@ package com.avaje.ebeaninternal.server.query; +import com.avaje.ebean.SqlQuery; +import com.avaje.ebean.SqlRow; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; + import java.math.BigDecimal; import java.sql.Date; import java.sql.Timestamp; @@ -10,10 +14,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; - /** * Used to return raw SQL query results. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java b/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java index 301fc884f..6dc4e9232 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java @@ -1,15 +1,14 @@ package com.avaje.ebeaninternal.server.query; -import java.util.List; -import java.util.concurrent.Future; - -import javax.persistence.PersistenceException; - import com.avaje.ebean.EbeanServer; import com.avaje.ebean.PagedList; import com.avaje.ebeaninternal.api.Monitor; import com.avaje.ebeaninternal.api.SpiQuery; +import javax.persistence.PersistenceException; +import java.util.List; +import java.util.concurrent.Future; + /** * PagedList implementation based on limit offset types of queries. * diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureList.java b/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureList.java index 73dc46a65..7f68a84c6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureList.java @@ -1,16 +1,15 @@ package com.avaje.ebeaninternal.server.query; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.FutureTask; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - import com.avaje.ebean.FutureList; import com.avaje.ebean.Query; import com.avaje.ebean.Transaction; import javax.persistence.PersistenceException; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.FutureTask; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; /** * Default implementation for FutureList. diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureRowCount.java b/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureRowCount.java index a19626bc1..f5202883d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureRowCount.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureRowCount.java @@ -1,11 +1,11 @@ package com.avaje.ebeaninternal.server.query; -import java.util.concurrent.FutureTask; - import com.avaje.ebean.FutureRowCount; import com.avaje.ebean.Query; import com.avaje.ebean.Transaction; +import java.util.concurrent.FutureTask; + /** * Future implementation for the row count query. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlBeanLoad.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlBeanLoad.java index c61077d6c..546dbf4c8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlBeanLoad.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlBeanLoad.java @@ -58,8 +58,8 @@ public class SqlBeanLoad { } if ((bean == null) - || (lazyLoading && ebi.isLoadedProperty(prop.getPropertyIndex())) - || (type != null && !prop.isAssignableFrom(type))) { + || (lazyLoading && ebi.isLoadedProperty(prop.getPropertyIndex())) + || (type != null && !prop.isAssignableFrom(type))) { // ignore this property // ... null: bean already in persistence context diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTree.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTree.java index 97d64134f..ac9c4f867 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTree.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTree.java @@ -49,7 +49,7 @@ class SqlTree { * Create the SqlSelectClause. */ SqlTree(String summary, SqlTreeNode rootNode, String selectSql, String fromSql, String groupBy, String inheritanceWhereSql, - BeanProperty[] encryptedProps, BeanPropertyAssocMany manyProperty, Set includes, boolean includeJoins) { + BeanProperty[] encryptedProps, BeanPropertyAssocMany manyProperty, Set includes, boolean includeJoins) { this.summary = summary; this.rootNode = rootNode; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java index f727c2987..6e7b7e660 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java @@ -142,7 +142,7 @@ public class SqlTreeBuilder { boolean includeJoins = alias != null && alias.isIncludeJoins(); return new SqlTree(summary.toString(), rootNode, selectSql, fromSql, groupBy, inheritanceWhereSql, encryptedProps, - manyProperty, queryDetail.getFetchPaths(), includeJoins); + manyProperty, queryDetail.getFetchPaths(), includeJoins); } private String buildSelectClause() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java index b5c2b1332..bfd69c980 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -89,7 +89,7 @@ class SqlTreeNodeBean implements SqlTreeNode { * Construct for leaf node. */ SqlTreeNodeBean(String prefix, BeanPropertyAssoc beanProp, SqlTreeProperties props, - List myChildren, boolean disableLazyLoad) { + List myChildren, boolean disableLazyLoad) { this(prefix, beanProp, beanProp.getTargetDescriptor(), props, myChildren, true, null, SpiQuery.TemporalMode.CURRENT, disableLazyLoad); } @@ -98,7 +98,7 @@ class SqlTreeNodeBean implements SqlTreeNode { * Construct for root node. */ SqlTreeNodeBean(BeanDescriptor desc, SqlTreeProperties props, List myList, boolean withId, - BeanPropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) { + BeanPropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) { this(null, null, desc, props, myList, withId, many, temporalMode, disableLazyLoad); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java index 560709d35..d75fbb140 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java @@ -19,7 +19,7 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean { * Specify for SqlSelect to include an Id property or not. */ SqlTreeNodeRoot(BeanDescriptor desc, SqlTreeProperties props, List myList, boolean withId, - TableJoin includeJoin, BeanPropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) { + TableJoin includeJoin, BeanPropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) { super(desc, props, myList, withId, many, temporalMode, disableLazyLoad); this.includeJoin = includeJoin; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java index c6c407541..e674f3146 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java @@ -82,7 +82,7 @@ public class SqlTreeProperties { aggregation = true; manyWhereJoins.addAggregationJoin(joinProperty); return false; - } else{ + } else { return manyWhereJoins.requireSqlDistinct(); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 95516ee4a..9a32050f1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -1,7 +1,24 @@ package com.avaje.ebeaninternal.server.querydefn; -import com.avaje.ebean.*; +import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.Expression; +import com.avaje.ebean.ExpressionFactory; +import com.avaje.ebean.ExpressionList; +import com.avaje.ebean.FetchConfig; +import com.avaje.ebean.FetchPath; +import com.avaje.ebean.FutureIds; +import com.avaje.ebean.FutureList; +import com.avaje.ebean.FutureRowCount; +import com.avaje.ebean.OrderBy; import com.avaje.ebean.OrderBy.Property; +import com.avaje.ebean.PagedList; +import com.avaje.ebean.PersistenceContextScope; +import com.avaje.ebean.Query; +import com.avaje.ebean.QueryEachConsumer; +import com.avaje.ebean.QueryEachWhileConsumer; +import com.avaje.ebean.QueryIterator; +import com.avaje.ebean.RawSql; +import com.avaje.ebean.Version; import com.avaje.ebean.bean.CallStack; import com.avaje.ebean.bean.ObjectGraphNode; import com.avaje.ebean.bean.ObjectGraphOrigin; @@ -135,7 +152,7 @@ public class DefaultOrmQuery implements SpiQuery { */ private Object id; - private Map namedParams; + private Map namedParams; /** * Bind parameters when using the query language. @@ -874,9 +891,9 @@ public class DefaultOrmQuery implements SpiQuery { CQueryPlanKey createQueryPlanKey() { queryPlanKey = new OrmQueryPlanKey(m2mIncludeJoin, type, detail, maxRows, firstRow, - disableLazyLoading, orderBy, - distinct, sqlDistinct, mapKey, id, bindParams, whereExpressions, havingExpressions, - temporalMode, forUpdate, rootTableAlias, rawSql, updateProperties); + disableLazyLoading, orderBy, + distinct, sqlDistinct, mapKey, id, bindParams, whereExpressions, havingExpressions, + temporalMode, forUpdate, rootTableAlias, rawSql, updateProperties); return queryPlanKey; } @@ -985,7 +1002,7 @@ public class DefaultOrmQuery implements SpiQuery { public boolean isExcludeBeanCache() { // not using L2 cache for asDraft() query - return excludeBeanCache || isAsDraft() ; + return excludeBeanCache || isAsDraft(); } @Override @@ -1152,7 +1169,7 @@ public class DefaultOrmQuery implements SpiQuery { @Override @SuppressWarnings("unchecked") public List findSingleAttributeList() { - return (List)server.findSingleAttributeList(this, null); + return (List) server.findSingleAttributeList(this, null); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmUpdate.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmUpdate.java index 8b0a65a51..3939c9a87 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmUpdate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmUpdate.java @@ -1,11 +1,11 @@ package com.avaje.ebeaninternal.server.querydefn; -import java.io.Serializable; - import com.avaje.ebean.EbeanServer; import com.avaje.ebeaninternal.api.BindParams; import com.avaje.ebeaninternal.api.SpiUpdate; +import java.io.Serializable; + /** * Default implementation of OrmUpdate. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/ONamedParam.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/ONamedParam.java index 004aea830..261361da3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/ONamedParam.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/ONamedParam.java @@ -39,7 +39,7 @@ class ONamedParam implements SpiNamedParam { */ void checkValueSet() { if (value == null) { - throw new PersistenceException("Named parameter ["+name+"] has not had it's value set."); + throw new PersistenceException("Named parameter [" + name + "] has not had it's value set."); } } } 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 234bfe5ef..b9706d23a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -379,8 +379,8 @@ public class OrmQueryDetail implements Serializable { */ private boolean isQueryJoinCandidate(String lazyLoadManyPath, OrmQueryProperties chunk) { return chunk.isFetchJoin() - && !isLazyLoadManyRoot(lazyLoadManyPath, chunk) - && !hasParentSecJoin(lazyLoadManyPath, chunk); + && !isLazyLoadManyRoot(lazyLoadManyPath, chunk) + && !hasParentSecJoin(lazyLoadManyPath, chunk); } /** 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 a84cfad46..5fa81c4d8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java @@ -51,7 +51,7 @@ public class OrmQueryDetailParser { detail.fetch(readFindFetch()); } else { throw new PersistenceException("Query expected 'fetch', 'where','order by' or 'limit' keyword but got [" - + parser.getWord() + "] \r " + parser.getOql()); + + parser.getWord() + "] \r " + parser.getOql()); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKey.java index be40243d1..10e2fae98 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKey.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKey.java @@ -118,11 +118,14 @@ class OrmQueryPlanKey implements CQueryPlanKey { if (hasIdValue != that.hasIdValue) return false; if (type != that.type) return false; if (temporalMode != that.temporalMode) return false; - if (m2mIncludeTable != null ? !m2mIncludeTable.equals(that.m2mIncludeTable) : that.m2mIncludeTable != null) return false; - if (orderByAsSting != null ? !orderByAsSting.equals(that.orderByAsSting) : that.orderByAsSting != null) return false; + if (m2mIncludeTable != null ? !m2mIncludeTable.equals(that.m2mIncludeTable) : that.m2mIncludeTable != null) + return false; + if (orderByAsSting != null ? !orderByAsSting.equals(that.orderByAsSting) : that.orderByAsSting != null) + return false; if (where != null ? !where.isSameByPlan(that.where) : that.where != null) return false; if (having != null ? !having.isSameByPlan(that.having) : that.having != null) return false; - if (updateProperties != null ? !updateProperties.isSameByPlan(that.updateProperties) : that.updateProperties != null) return false; + if (updateProperties != null ? !updateProperties.isSameByPlan(that.updateProperties) : that.updateProperties != null) + return false; if (rawSqlKey != null ? !rawSqlKey.equals(that.rawSqlKey) : that.rawSqlKey != null) return false; if (mapKey != null ? !mapKey.equals(that.mapKey) : that.mapKey != null) return false; return rootTableAlias != null ? rootTableAlias.equals(that.rootTableAlias) : that.rootTableAlias == null; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java index 6be8be81d..31eb2555a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java @@ -61,7 +61,7 @@ class OrmQueryPropertiesParser { private int queryFetchBatch = -1; private int lazyFetchBatch = -1; - private OrmQueryPropertiesParser(String inputProperties) { + private OrmQueryPropertiesParser(String inputProperties) { this.inputProperties = inputProperties; } @@ -148,7 +148,7 @@ class OrmQueryPropertiesParser { return propertySet; } - private int parseBatchHint( int pos, String option) { + private int parseBatchHint(int pos, String option) { int startPos = pos + option.length(); int endPos = findEndPos(startPos, inputProperties); diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmUpdateProperties.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmUpdateProperties.java index cb5ebaaa8..08ff01d7f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmUpdateProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmUpdateProperties.java @@ -151,7 +151,7 @@ public class OrmUpdateProperties { */ public boolean isSameByPlan(OrmUpdateProperties that) { return that.values.size() == values.size() - && logicalSetClause().equals(that.logicalSetClause()); + && logicalSetClause().equals(that.logicalSetClause()); } /**