diff --git a/community/values/src/main/java/org/neo4j/values/BooleanValue.java b/community/values/src/main/java/org/neo4j/values/DirectBoolean.java similarity index 95% rename from community/values/src/main/java/org/neo4j/values/BooleanValue.java rename to community/values/src/main/java/org/neo4j/values/DirectBoolean.java index dd6966ae78938..849ac8a347dba 100644 --- a/community/values/src/main/java/org/neo4j/values/BooleanValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectBoolean.java @@ -25,11 +25,11 @@ * This does not extend AbstractProperty since the JVM can take advantage of the 4 byte initial field alignment if * we don't extend a class that has fields. */ -final class BooleanValue extends ScalarValue implements ValueGroup.VBoolean +final class DirectBoolean extends DirectScalar implements ValueGroup.VBoolean { private final boolean bool; - BooleanValue( boolean bool ) + DirectBoolean( boolean bool ) { this.bool = bool; } diff --git a/community/values/src/main/java/org/neo4j/values/BooleanArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectBooleanArray.java similarity index 92% rename from community/values/src/main/java/org/neo4j/values/BooleanArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectBooleanArray.java index 42635828f1168..d453e947da1fa 100644 --- a/community/values/src/main/java/org/neo4j/values/BooleanArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectBooleanArray.java @@ -23,11 +23,11 @@ import static java.lang.String.format; -class BooleanArrayValue extends ArrayValue implements ValueGroup.VBooleanArray +final class DirectBooleanArray extends ArrayValue implements ValueGroup.VBooleanArray { private final boolean[] value; - BooleanArrayValue( boolean[] value ) + DirectBooleanArray( boolean[] value ) { assert value != null; this.value = value; @@ -119,7 +119,7 @@ public int hashCode() static boolean equals( boolean[] value, Value other ) { - return other instanceof BooleanArrayValue && Arrays.equals( value, ((BooleanArrayValue) other).value ); + return other instanceof DirectBooleanArray && Arrays.equals( value, ((DirectBooleanArray) other).value ); } static int hash( boolean[] value ) diff --git a/community/values/src/main/java/org/neo4j/values/ByteValue.java b/community/values/src/main/java/org/neo4j/values/DirectByte.java similarity index 95% rename from community/values/src/main/java/org/neo4j/values/ByteValue.java rename to community/values/src/main/java/org/neo4j/values/DirectByte.java index b06948c9cc773..1fc79bd798d08 100644 --- a/community/values/src/main/java/org/neo4j/values/ByteValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectByte.java @@ -25,11 +25,11 @@ * This does not extend AbstractProperty since the JVM can take advantage of the 4 byte initial field alignment if * we don't extend a class that has fields. */ -final class ByteValue extends IntegralNumberValue +final class DirectByte extends DirectIntegralNumber { private final byte value; - ByteValue( byte value ) + DirectByte( byte value ) { this.value = value; } diff --git a/community/values/src/main/java/org/neo4j/values/ByteArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectByteArray.java similarity index 96% rename from community/values/src/main/java/org/neo4j/values/ByteArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectByteArray.java index f36e5f8484e5e..86eea57f5e9f6 100644 --- a/community/values/src/main/java/org/neo4j/values/ByteArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectByteArray.java @@ -23,11 +23,11 @@ import static java.lang.String.format; -class ByteArrayValue extends IntegralArrayValue +final class DirectByteArray extends DirectIntegralArray { private final byte[] value; - ByteArrayValue( byte[] value ) + DirectByteArray( byte[] value ) { assert value != null; this.value = value; diff --git a/community/values/src/main/java/org/neo4j/values/CharValue.java b/community/values/src/main/java/org/neo4j/values/DirectChar.java similarity index 95% rename from community/values/src/main/java/org/neo4j/values/CharValue.java rename to community/values/src/main/java/org/neo4j/values/DirectChar.java index 3d5afe501dd85..7aca194beadba 100644 --- a/community/values/src/main/java/org/neo4j/values/CharValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectChar.java @@ -21,11 +21,11 @@ import static java.lang.String.format; -final class CharValue extends ScalarValue implements ValueGroup.VText +final class DirectChar extends DirectScalar implements ValueGroup.VText { final char value; - CharValue( char value ) + DirectChar( char value ) { this.value = value; } diff --git a/community/values/src/main/java/org/neo4j/values/CharArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectCharArray.java similarity index 97% rename from community/values/src/main/java/org/neo4j/values/CharArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectCharArray.java index d48b4eddaa8ef..882dd42446a16 100644 --- a/community/values/src/main/java/org/neo4j/values/CharArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectCharArray.java @@ -23,11 +23,11 @@ import static java.lang.String.format; -class CharArrayValue extends ArrayValue +final class DirectCharArray extends ArrayValue { final char[] value; - CharArrayValue( char[] value ) + DirectCharArray( char[] value ) { assert value != null; this.value = value; diff --git a/community/values/src/main/java/org/neo4j/values/DoubleValue.java b/community/values/src/main/java/org/neo4j/values/DirectDouble.java similarity index 94% rename from community/values/src/main/java/org/neo4j/values/DoubleValue.java rename to community/values/src/main/java/org/neo4j/values/DirectDouble.java index 64031eef9505b..40b10a24647fa 100644 --- a/community/values/src/main/java/org/neo4j/values/DoubleValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectDouble.java @@ -21,11 +21,11 @@ import static java.lang.String.format; -final class DoubleValue extends FloatingPointNumberValue +final class DirectDouble extends DirectFloatingPointNumber { private final double value; - DoubleValue( double value ) + DirectDouble( double value ) { this.value = value; } diff --git a/community/values/src/main/java/org/neo4j/values/DoubleArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectDoubleArray.java similarity index 95% rename from community/values/src/main/java/org/neo4j/values/DoubleArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectDoubleArray.java index f4e61fd1f44d6..4e5fbd529664e 100644 --- a/community/values/src/main/java/org/neo4j/values/DoubleArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectDoubleArray.java @@ -23,11 +23,11 @@ import static java.lang.String.format; -class DoubleArrayValue extends FloatingPointArrayValue +final class DirectDoubleArray extends DirectFloatingPointArray { private final double[] value; - DoubleArrayValue( double[] value ) + DirectDoubleArray( double[] value ) { assert value != null; this.value = value; diff --git a/community/values/src/main/java/org/neo4j/values/FloatValue.java b/community/values/src/main/java/org/neo4j/values/DirectFloat.java similarity index 94% rename from community/values/src/main/java/org/neo4j/values/FloatValue.java rename to community/values/src/main/java/org/neo4j/values/DirectFloat.java index 4b5fc5a4e6751..f1fc5bd0af598 100644 --- a/community/values/src/main/java/org/neo4j/values/FloatValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectFloat.java @@ -21,11 +21,11 @@ import static java.lang.String.format; -final class FloatValue extends FloatingPointNumberValue +final class DirectFloat extends DirectFloatingPointNumber { private final float value; - FloatValue( float value ) + DirectFloat( float value ) { this.value = value; } diff --git a/community/values/src/main/java/org/neo4j/values/FloatArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectFloatArray.java similarity index 95% rename from community/values/src/main/java/org/neo4j/values/FloatArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectFloatArray.java index 152f78ac52286..b738d72a1d5b3 100644 --- a/community/values/src/main/java/org/neo4j/values/FloatArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectFloatArray.java @@ -23,11 +23,11 @@ import static java.lang.String.format; -class FloatArrayValue extends FloatingPointArrayValue +final class DirectFloatArray extends DirectFloatingPointArray { private final float[] value; - FloatArrayValue( float[] value ) + DirectFloatArray( float[] value ) { assert value != null; this.value = value; diff --git a/community/values/src/main/java/org/neo4j/values/FloatingPointArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectFloatingPointArray.java similarity index 96% rename from community/values/src/main/java/org/neo4j/values/FloatingPointArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectFloatingPointArray.java index 51c4bd2e652bb..caa1e3728d0cb 100644 --- a/community/values/src/main/java/org/neo4j/values/FloatingPointArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectFloatingPointArray.java @@ -19,7 +19,7 @@ */ package org.neo4j.values; -abstract class FloatingPointArrayValue extends ArrayValue implements ValueGroup.VFloatingPointArray +abstract class DirectFloatingPointArray extends ArrayValue implements ValueGroup.VFloatingPointArray { public abstract double doubleValue( int index ); diff --git a/community/values/src/main/java/org/neo4j/values/FloatingPointNumberValue.java b/community/values/src/main/java/org/neo4j/values/DirectFloatingPointNumber.java similarity index 82% rename from community/values/src/main/java/org/neo4j/values/FloatingPointNumberValue.java rename to community/values/src/main/java/org/neo4j/values/DirectFloatingPointNumber.java index 4fb2bb3ccaeb4..4bcb4d9643401 100644 --- a/community/values/src/main/java/org/neo4j/values/FloatingPointNumberValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectFloatingPointNumber.java @@ -19,7 +19,7 @@ */ package org.neo4j.values; -abstract class FloatingPointNumberValue extends ScalarValue implements ValueGroup.VFloatingPoint +abstract class DirectFloatingPointNumber extends DirectScalar implements ValueGroup.VFloatingPoint { @Override public final int hashCode() @@ -36,14 +36,14 @@ public boolean equals( Object other ) @Override public final boolean equals( Value other ) { - if ( other instanceof FloatingPointNumberValue ) + if ( other instanceof DirectFloatingPointNumber ) { - FloatingPointNumberValue that = (FloatingPointNumberValue) other; + DirectFloatingPointNumber that = (DirectFloatingPointNumber) other; return this.doubleValue() == that.doubleValue(); } - else if ( other instanceof IntegralNumberValue ) + else if ( other instanceof DirectIntegralNumber ) { - IntegralNumberValue that = (IntegralNumberValue) other; + DirectIntegralNumber that = (DirectIntegralNumber) other; return NumberValues.numbersEqual( this.doubleValue(), that.longValue() ); } else diff --git a/community/values/src/main/java/org/neo4j/values/IntValue.java b/community/values/src/main/java/org/neo4j/values/DirectInt.java similarity index 94% rename from community/values/src/main/java/org/neo4j/values/IntValue.java rename to community/values/src/main/java/org/neo4j/values/DirectInt.java index 984130e093482..a3a15a4191260 100644 --- a/community/values/src/main/java/org/neo4j/values/IntValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectInt.java @@ -21,11 +21,11 @@ import static java.lang.String.format; -final class IntValue extends IntegralNumberValue +final class DirectInt extends DirectIntegralNumber { private final int value; - IntValue( int value ) + DirectInt( int value ) { this.value = value; } diff --git a/community/values/src/main/java/org/neo4j/values/IntArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectIntArray.java similarity index 96% rename from community/values/src/main/java/org/neo4j/values/IntArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectIntArray.java index 8c68112dca820..ae790f4e169cf 100644 --- a/community/values/src/main/java/org/neo4j/values/IntArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectIntArray.java @@ -23,11 +23,11 @@ import static java.lang.String.format; -class IntArrayValue extends IntegralArrayValue +final class DirectIntArray extends DirectIntegralArray { private final int[] value; - IntArrayValue( int[] value ) + DirectIntArray( int[] value ) { assert value != null; this.value = value; diff --git a/community/values/src/main/java/org/neo4j/values/IntegralArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectIntegralArray.java similarity index 96% rename from community/values/src/main/java/org/neo4j/values/IntegralArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectIntegralArray.java index 24cc13acb8f9f..6ac2ee8d52dcc 100644 --- a/community/values/src/main/java/org/neo4j/values/IntegralArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectIntegralArray.java @@ -19,7 +19,7 @@ */ package org.neo4j.values; -abstract class IntegralArrayValue extends ArrayValue implements ValueGroup.VIntegerArray +abstract class DirectIntegralArray extends ArrayValue implements ValueGroup.VIntegerArray { @Override boolean equals( boolean[] x ) diff --git a/community/values/src/main/java/org/neo4j/values/IntegralNumberValue.java b/community/values/src/main/java/org/neo4j/values/DirectIntegralNumber.java similarity index 82% rename from community/values/src/main/java/org/neo4j/values/IntegralNumberValue.java rename to community/values/src/main/java/org/neo4j/values/DirectIntegralNumber.java index 17cb44811fa54..fbf82e3ff30b7 100644 --- a/community/values/src/main/java/org/neo4j/values/IntegralNumberValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectIntegralNumber.java @@ -19,7 +19,7 @@ */ package org.neo4j.values; -abstract class IntegralNumberValue extends ScalarValue implements ValueGroup.VInteger +abstract class DirectIntegralNumber extends DirectScalar implements ValueGroup.VInteger { @Override public final int hashCode() @@ -36,14 +36,14 @@ public boolean equals( Object other ) @Override public final boolean equals( Value other ) { - if ( other instanceof IntegralNumberValue ) + if ( other instanceof DirectIntegralNumber ) { - IntegralNumberValue that = (IntegralNumberValue) other; + DirectIntegralNumber that = (DirectIntegralNumber) other; return this.longValue() == that.longValue(); } - else if ( other instanceof FloatingPointNumberValue ) + else if ( other instanceof DirectFloatingPointNumber ) { - FloatingPointNumberValue that = (FloatingPointNumberValue) other; + DirectFloatingPointNumber that = (DirectFloatingPointNumber) other; return NumberValues.numbersEqual( that.doubleValue(), this.longValue() ); } else diff --git a/community/values/src/main/java/org/neo4j/values/LongValue.java b/community/values/src/main/java/org/neo4j/values/DirectLong.java similarity index 94% rename from community/values/src/main/java/org/neo4j/values/LongValue.java rename to community/values/src/main/java/org/neo4j/values/DirectLong.java index 2f8d894e5e7d2..90ed00e743a0e 100644 --- a/community/values/src/main/java/org/neo4j/values/LongValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectLong.java @@ -21,11 +21,11 @@ import static java.lang.String.format; -final class LongValue extends IntegralNumberValue +final class DirectLong extends DirectIntegralNumber { private final long value; - LongValue( long value ) + DirectLong( long value ) { this.value = value; } diff --git a/community/values/src/main/java/org/neo4j/values/LongArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectLongArray.java similarity index 96% rename from community/values/src/main/java/org/neo4j/values/LongArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectLongArray.java index 8e76f6b90c93b..923e0c3c268cc 100644 --- a/community/values/src/main/java/org/neo4j/values/LongArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectLongArray.java @@ -23,11 +23,11 @@ import static java.lang.String.format; -class LongArrayValue extends IntegralArrayValue +final class DirectLongArray extends DirectIntegralArray { private final long[] value; - LongArrayValue( long[] value ) + DirectLongArray( long[] value ) { assert value != null; this.value = value; diff --git a/community/values/src/main/java/org/neo4j/values/ScalarValue.java b/community/values/src/main/java/org/neo4j/values/DirectScalar.java similarity index 97% rename from community/values/src/main/java/org/neo4j/values/ScalarValue.java rename to community/values/src/main/java/org/neo4j/values/DirectScalar.java index 3ba110f5a8c8c..c32d093d59313 100644 --- a/community/values/src/main/java/org/neo4j/values/ScalarValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectScalar.java @@ -19,7 +19,7 @@ */ package org.neo4j.values; -abstract class ScalarValue extends Value +abstract class DirectScalar extends Value { @Override boolean equals( byte[] x ) diff --git a/community/values/src/main/java/org/neo4j/values/ShortValue.java b/community/values/src/main/java/org/neo4j/values/DirectShort.java similarity index 95% rename from community/values/src/main/java/org/neo4j/values/ShortValue.java rename to community/values/src/main/java/org/neo4j/values/DirectShort.java index 9b34a2cf74826..84717639ade16 100644 --- a/community/values/src/main/java/org/neo4j/values/ShortValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectShort.java @@ -25,11 +25,11 @@ * This does not extend AbstractProperty since the JVM can take advantage of the 4 byte initial field alignment if * we don't extend a class that has fields. */ -final class ShortValue extends IntegralNumberValue +final class DirectShort extends DirectIntegralNumber { private final short value; - ShortValue( short value ) + DirectShort( short value ) { this.value = value; } diff --git a/community/values/src/main/java/org/neo4j/values/ShortArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectShortArray.java similarity index 95% rename from community/values/src/main/java/org/neo4j/values/ShortArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectShortArray.java index baf5f9496f706..e703ab93c9347 100644 --- a/community/values/src/main/java/org/neo4j/values/ShortArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectShortArray.java @@ -23,11 +23,11 @@ import static java.lang.String.format; -class ShortArrayValue extends IntegralArrayValue +final class DirectShortArray extends DirectIntegralArray { private final short[] value; - ShortArrayValue( short[] value ) + DirectShortArray( short[] value ) { assert value != null; this.value = value; diff --git a/community/values/src/main/java/org/neo4j/values/StringValue.java b/community/values/src/main/java/org/neo4j/values/DirectString.java similarity index 94% rename from community/values/src/main/java/org/neo4j/values/StringValue.java rename to community/values/src/main/java/org/neo4j/values/DirectString.java index 24072a2deaad7..f1d07c954035b 100644 --- a/community/values/src/main/java/org/neo4j/values/StringValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectString.java @@ -21,11 +21,11 @@ import static java.lang.String.format; -final class StringValue extends ScalarValue implements ValueGroup.VText +final class DirectString extends DirectScalar implements ValueGroup.VText { final String string; - StringValue( String string ) + DirectString( String string ) { assert string != null; this.string = string; diff --git a/community/values/src/main/java/org/neo4j/values/StringArrayValue.java b/community/values/src/main/java/org/neo4j/values/DirectStringArray.java similarity index 95% rename from community/values/src/main/java/org/neo4j/values/StringArrayValue.java rename to community/values/src/main/java/org/neo4j/values/DirectStringArray.java index 221638c8084c9..81e2c45819848 100644 --- a/community/values/src/main/java/org/neo4j/values/StringArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/DirectStringArray.java @@ -23,11 +23,11 @@ import static java.lang.String.format; -class StringArrayValue extends ArrayValue +final class DirectStringArray extends ArrayValue { final String[] value; - StringArrayValue( String[] value ) + DirectStringArray( String[] value ) { assert value != null; this.value = value; @@ -128,7 +128,7 @@ public String toString() return format( "StringArray(%s)", Arrays.toString( value ) ); } - public int compareTo( StringArrayValue other ) + public int compareTo( DirectStringArray other ) { int i = 0; int x = value.length - other.value.length; diff --git a/community/values/src/main/java/org/neo4j/values/LazyArrayValue.java b/community/values/src/main/java/org/neo4j/values/LazyArrayValue.java index 4a2a7102bd3ce..b79c31788ca87 100644 --- a/community/values/src/main/java/org/neo4j/values/LazyArrayValue.java +++ b/community/values/src/main/java/org/neo4j/values/LazyArrayValue.java @@ -238,7 +238,7 @@ void writeTo( Object value, ValueWriter writer ) @Override int hashCode( Object array ) { - return BooleanArrayValue.hash( (boolean[]) array ); + return DirectBooleanArray.hash( (boolean[]) array ); } @Override diff --git a/community/values/src/main/java/org/neo4j/values/ValueComparator.java b/community/values/src/main/java/org/neo4j/values/ValueComparator.java index f2fb1520abf7b..b5a7cb4869ea4 100644 --- a/community/values/src/main/java/org/neo4j/values/ValueComparator.java +++ b/community/values/src/main/java/org/neo4j/values/ValueComparator.java @@ -51,22 +51,22 @@ public int compare( Value o1, Value o2 ) return x; case BOOLEAN: - return ((BooleanValue) o1).compareTo( (BooleanValue) o2 ); + return ((DirectBoolean) o1).compareTo( (DirectBoolean) o2 ); case NUMBER: return compareScalarNumbers( o1, o2 ); case STRING: - return ((StringValue) o1).compareTo( (StringValue) o2 ); + return ((DirectString) o1).compareTo( (DirectString) o2 ); case BOOLEAN_ARR: - return ((BooleanArrayValue) o1).compareTo( (BooleanArrayValue) o2 ); + return ((DirectBooleanArray) o1).compareTo( (DirectBooleanArray) o2 ); case NUMBER_ARR: return compareNumberArrays( o1, o2 ); case STRING_ARR: - return ((StringArrayValue) o1).compareTo( (StringArrayValue) o2 ); + return ((DirectStringArray) o1).compareTo( (DirectStringArray) o2 ); default: throw new UnsupportedOperationException( format( "Unknown semantic type '%s'", semType1 ) ); @@ -81,7 +81,7 @@ private Values.SemanticType semanticType( Value value ) { return Values.SemanticType.NO_VALUE; } - if ( value instanceof StringValue ) + if ( value instanceof DirectString ) { return Values.SemanticType.STRING; } @@ -89,19 +89,19 @@ private Values.SemanticType semanticType( Value value ) { return Values.SemanticType.NUMBER; } - if ( value instanceof BooleanValue ) + if ( value instanceof DirectBoolean ) { return Values.SemanticType.BOOLEAN; } - if ( value instanceof StringArrayValue ) + if ( value instanceof DirectStringArray ) { return Values.SemanticType.STRING_ARR; } - if ( value instanceof IntegralArrayValue || value instanceof FloatingPointArrayValue ) + if ( value instanceof DirectIntegralArray || value instanceof DirectFloatingPointArray ) { return Values.SemanticType.NUMBER_ARR; } - if ( value instanceof BooleanArrayValue ) + if ( value instanceof DirectBooleanArray ) { return Values.SemanticType.BOOLEAN_ARR; } @@ -112,51 +112,51 @@ private Values.SemanticType semanticType( Value value ) private int compareScalarNumbers( Value o1, Value o2 ) { - boolean isInt1 = o1 instanceof IntegralNumberValue; - boolean isInt2 = o2 instanceof IntegralNumberValue; + boolean isInt1 = o1 instanceof DirectIntegralNumber; + boolean isInt2 = o2 instanceof DirectIntegralNumber; if ( isInt1 ) { if ( isInt2 ) { - return ((IntegralNumberValue) o1).compareTo( (IntegralNumberValue) o2 ); + return ((DirectIntegralNumber) o1).compareTo( (DirectIntegralNumber) o2 ); } else { - return ((IntegralNumberValue) o1).compareTo( (FloatingPointNumberValue) o2 ); + return ((DirectIntegralNumber) o1).compareTo( (DirectFloatingPointNumber) o2 ); } } if ( isInt2 ) { - return ((FloatingPointNumberValue) o1).compareTo( (IntegralNumberValue) o2 ); + return ((DirectFloatingPointNumber) o1).compareTo( (DirectIntegralNumber) o2 ); } else { - return ((FloatingPointNumberValue) o1).compareTo( (FloatingPointNumberValue) o2 ); + return ((DirectFloatingPointNumber) o1).compareTo( (DirectFloatingPointNumber) o2 ); } } private int compareNumberArrays( Value o1, Value o2 ) { - boolean isInt1 = o1 instanceof IntegralArrayValue; - boolean isInt2 = o2 instanceof IntegralArrayValue; + boolean isInt1 = o1 instanceof DirectIntegralArray; + boolean isInt2 = o2 instanceof DirectIntegralArray; if ( isInt1 ) { if ( isInt2 ) { - return ((IntegralArrayValue) o1).compareTo( (IntegralArrayValue) o2 ); + return ((DirectIntegralArray) o1).compareTo( (DirectIntegralArray) o2 ); } else { - return ((IntegralArrayValue) o1).compareTo( (FloatingPointArrayValue) o2 ); + return ((DirectIntegralArray) o1).compareTo( (DirectFloatingPointArray) o2 ); } } if ( isInt2 ) { - return ((FloatingPointArrayValue) o1).compareTo( (IntegralArrayValue) o2 ); + return ((DirectFloatingPointArray) o1).compareTo( (DirectIntegralArray) o2 ); } else { - return ((FloatingPointArrayValue) o1).compareTo( (FloatingPointArrayValue) o2 ); + return ((DirectFloatingPointArray) o1).compareTo( (DirectFloatingPointArray) o2 ); } } diff --git a/community/values/src/main/java/org/neo4j/values/Values.java b/community/values/src/main/java/org/neo4j/values/Values.java index 880e0acb1386d..5ee986b2fb88b 100644 --- a/community/values/src/main/java/org/neo4j/values/Values.java +++ b/community/values/src/main/java/org/neo4j/values/Values.java @@ -22,6 +22,7 @@ import java.lang.reflect.Array; import java.util.concurrent.Callable; +@SuppressWarnings( "WeakerAccess" ) class Values { private Values() @@ -32,7 +33,7 @@ private Values() public static Value stringValue( String value ) { - return new StringValue( value ); + return new DirectString( value ); } public static Value lazyStringValue( Callable producer ) @@ -77,87 +78,87 @@ public static Value numberValue( Number number ) public static Value longValue( long value ) { - return new LongValue( value ); + return new DirectLong( value ); } public static Value intValue( int value ) { - return new IntValue( value ); + return new DirectInt( value ); } public static Value shortValue( short value ) { - return new ShortValue( value ); + return new DirectShort( value ); } public static Value byteValue( byte value ) { - return new ByteValue( value ); + return new DirectByte( value ); } public static Value booleanValue( boolean value ) { - return new BooleanValue( value ); + return new DirectBoolean( value ); } public static Value charValue( char value ) { - return new CharValue( value ); + return new DirectChar( value ); } public static Value doubleValue( double value ) { - return new DoubleValue( value ); + return new DirectDouble( value ); } public static Value floatValue( float value ) { - return new FloatValue( value ); + return new DirectFloat( value ); } public static Value stringArrayValue( String[] value ) { - return new StringArrayValue( value ); + return new DirectStringArray( value ); } public static Value byteArrayValue( byte[] value ) { - return new ByteArrayValue( value ); + return new DirectByteArray( value ); } public static Value longArrayValue( long[] value ) { - return new LongArrayValue( value ); + return new DirectLongArray( value ); } public static Value intArrayValue( int[] value ) { - return new IntArrayValue( value ); + return new DirectIntArray( value ); } public static Value doubleArrayValue( double[] value ) { - return new DoubleArrayValue( value ); + return new DirectDoubleArray( value ); } public static Value floatArrayValue( float[] value ) { - return new FloatArrayValue( value ); + return new DirectFloatArray( value ); } public static Value booleanArrayValue( boolean[] value ) { - return new BooleanArrayValue( value ); + return new DirectBooleanArray( value ); } public static Value charArrayValue( char[] value ) { - return new CharArrayValue( value ); + return new DirectCharArray( value ); } public static Value shortArrayValue( short[] value ) { - return new ShortArrayValue( value ); + return new DirectShortArray( value ); } // BOXED FACTORY METHODS