#1738 - Refactor add final, Object.equals, Integer.compare

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

@@ -3,6 +3,8 @@ package io.ebeaninternal.server.querydefn;
 import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 
+import java.util.Objects;
+
 /**
  * Query plan key for ORM queries.
  */
@@ -55,6 +57,6 @@ class OrmQueryPlanKey implements CQueryPlanKey {
     if (maxRows != that.maxRows) return false;
     if (firstRow != that.firstRow) return false;
     if (!description.equals(that.description)) return false;
-    return rawSqlKey != null ? rawSqlKey.equals(that.rawSqlKey) : that.rawSqlKey == null;
+    return Objects.equals(rawSqlKey, that.rawSqlKey);
   }
 }

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

@@ -12,7 +12,7 @@ import java.util.List;
  */
 class OrmQueryPropertiesParser {
 
-  private static Response EMPTY = new Response();
+  private static final Response EMPTY = new Response();
 
   /**
    * Immutable response of the parsed properties and options.

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

@@ -116,7 +116,7 @@ public class OrmUpdateProperties {
   /**
    * The set properties/expressions and their bind values.
    */
-  private LinkedHashMap<String, Value> values = new LinkedHashMap<>();
+  private final LinkedHashMap<String, Value> values = new LinkedHashMap<>();
 
   /**
    * Normal set property.