Fix Lazy toString() methods and remove stale code

neo4j · May 31, 2017 · f956150 · f956150
1 parent b795b52
commit f956150
Show file tree

Hide file tree

Showing 14 changed files with 124 additions and 150 deletions.
diff --git a/community/values/src/main/java/org/neo4j/values/BooleanArray.java b/community/values/src/main/java/org/neo4j/values/BooleanArray.java
@@ -122,12 +122,6 @@ public Object asPublic()
         return value().clone();
     }
 
-    @Override
-    public String toString()
-    {
-        return format( "BooleanArray(%s)", Arrays.toString( value() ) );
-    }
-
     public int compareTo( BooleanArray other )
     {
         return NumberValues.compareBooleanArrays( this, other );
@@ -153,6 +147,12 @@ boolean[] value()
         {
             return value;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "BooleanArray%s", Arrays.toString( value() ) );
+        }
     }
 
     static final class Lazy extends BooleanArray implements LazyValue<boolean[]>
@@ -181,5 +181,12 @@ public Object getMaybeValue()
         {
             return field;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "BooleanArray%s",
+                    LazyValues.valueIsLoaded( field ) ? Arrays.toString( value() ) : "?" );
+        }
     }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/ByteArray.java b/community/values/src/main/java/org/neo4j/values/ByteArray.java
@@ -105,12 +105,6 @@ public Object asPublic()
         return value().clone();
     }
 
-    @Override
-    public String toString()
-    {
-        return format( "ByteArray(%s)", Arrays.toString( value() ) );
-    }
-
     static final class Direct extends ByteArray
     {
         final byte[] value;
@@ -126,6 +120,12 @@ byte[] value()
         {
             return value;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "ByteArray%s", Arrays.toString( value ) );
+        }
     }
 
     static final class Lazy extends ByteArray implements LazyValue<byte[]>
@@ -154,5 +154,12 @@ public Object getMaybeValue()
         {
             return field;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "ByteArray%s",
+                    LazyValues.valueIsLoaded( field ) ? Arrays.toString( value() ) : "?" );
+        }
     }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/CharArray.java b/community/values/src/main/java/org/neo4j/values/CharArray.java
@@ -88,12 +88,6 @@ public Object asPublic()
         return value().clone();
     }
 
-    @Override
-    public String toString()
-    {
-        return format( "CharArray(%s)", Arrays.toString( value() ) );
-    }
-
     static final class Direct extends CharArray
     {
         final char[] value;
@@ -109,6 +103,12 @@ char[] value()
         {
             return value;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "CharArray%s", Arrays.toString( value() ) );
+        }
     }
 
     static final class Lazy extends CharArray implements LazyValue<char[]>
@@ -137,5 +137,12 @@ public Object getMaybeValue()
         {
             return field;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "CharArray%s",
+                    LazyValues.valueIsLoaded( field ) ? Arrays.toString( value() ) : "?" );
+        }
     }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/DoubleArray.java b/community/values/src/main/java/org/neo4j/values/DoubleArray.java
@@ -105,12 +105,6 @@ public Object asPublic()
         return value().clone();
     }
 
-    @Override
-    public String toString()
-    {
-        return format( "DoubleArray(%s)", Arrays.toString( value() ) );
-    }
-
     static final class Direct extends DoubleArray
     {
         final double[] value;
@@ -126,6 +120,12 @@ static final class Direct extends DoubleArray
         {
             return value;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "DoubleArray%s", Arrays.toString( value() ) );
+        }
     }
 
     static final class Lazy extends DoubleArray implements LazyValue<double[]>
@@ -154,5 +154,12 @@ public Object getMaybeValue()
         {
             return field;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "DoubleArray%s",
+                    LazyValues.valueIsLoaded( field ) ? Arrays.toString( value() ) : "?" );
+        }
     }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/FloatArray.java b/community/values/src/main/java/org/neo4j/values/FloatArray.java
@@ -105,12 +105,6 @@ public Object asPublic()
         return value().clone();
     }
 
-    @Override
-    public String toString()
-    {
-        return format( "FloatArray(%s)", Arrays.toString( value() ) );
-    }
-
     static final class Direct extends FloatArray
     {
         final float[] value;
@@ -126,6 +120,12 @@ float[] value()
         {
             return value;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "FloatArray%s", Arrays.toString( value() ) );
+        }
     }
 
     static final class Lazy extends FloatArray implements LazyValue<float[]>
@@ -154,5 +154,12 @@ public Object getMaybeValue()
         {
             return field;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "FloatArray%s",
+                    LazyValues.valueIsLoaded( field ) ? Arrays.toString( value() ) : "?" );
+        }
     }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/FloatingPointArray.java b/community/values/src/main/java/org/neo4j/values/FloatingPointArray.java
