Move all value creation one step down

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorePropertyPayloadCursor.java

@@ -31,6 +31,14 @@
 import org.neo4j.kernel.impl.store.record.Record;
 import org.neo4j.kernel.impl.util.Bits;
 import org.neo4j.string.UTF8;
+import org.neo4j.values.storable.BooleanValue;
+import org.neo4j.values.storable.ByteValue;
+import org.neo4j.values.storable.CharValue;
+import org.neo4j.values.storable.DoubleValue;
+import org.neo4j.values.storable.FloatValue;
+import org.neo4j.values.storable.IntValue;
+import org.neo4j.values.storable.LongValue;
+import org.neo4j.values.storable.ShortValue;
 import org.neo4j.values.storable.TextValue;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;
@@ -136,60 +144,60 @@ int propertyKeyId()
         return PropertyBlock.keyIndexId( currentHeader() );
     }
 
-    boolean booleanValue()
+    private BooleanValue booleanValue()
     {
         assertOfType( BOOL );
-        return PropertyBlock.fetchByte( currentHeader() ) == 1;
+        return Values.booleanValue( PropertyBlock.fetchByte( currentHeader() ) == 1 );
     }
 
-    byte byteValue()
+    private ByteValue byteValue()
     {
         assertOfType( BYTE );
-        return PropertyBlock.fetchByte( currentHeader() );
+        return Values.byteValue( PropertyBlock.fetchByte( currentHeader() ) );
     }
 
-    short shortValue()
+    private ShortValue shortValue()
     {
         assertOfType( SHORT );
-        return PropertyBlock.fetchShort( currentHeader() );
+        return Values.shortValue( PropertyBlock.fetchShort( currentHeader() ) );
     }
 
-    char charValue()
+    private CharValue charValue()
     {
         assertOfType( CHAR );
-        return (char) PropertyBlock.fetchShort( currentHeader() );
+        return Values.charValue( (char) PropertyBlock.fetchShort( currentHeader() ) );
     }
 
-    int intValue()
+    private IntValue intValue()
     {
         assertOfType( INT );
-        return PropertyBlock.fetchInt( currentHeader() );
+        return Values.intValue( PropertyBlock.fetchInt( currentHeader() ) );
     }
 
-    float floatValue()
+    private FloatValue floatValue()
     {
         assertOfType( FLOAT );
-        return Float.intBitsToFloat( PropertyBlock.fetchInt( currentHeader() ) );
+        return Values.floatValue( Float.intBitsToFloat( PropertyBlock.fetchInt( currentHeader() ) ) );
     }
 
-    long longValue()
+    private LongValue longValue()
     {
         assertOfType( LONG );
         if ( PropertyBlock.valueIsInlined( currentHeader() ) )
         {
-            return PropertyBlock.fetchLong( currentHeader() ) >>> 1;
+            return Values.longValue( PropertyBlock.fetchLong( currentHeader() ) >>> 1 );
         }
 
-        return data[position + 1];
+        return Values.longValue( data[position + 1] );
     }
 
-    double doubleValue()
+    private DoubleValue doubleValue()
     {
         assertOfType( DOUBLE );
-        return Double.longBitsToDouble( data[position + 1] );
+        return Values.doubleValue( Double.longBitsToDouble( data[position + 1] ) );
     }
 
-    TextValue shortStringValue()
+    private TextValue shortStringValue()
     {
         assertOfType( SHORT_STRING );
         return LongerShortString.decode( data, position, currentBlocksUsed() );
@@ -203,7 +211,7 @@ TextValue stringValue()
         return Values.stringValue( UTF8.decode( buffer.array(), 0, buffer.limit() ) );
     }
 
-    Value shortArrayValue()
+    private Value shortArrayValue()
     {
         assertOfType( SHORT_ARRAY );
         Bits bits = valueAsBits();
@@ -223,21 +231,21 @@ Value value()
         switch ( type() )
         {
         case BOOL:
-            return Values.booleanValue( booleanValue() );
+            return booleanValue();
         case BYTE:
-            return Values.byteValue( byteValue() );
+            return byteValue();
         case SHORT:
-            return Values.shortValue( shortValue() );
+            return shortValue();
         case CHAR:
-            return Values.charValue( charValue() );
+            return charValue();
         case INT:
-            return Values.intValue( intValue() );
+            return intValue();
         case LONG:
-            return Values.longValue( longValue() );
+            return longValue();
         case FLOAT:
-            return Values.floatValue( floatValue() );
+            return floatValue();
         case DOUBLE:
-            return Values.doubleValue( doubleValue() );
+            return doubleValue();
         case SHORT_STRING:
             return shortStringValue();
         case STRING: