#566 - Refactor internals - SpiExpression, add prepareExpression() to merge queryAutoTuneHash() and queryPlanHash() - initial

src/main/java/com/avaje/ebeaninternal/server/expression/RawExpression.java

@@ -1,14 +1,12 @@
 package com.avaje.ebeaninternal.server.expression;
 
-import com.avaje.ebean.event.BeanQueryRequest;
 import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
 import com.avaje.ebeaninternal.api.ManyWhereJoins;
-import com.avaje.ebeaninternal.api.SpiExpression;
 import com.avaje.ebeaninternal.api.SpiExpressionRequest;
 import com.avaje.ebeaninternal.api.SpiExpressionValidation;
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
 
-class RawExpression implements SpiExpression {
+class RawExpression extends NonPrepareExpression {
 
   private static final long serialVersionUID = 7973903141340334606L;
 
@@ -21,6 +19,7 @@ class RawExpression implements SpiExpression {
     this.values = values;
   }
 
+  @Override
   public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins manyWhereJoin) {
 
   }
@@ -30,6 +29,7 @@ class RawExpression implements SpiExpression {
     // always ignored
   }
 
+  @Override
   public void addBindValues(SpiExpressionRequest request) {
     if (values != null) {
       for (int i = 0; i < values.length; i++) {
@@ -38,6 +38,7 @@ class RawExpression implements SpiExpression {
     }
   }
 
+  @Override
   public void addSql(SpiExpressionRequest request) {
     request.append(sql);
   }
@@ -45,14 +46,12 @@ class RawExpression implements SpiExpression {
   /**
    * Based on the sql.
    */
-  public void queryAutoTuneHash(HashQueryPlanBuilder builder) {
+  @Override
+  public void queryPlanHash(HashQueryPlanBuilder builder) {
     builder.add(RawExpression.class).add(sql);
   }
 
-  public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
-    queryAutoTuneHash(builder);
-  }
-
+  @Override
   public int queryBindHash() {
     return sql.hashCode();
   }