@@ -21,40 +21,6 @@
 
 abstract class FloatingPointArray extends NumberArray
 {
-//    @Override
-//    public boolean equals( Object other )
-//    {
-//        return other != null && other instanceof Value && equals( (Value) other );
-//    }
-//
-//    @Override
-//    public final boolean equals( Value other )
-//    {
-//        if ( other instanceof ValueGroup.VIntegerArray )
-//        {
-//            ValueGroup.VIntegerArray that = (ValueGroup.VIntegerArray) other;
-//            return NumberValues.numbersEqual( this, that );
-//        }
-//        else if ( other instanceof ValueGroup.VFloatingPointArray )
-//        {
-//            ValueGroup.VFloatingPointArray that = (ValueGroup.VFloatingPointArray) other;
-//            return NumberValues.numbersEqual( that, this );
-//        }
-//        return false;
-//    }
-//
-//    @Override
-//    public final int hashCode()
-//    {
-//        int result = 1;
-//        for ( int i = 0, len = length(); i < len; i++ )
-//        {
-//            int elementHash = NumberValues.hash( longValue( i ) );
-//            result = 31 * result + elementHash;
-//        }
-//        return result;
-//    }
-
     abstract double doubleValue( int offset );
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/IntArray.java b/community/values/src/main/java/org/neo4j/values/IntArray.java
@@ -105,12 +105,6 @@ public Object asPublic()
         return value().clone();
     }
 
-    @Override
-    public String toString()
-    {
-        return format( "IntArray(%s)", Arrays.toString( value() ) );
-    }
-
     static final class Direct extends IntArray
     {
         final int[] value;
@@ -126,6 +120,12 @@ int[] value()
         {
             return value;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "IntArray%s", Arrays.toString( value() ) );
+        }
     }
 
     static final class Lazy extends IntArray implements LazyValue<int[]>
@@ -154,5 +154,12 @@ public Object getMaybeValue()
         {
             return field;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "IntArray%s",
+                    LazyValues.valueIsLoaded( field ) ? Arrays.toString( value() ) : "?" );
+        }
     }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/IntegralArray.java b/community/values/src/main/java/org/neo4j/values/IntegralArray.java
@@ -21,40 +21,6 @@
 
 abstract class IntegralArray extends NumberArray
 {
-//    @Override
-//    public boolean equals( Object other )
-//    {
-//        return other != null && other instanceof Value && equals( (Value) other );
-//    }
-//
-//    @Override
-//    public final boolean equals( Value other )
-//    {
-//        if ( other instanceof ValueGroup.VIntegerArray )
-//        {
-//            ValueGroup.VIntegerArray that = (ValueGroup.VIntegerArray) other;
-//            return NumberValues.numbersEqual( this, that );
-//        }
-//        else if ( other instanceof ValueGroup.VFloatingPointArray )
-//        {
-//            ValueGroup.VFloatingPointArray that = (ValueGroup.VFloatingPointArray) other;
-//            return NumberValues.numbersEqual( that, this );
-//        }
-//        return false;
-//    }
-//
-//    @Override
-//    public final int hashCode()
-//    {
-//        int result = 1;
-//        for ( int i = 0, len = length(); i < len; i++ )
-//        {
-//            int elementHash = NumberValues.hash( longValue( i ) );
-//            result = 31 * result + elementHash;
-//        }
-//        return result;
-//    }
-
     abstract long longValue( int offset );
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/LazyValues.java b/community/values/src/main/java/org/neo4j/values/LazyValues.java
@@ -23,30 +23,6 @@
 
 class LazyValues
 {
-//    ALTERNATIVE REFLECTIVE SOLUTION:
-//    ================================
-//
-//    static <Owner> Object getOrLoad(
-//            Owner owner,
-//            AtomicReferenceFieldUpdater<Owner, Object> updater
-//    ) throws Values.ValueLoadException
-//    {
-//        Object value = updater.get( owner );
-//        if ( value instanceof ValueLoader )
-//        {
-//            synchronized ( owner ) {
-//                value = updater.get( owner );
-//                if ( value instanceof ValueLoader )
-//                {
-//                    ValueLoader callable = (ValueLoader) value;
-//                    value = callable.load();
-//                    updater.set( owner, value );
-//                }
-//            }
-//        }
-//        return value;
-//    }
-
     /**
      * Get or loads the value.
      */

diff --git a/community/values/src/main/java/org/neo4j/values/LongArray.java b/community/values/src/main/java/org/neo4j/values/LongArray.java
@@ -105,12 +105,6 @@ public Object asPublic()
         return value().clone();
     }
 
-    @Override
-    public String toString()
-    {
-        return format( "LongArray(%s)", Arrays.toString( value() ) );
-    }
-
     static final class Direct extends LongArray
     {
         final long[] value;
@@ -126,6 +120,12 @@ long[] value()
         {
             return value;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "LongArray%s", Arrays.toString( value() ) );
+        }
     }
 
     static final class Lazy extends LongArray implements LazyValue<long[]>
@@ -154,5 +154,12 @@ public Object getMaybeValue()
         {
             return field;
         }
+
+        @Override
+        public String toString()
+        {
+            return format( "LongArray%s",
+                    LazyValues.valueIsLoaded( field ) ? Arrays.toString( value() ) : "?" );
+        }
     }
 }