Merged Value and ValueImpl again

Also made custom ValueLoader interface to feed LazyValue.
neo4j · May 31, 2017 · aace858 · aace858
1 parent 7e59742
commit aace858
Show file tree

Hide file tree

Showing 23 changed files with 82 additions and 121 deletions.
diff --git a/community/values/src/main/java/org/neo4j/values/DirectArray.java b/community/values/src/main/java/org/neo4j/values/DirectArray.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.values;
 
-abstract class DirectArray extends ValueImpl
+abstract class DirectArray extends Value
 {
     abstract int length();
 

diff --git a/community/values/src/main/java/org/neo4j/values/DirectLongArray.java b/community/values/src/main/java/org/neo4j/values/DirectLongArray.java
@@ -90,7 +90,7 @@ public void writeTo( ValueWriter writer )
     @Override
     public Object asPublic()
     {
-        return value;
+        return value.clone();
     }
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/DirectScalar.java b/community/values/src/main/java/org/neo4j/values/DirectScalar.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.values;
 
-abstract class DirectScalar extends ValueImpl
+abstract class DirectScalar extends Value
 {
     @Override
     public boolean equals( byte[] x )

diff --git a/community/values/src/main/java/org/neo4j/values/LazyArray.java b/community/values/src/main/java/org/neo4j/values/LazyArray.java
@@ -19,11 +19,9 @@
  */
 package org.neo4j.values;
 
-import java.util.concurrent.Callable;
-
 abstract class LazyArray<T> extends LazyValue<T>
 {
-    LazyArray( Callable<? extends T> producer )
+    LazyArray( Values.ValueLoader<? extends T> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyBooleanArray.java b/community/values/src/main/java/org/neo4j/values/LazyBooleanArray.java
@@ -20,11 +20,10 @@
 package org.neo4j.values;
 
 import java.util.Arrays;
-import java.util.concurrent.Callable;
 
 final class LazyBooleanArray extends LazyArray<boolean[]> implements ValueGroup.VBooleanArray
 {
-    LazyBooleanArray( Callable<boolean[]> producer )
+    LazyBooleanArray( Values.ValueLoader<boolean[]> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyByteArray.java b/community/values/src/main/java/org/neo4j/values/LazyByteArray.java
@@ -20,11 +20,10 @@
 package org.neo4j.values;
 
 import java.util.Arrays;
-import java.util.concurrent.Callable;
 
 final class LazyByteArray extends LazyIntegralArray<byte[]>
 {
-    LazyByteArray( Callable<byte[]> producer )
+    LazyByteArray( Values.ValueLoader<byte[]> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyCharArray.java b/community/values/src/main/java/org/neo4j/values/LazyCharArray.java
@@ -20,11 +20,10 @@
 package org.neo4j.values;
 
 import java.util.Arrays;
-import java.util.concurrent.Callable;
 
 final class LazyCharArray extends LazyTextArray<char[]>
 {
-    LazyCharArray( Callable<char[]> producer )
+    LazyCharArray( Values.ValueLoader<char[]> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyDoubleArray.java b/community/values/src/main/java/org/neo4j/values/LazyDoubleArray.java
@@ -20,11 +20,10 @@
 package org.neo4j.values;
 
 import java.util.Arrays;
-import java.util.concurrent.Callable;
 
 final class LazyDoubleArray extends LazyFloatingPointArray<double[]>
 {
-    LazyDoubleArray( Callable<double[]> producer )
+    LazyDoubleArray( Values.ValueLoader<double[]> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyFloatArray.java b/community/values/src/main/java/org/neo4j/values/LazyFloatArray.java
@@ -20,11 +20,10 @@
 package org.neo4j.values;
 
 import java.util.Arrays;
-import java.util.concurrent.Callable;
 
 final class LazyFloatArray extends LazyFloatingPointArray<float[]>
 {
-    LazyFloatArray( Callable<float[]> producer )
+    LazyFloatArray( Values.ValueLoader<float[]> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyFloatingPointArray.java b/community/values/src/main/java/org/neo4j/values/LazyFloatingPointArray.java
@@ -19,11 +19,9 @@
  */
 package org.neo4j.values;
 
-import java.util.concurrent.Callable;
-
 abstract class LazyFloatingPointArray<T> extends LazyArray<T> implements ValueGroup.VFloatingPointArray
 {
-    LazyFloatingPointArray( Callable<? extends T> producer )
+    LazyFloatingPointArray( Values.ValueLoader<? extends T> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyIntArray.java b/community/values/src/main/java/org/neo4j/values/LazyIntArray.java
@@ -20,11 +20,10 @@
 package org.neo4j.values;
 
 import java.util.Arrays;
-import java.util.concurrent.Callable;
 
 final class LazyIntArray extends LazyIntegralArray<int[]>
 {
-    LazyIntArray( Callable<int[]> producer )
+    LazyIntArray( Values.ValueLoader<int[]> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyIntegralArray.java b/community/values/src/main/java/org/neo4j/values/LazyIntegralArray.java
@@ -19,11 +19,9 @@
  */
 package org.neo4j.values;
 
-import java.util.concurrent.Callable;
-
 abstract class LazyIntegralArray<T> extends LazyArray<T> implements ValueGroup.VIntegerArray
 {
-    LazyIntegralArray( Callable<? extends T> producer )
+    LazyIntegralArray( Values.ValueLoader<? extends T> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyLongArray.java b/community/values/src/main/java/org/neo4j/values/LazyLongArray.java
@@ -20,11 +20,10 @@
 package org.neo4j.values;
 
 import java.util.Arrays;
-import java.util.concurrent.Callable;
 
 final class LazyLongArray extends LazyIntegralArray<long[]>
 {
-    LazyLongArray( Callable<long[]> producer )
+    LazyLongArray( Values.ValueLoader<long[]> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyShortArray.java b/community/values/src/main/java/org/neo4j/values/LazyShortArray.java
@@ -20,11 +20,10 @@
 package org.neo4j.values;
 
 import java.util.Arrays;
-import java.util.concurrent.Callable;
 
 final class LazyShortArray extends LazyIntegralArray<short[]>
 {
-    LazyShortArray( Callable<short[]> producer )
+    LazyShortArray( Values.ValueLoader<short[]> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyString.java b/community/values/src/main/java/org/neo4j/values/LazyString.java
@@ -19,13 +19,11 @@
  */
 package org.neo4j.values;
 
-import java.util.concurrent.Callable;
-
 import static java.lang.String.format;
 
 final class LazyString extends LazyValue<String> implements ValueGroup.VText
 {
-    LazyString( Callable<String> producer )
+    LazyString( Values.ValueLoader<String> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyStringArray.java b/community/values/src/main/java/org/neo4j/values/LazyStringArray.java
@@ -20,11 +20,10 @@
 package org.neo4j.values;
 
 import java.util.Arrays;
-import java.util.concurrent.Callable;
 
 final class LazyStringArray extends LazyTextArray<String[]>
 {
-    LazyStringArray( Callable<String[]> producer )
+    LazyStringArray( Values.ValueLoader<String[]> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyTextArray.java b/community/values/src/main/java/org/neo4j/values/LazyTextArray.java
@@ -19,11 +19,9 @@
  */
 package org.neo4j.values;
 
-import java.util.concurrent.Callable;
-
 abstract class LazyTextArray<T> extends LazyArray<T> implements ValueGroup.VTextArray
 {
-    LazyTextArray( Callable<? extends T> producer )
+    LazyTextArray( Values.ValueLoader<? extends T> producer )
     {
         super( producer );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/LazyValue.java b/community/values/src/main/java/org/neo4j/values/LazyValue.java
@@ -21,11 +21,13 @@
 
 import java.util.concurrent.Callable;
 
-abstract class LazyValue<T> extends ValueImpl
+import org.neo4j.values.Values.ValueLoader;
+
+abstract class LazyValue<T> extends Value
 {
     private volatile Object value;
 
-    LazyValue( Callable<? extends T> producer )
+    LazyValue( ValueLoader<? extends T> producer )
     {
         this.value = producer;
     }
@@ -35,32 +37,25 @@ abstract class LazyValue<T> extends ValueImpl
      */
     final T getOrLoad()
     {
-        Object value = this.value;
-        if ( value instanceof Callable<?> )
+        Object maybeValue = this.value;
+        if ( maybeValue instanceof ValueLoader<?> )
         {
             synchronized ( this )
             {
-                value = this.value;
-                if ( value instanceof Callable<?> )
+                maybeValue = this.value;
+                if ( maybeValue instanceof ValueLoader<?> )
                 {
-                    this.value = value = produceValue();
+                    this.value = produceValue();
                 }
             }
         }
         //noinspection unchecked
-        return (T) value;
+        return (T) this.value;
     }
 
     private Object produceValue()
     {
-        try
-        {
-            return ((Callable<?>) value).call();
-        }
-        catch ( Exception e )
-        {
-            throw new RuntimeException( e );
-        }
+        return ((ValueLoader<?>) value).load();
     }
 
     boolean valueIsLoaded()

diff --git a/community/values/src/main/java/org/neo4j/values/NoValue.java b/community/values/src/main/java/org/neo4j/values/NoValue.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.values;
 
-final class NoValue extends ValueImpl
+final class NoValue extends Value
 {
     @SuppressWarnings( "WeakerAccess" )
     public static NoValue NO_VALUE = new NoValue();

diff --git a/community/values/src/main/java/org/neo4j/values/Value.java b/community/values/src/main/java/org/neo4j/values/Value.java
@@ -19,28 +19,41 @@
  */
 package org.neo4j.values;
 
-public interface Value extends ValueGroup.WithId
+public abstract class Value implements ValueGroup.WithId
 {
-    boolean equals( Value other );
+    @Override
+    public abstract boolean equals( Object other );
 
-    boolean equals( byte[] x );
-    boolean equals( short[] x );
-    boolean equals( int[] x );
-    boolean equals( long[] x );
+    @Override
+    public abstract int hashCode();
 
-    boolean equals( float[] x );
-    boolean equals( double[] x );
+    public abstract boolean equals( Value other );
 
-    boolean equals( boolean x );
-    boolean equals( boolean[] x );
+    public abstract boolean equals( byte[] x );
 
-    boolean equals( char x );
-    boolean equals( String x );
+    public abstract boolean equals( short[] x );
 
-    boolean equals( char[] x );
-    boolean equals( String[] x );
+    public abstract boolean equals( int[] x );
 
-    void writeTo( ValueWriter writer );
+    public abstract boolean equals( long[] x );
 
-    Object asPublic();
+    public abstract boolean equals( float[] x );
+
+    public abstract boolean equals( double[] x );
+
+    public abstract boolean equals( boolean x );
+
+    public abstract boolean equals( boolean[] x );
+
+    public abstract boolean equals( char x );
+
+    public abstract boolean equals( String x );
+
+    public abstract boolean equals( char[] x );
+
+    public abstract boolean equals( String[] x );
+
+    public abstract void writeTo( ValueWriter writer );
+
+    public abstract Object asPublic();
 }
diff --git a/community/values/src/main/java/org/neo4j/values/ValueImpl.java b/community/values/src/main/java/org/neo4j/values/ValueImpl.java