#779 - Refactor - Tidy internals of DefaultOrmQuery, remove unused String query property.

src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java

@@ -552,12 +552,6 @@ public interface SpiQuery<T> extends Query<T> {
    */
   BindParams getBindParams();
 
-  /**
-   * Get the orm query as a String. Only available if the query was built from
-   * a string.
-   */
-  String getQuery();
-
   /**
    * Replace the query detail. This is used by the AutoTune feature to as a
    * fast way to set the query properties and joins.

src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -94,11 +94,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private String generatedSql;
 
-  /**
-   * Query language version of the query.
-   */
-  private String query;
-
   private String lazyLoadProperty;
 
   private String lazyLoadManyPath;
@@ -569,7 +564,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     copy.includeTableJoin = includeTableJoin;
     copy.profilingListener = profilingListener;
 
-    copy.query = query;
+//    copy.query = query;
     copy.rootTableAlias = rootTableAlias;
     copy.distinct = distinct;
     copy.sqlDistinct = sqlDistinct;
@@ -842,7 +837,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
   CQueryPlanKey createQueryPlanKey() {
 
     queryPlanKey = new OrmQueryPlanKey(includeTableJoin, type, detail, maxRows, firstRow,
-        disableLazyLoading, orderBy, query,
+        disableLazyLoading, orderBy,
         distinct, sqlDistinct, mapKey, id, bindParams, whereExpressions, havingExpressions,
         temporalMode, forUpdate, rootTableAlias, rawSql, updateProperties);
 
@@ -1322,11 +1317,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return bindParams;
   }
 
-  @Override
-  public String getQuery() {
-    return query;
-  }
-
   @Override
   public DefaultOrmQuery<T> where(Expression expression) {
     where().add(expression);

src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKey.java

@@ -25,7 +25,6 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
   private final int maxRows;
   private final int firstRow;
   private final boolean disableLazyLoading;
-  private final String query;
   private final boolean distinct;
   private final boolean sqlDistinct;
   private final String mapKey;
@@ -37,7 +36,7 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
   private final int planHash;
   private final int bindCount;
 
-  public OrmQueryPlanKey(TableJoin includeTableJoin, SpiQuery.Type type, OrmQueryDetail detail, int maxRows, int firstRow, boolean disableLazyLoading, OrderBy<?> orderBy, String query, boolean distinct, boolean sqlDistinct, String mapKey, Object id, BindParams bindParams, SpiExpression whereExpressions, SpiExpression havingExpressions, SpiQuery.TemporalMode temporalMode, boolean forUpdate, String rootTableAlias, RawSql rawSql, OrmUpdateProperties updateProperties) {
+  public OrmQueryPlanKey(TableJoin includeTableJoin, SpiQuery.Type type, OrmQueryDetail detail, int maxRows, int firstRow, boolean disableLazyLoading, OrderBy<?> orderBy, boolean distinct, boolean sqlDistinct, String mapKey, Object id, BindParams bindParams, SpiExpression whereExpressions, SpiExpression havingExpressions, SpiQuery.TemporalMode temporalMode, boolean forUpdate, String rootTableAlias, RawSql rawSql, OrmUpdateProperties updateProperties) {
 
     this.includeTableJoin = includeTableJoin;
     this.type = type;
@@ -46,7 +45,6 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
     this.firstRow = firstRow;
     this.disableLazyLoading = disableLazyLoading;
     this.orderByAsSting = (orderBy == null) ? null : orderBy.toStringFormat();
-    this.query = query;
     this.distinct = distinct;
     this.sqlDistinct = sqlDistinct;
     this.mapKey = mapKey;
@@ -63,7 +61,7 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
     HashQueryPlanBuilder builder = new HashQueryPlanBuilder();
 
     builder.add((type == null ? 0 : type.ordinal() + 1));
-    builder.add(distinct).add(sqlDistinct).add(query);
+    builder.add(distinct).add(sqlDistinct);
     builder.add(firstRow).add(maxRows);
     builder.add(orderBy).add(forUpdate);
     builder.add(mapKey);
@@ -131,7 +129,6 @@ public class OrmQueryPlanKey implements CQueryPlanKey {
 
 //    if (detail != null ? !detail.equals(that.detail) : that.detail != null) return false;
 
-    if (query != null ? !query.equals(that.query) : that.query != 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;
   }