Moved equals into children of ArrayValue

I did not particularly like this change, but there seems to be no good way that would make the checkstyle rule 'EqualsHashCode' happy ("all classes that overwrite one of those methods, must also overwrite the other" -> but there is no good way to overwrite hashCode in ArrayValue because inheritance)
neo4j · Jul 12, 2017 · f6a5780 · f6a5780
1 parent 228336c
commit f6a5780
Show file tree

Hide file tree

Showing 10 changed files with 144 additions and 15 deletions.
diff --git a/community/values/src/main/java/org/neo4j/values/storable/ArrayValue.java b/community/values/src/main/java/org/neo4j/values/storable/ArrayValue.java
@@ -49,19 +49,4 @@ public boolean isSequenceValue()
     {
         return true;
     }
-
-    @Override
-    public final boolean equals( Object other )
-    {
-        if ( other == null )
-        {
-            return false;
-        }
-
-        if ( other instanceof SequenceValue  )
-        {
-            return this.equals( (SequenceValue) other );
-        }
-        return other instanceof Value && equals( (Value) other );
-    }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/storable/BooleanArray.java b/community/values/src/main/java/org/neo4j/values/storable/BooleanArray.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.SequenceValue;
 
 import static java.lang.String.format;
 
@@ -148,6 +149,21 @@ public String prettyPrint()
         return Arrays.toString( value() );
     }
 
+    @Override
+    public final boolean equals( Object other )
+    {
+        if ( other == null )
+        {
+            return false;
+        }
+
+        if ( other instanceof SequenceValue )
+        {
+            return this.equals( (SequenceValue) other );
+        }
+        return other instanceof Value && equals( (Value) other );
+    }
+
     @Override
     public AnyValue value( int position )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/ByteArray.java b/community/values/src/main/java/org/neo4j/values/storable/ByteArray.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.SequenceValue;
 
 import static java.lang.String.format;
 
@@ -89,6 +90,21 @@ public boolean equals( double[] x )
         return PrimitiveArrayValues.equals( value(), x );
     }
 
+    @Override
+    public final boolean equals( Object other )
+    {
+        if ( other == null )
+        {
+            return false;
+        }
+
+        if ( other instanceof SequenceValue )
+        {
+            return this.equals( (SequenceValue) other );
+        }
+        return other instanceof Value && equals( (Value) other );
+    }
+
     @Override
     public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/CharArray.java b/community/values/src/main/java/org/neo4j/values/storable/CharArray.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.SequenceValue;
 
 import static java.lang.String.format;
 
@@ -54,6 +55,21 @@ public boolean equals( String[] x )
         return PrimitiveArrayValues.equals( value(), x );
     }
 
+    @Override
+    public final boolean equals( Object other )
+    {
+        if ( other == null )
+        {
+            return false;
+        }
+
+        if ( other instanceof SequenceValue )
+        {
+            return this.equals( (SequenceValue) other );
+        }
+        return other instanceof Value && equals( (Value) other );
+    }
+
     @Override
     public int hashCode()
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/DoubleArray.java b/community/values/src/main/java/org/neo4j/values/storable/DoubleArray.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.SequenceValue;
 
 import static java.lang.String.format;
 
@@ -89,6 +90,21 @@ public boolean equals( double[] x )
         return Arrays.equals( x, value() );
     }
 
+    @Override
+    public final boolean equals( Object other )
+    {
+        if ( other == null )
+        {
+            return false;
+        }
+
+        if ( other instanceof SequenceValue )
+        {
+            return this.equals( (SequenceValue) other );
+        }
+        return other instanceof Value && equals( (Value) other );
+    }
+
     @Override
     public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/FloatArray.java b/community/values/src/main/java/org/neo4j/values/storable/FloatArray.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.SequenceValue;
 
 import static java.lang.String.format;
 
@@ -89,6 +90,21 @@ public boolean equals( double[] x )
         return PrimitiveArrayValues.equals( value(), x  );
     }
 
+    @Override
+    public final boolean equals( Object other )
+    {
+        if ( other == null )
+        {
+            return false;
+        }
+
+        if ( other instanceof SequenceValue )
+        {
+            return this.equals( (SequenceValue) other );
+        }
+        return other instanceof Value && equals( (Value) other );
+    }
+
     @Override
     public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/IntArray.java b/community/values/src/main/java/org/neo4j/values/storable/IntArray.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.SequenceValue;
 
 import static java.lang.String.format;
 
@@ -89,6 +90,21 @@ public boolean equals( double[] x )
         return PrimitiveArrayValues.equals( value(), x );
     }
 
+    @Override
+    public final boolean equals( Object other )
+    {
+        if ( other == null )
+        {
+            return false;
+        }
+
+        if ( other instanceof SequenceValue )
+        {
+            return this.equals( (SequenceValue) other );
+        }
+        return other instanceof Value && equals( (Value) other );
+    }
+
     @Override
     public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/LongArray.java b/community/values/src/main/java/org/neo4j/values/storable/LongArray.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.SequenceValue;
 
 import static java.lang.String.format;
 
@@ -89,6 +90,21 @@ public boolean equals( double[] x )
         return PrimitiveArrayValues.equals( value(), x );
     }
 
+    @Override
+    public final boolean equals( Object other )
+    {
+        if ( other == null )
+        {
+            return false;
+        }
+
+        if ( other instanceof SequenceValue )
+        {
+            return this.equals( (SequenceValue) other );
+        }
+        return other instanceof Value && equals( (Value) other );
+    }
+
     @Override
     public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/ShortArray.java b/community/values/src/main/java/org/neo4j/values/storable/ShortArray.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.SequenceValue;
 
 import static java.lang.String.format;
 
@@ -89,6 +90,21 @@ public boolean equals( double[] x )
         return PrimitiveArrayValues.equals( value(), x );
     }
 
+    @Override
+    public final boolean equals( Object other )
+    {
+        if ( other == null )
+        {
+            return false;
+        }
+
+        if ( other instanceof SequenceValue )
+        {
+            return this.equals( (SequenceValue) other );
+        }
+        return other instanceof Value && equals( (Value) other );
+    }
+
     @Override
     public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/StringArray.java b/community/values/src/main/java/org/neo4j/values/storable/StringArray.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.SequenceValue;
 
 import static java.lang.String.format;
 
@@ -59,6 +60,21 @@ public boolean equals( String[] x )
         return Arrays.equals( value(), x );
     }
 
+    @Override
+    public final boolean equals( Object other )
+    {
+        if ( other == null )
+        {
+            return false;
+        }
+
+        if ( other instanceof SequenceValue )
+        {
+            return this.equals( (SequenceValue) other );
+        }
+        return other instanceof Value && equals( (Value) other );
+    }
+
     @Override
     public int hashCode()
     {