Refactor of query plan hash - add HashQueryPlan, HashQuery etc

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

@@ -1,10 +1,11 @@
 package com.avaje.ebeaninternal.server.expression;
 
 import com.avaje.ebean.event.BeanQueryRequest;
+import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
 import com.avaje.ebeaninternal.api.SpiExpressionRequest;
 import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 
-public class SimpleExpression extends AbstractExpression implements LuceneAwareExpression {
+public class SimpleExpression extends AbstractExpression {
 
   private static final long serialVersionUID = -382881395755603790L;
 
@@ -91,15 +92,13 @@ public class SimpleExpression extends AbstractExpression implements LuceneAwareE
   /**
    * Based on the type and propertyName.
    */
-  public int queryAutoFetchHash() {
-    int hc = SimpleExpression.class.getName().hashCode();
-    hc = hc * 31 + propName.hashCode();
-    hc = hc * 31 + type.name().hashCode();
-    return hc;
+  public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
+    builder.add(SimpleExpression.class).add(propName).add(type.name());
+    builder.bind(1);
   }
 
-  public int queryPlanHash(BeanQueryRequest<?> request) {
-    return queryAutoFetchHash();
+  public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
+    queryAutoFetchHash(builder);
   }
 
   public int queryBindHash() {