Merge branch 'master' of github.com:ebean-orm/ebean

src/main/java/io/ebeaninternal/api/HashQueryPlan.java

@@ -1,57 +0,0 @@
-package io.ebeaninternal.api;
-
-/**
- * A hash for a query plan.
- */
-public class HashQueryPlan {
-
-  private final String rawSql;
-
-  private final int planHash;
-
-  private final int bindCount;
-
-  public HashQueryPlan(String rawSql, int planHash, int bindCount) {
-    this.rawSql = rawSql;
-    this.planHash = planHash;
-    this.bindCount = bindCount;
-  }
-
-  @Override
-  public String toString() {
-    return planHash + ":" + bindCount + (rawSql != null ? ":r" : "");
-  }
-
-  /**
-   * Return as a partial key. For rawSql hash the sql is part of the key and as such
-   * needs to be included in order to have a complete key. Typically the MD5 of the sql
-   * can be used as a shot form proxy for the actual sql.
-   */
-  public String getPartialKey() {
-    return planHash + "_" + bindCount;
-  }
-
-  @Override
-  public int hashCode() {
-    int hc = planHash;
-    hc = hc * 92821 + bindCount;
-    hc = hc * 92821 + (rawSql == null ? 0 : rawSql.hashCode());
-    return hc;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (obj == this) {
-      return true;
-    }
-    if (!(obj instanceof HashQueryPlan)) {
-      return false;
-    }
-
-    HashQueryPlan e = (HashQueryPlan) obj;
-    //noinspection StringEquality
-    return e.planHash == planHash
-      && e.bindCount == bindCount
-      && ((e.rawSql == rawSql) || (e.rawSql != null && e.rawSql.equals(rawSql)));
-  }
-}

src/main/java/io/ebeaninternal/api/HashQueryPlanBuilder.java

@@ -1,97 +0,0 @@
-package io.ebeaninternal.api;
-
-import java.util.Set;
-
-/**
- * Used to build HashQueryPlan instances.
- */
-public class HashQueryPlanBuilder {
-
-  private int planHash;
-
-  private int bindCount;
-
-  public HashQueryPlanBuilder() {
-    this.planHash = 92821;
-  }
-
-  @Override
-  public String toString() {
-    return planHash + ":" + bindCount;
-  }
-
-  /**
-   * Add a class to the hash calculation.
-   */
-  public HashQueryPlanBuilder add(Class<?> cls) {
-    planHash = planHash * 92821 + cls.getName().hashCode();
-    return this;
-  }
-
-  /**
-   * Add an object to the hash calculation.
-   */
-  public HashQueryPlanBuilder add(Object object) {
-    planHash = planHash * 92821 + (object == null ? 0 : object.hashCode());
-    return this;
-  }
-
-  /**
-   * Add the set with order being important.
-   */
-  public HashQueryPlanBuilder addOrdered(Set<?> set) {
-    if (set == null) {
-      add(false);
-    } else {
-      add(true);
-      for (Object o : set) {
-        add(o);
-      }
-    }
-    return this;
-  }
-
-  /**
-   * Add an integer to the hash calculation.
-   */
-  public HashQueryPlanBuilder add(int hashValue) {
-    planHash = planHash * 92821 + (hashValue);
-    return this;
-  }
-
-  /**
-   * Add a boolean to the hash calculation.
-   */
-  public HashQueryPlanBuilder add(boolean booleanValue) {
-    planHash = planHash * 92821 + (booleanValue ? 92821 : 0);
-    return this;
-  }
-
-  /**
-   * Add a number to the bind count for the hash.
-   */
-  public void bind(int extraBindCount) {
-    bindCount += extraBindCount;
-  }
-
-  public void bindIfNotNull(Object someValue) {
-    if (someValue != null) {
-      bindCount++;
-    }
-  }
-
-  /**
-   * Build and return the calculated HashQueryPlan.
-   */
-  public String build() {
-    return planHash + "_" + bindCount;
-  }
-
-  public int getPlanHash() {
-    return planHash;
-  }
-
-  public int getBindCount() {
-    return bindCount;
-  }
-}

src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -1054,7 +1054,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     // calculateQueryPlanHash is called just after potential AutoTune tuning
     // so queryPlanHash is calculated well before this method is called
     int hc = queryBindHash();
-
     return new HashQuery(queryPlanKey, hc);
   }