Added Value.prettyPrint()

neo4j · Jun 15, 2017 · af5e611 · af5e611
1 parent 7757bd8
commit af5e611
Show file tree

Hide file tree

Showing 22 changed files with 137 additions and 59 deletions.
diff --git a/...rnel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java b/...rnel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java
@@ -154,55 +154,8 @@ private String propertyString( TokenNameLookup tokenNameLookup, int[] propertyId
             sb.append( '`' );
             sb.append( tokenNameLookup.propertyKeyGetName( propertyIds[i] ) );
             sb.append( "` = " );
-            sb.append( quote( propertyValues.valueAt( i ).asPublic() ) );
+            sb.append( propertyValues.valueAt( i ).prettyPrint() );
         }
         return sb.toString();
     }
-
-    private static String quote( Object propertyValue )
-    {
-        if ( propertyValue instanceof String )
-        {
-            return format( "'%s'", propertyValue );
-        }
-        else if ( propertyValue.getClass().isArray() )
-        {
-            Class<?> type = propertyValue.getClass().getComponentType();
-            if ( type == Boolean.TYPE )
-            {
-                return Arrays.toString( (boolean[]) propertyValue );
-            }
-            else if ( type == Byte.TYPE )
-            {
-                return Arrays.toString( (byte[]) propertyValue );
-            }
-            else if ( type == Short.TYPE )
-            {
-                return Arrays.toString( (short[]) propertyValue );
-            }
-            else if ( type == Character.TYPE )
-            {
-                return Arrays.toString( (char[]) propertyValue );
-            }
-            else if ( type == Integer.TYPE )
-            {
-                return Arrays.toString( (int[]) propertyValue );
-            }
-            else if ( type == Long.TYPE )
-            {
-                return Arrays.toString( (long[]) propertyValue );
-            }
-            else if ( type == Float.TYPE )
-            {
-                return Arrays.toString( (float[]) propertyValue );
-            }
-            else if ( type == Double.TYPE )
-            {
-                return Arrays.toString( (double[]) propertyValue );
-            }
-            return Arrays.toString( (Object[]) propertyValue );
-        }
-        return valueOf( propertyValue );
-    }
-
 }
diff --git a/community/values/src/main/java/org/neo4j/values/BooleanArray.java b/community/values/src/main/java/org/neo4j/values/BooleanArray.java
@@ -145,6 +145,12 @@ public NumberType numberType()
         return NumberType.NO_NUMBER;
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Arrays.toString( value() );
+    }
+
     static final class Direct extends BooleanArray
     {
         private final boolean[] value;

diff --git a/community/values/src/main/java/org/neo4j/values/BooleanValue.java b/community/values/src/main/java/org/neo4j/values/BooleanValue.java
@@ -27,11 +27,11 @@
  */
 final class BooleanValue extends ScalarValue
 {
-    private final boolean bool;
+    private final boolean value;
 
-    BooleanValue( boolean bool )
+    BooleanValue( boolean value )
     {
-        this.bool = bool;
+        this.value = value;
     }
 
     @Override
@@ -43,13 +43,13 @@ public boolean equals( Object other )
     @Override
     public boolean equals( Value other )
     {
-        return other.equals( bool );
+        return other.equals( value );
     }
 
     @Override
     public boolean equals( boolean x )
     {
-        return bool == x;
+        return value == x;
     }
 
     @Override
@@ -67,35 +67,41 @@ public boolean equals( String x )
     @Override
     public int hashCode()
     {
-        return bool ? -1 : 0;
+        return value ? -1 : 0;
     }
 
     public boolean booleanValue()
     {
-        return bool;
+        return value;
     }
 
     public int compareTo( BooleanValue other )
     {
-        return Boolean.compare( bool, other.booleanValue() );
+        return Boolean.compare( value, other.booleanValue() );
     }
 
     @Override
     public void writeTo( ValueWriter writer )
     {
-        writer.writeBoolean( bool );
+        writer.writeBoolean( value );
     }
 
     @Override
     public Object asPublic()
     {
-        return bool;
+        return value;
+    }
+
+    @Override
+    public String prettyPrint()
+    {
+        return Boolean.toString( value );
     }
 
     @Override
     public String toString()
     {
-        return format( "Boolean('%s')", Boolean.toString( bool ) );
+        return format( "Boolean('%s')", Boolean.toString( value ) );
     }
 
     public ValueGroup valueGroup()

diff --git a/community/values/src/main/java/org/neo4j/values/ByteArray.java b/community/values/src/main/java/org/neo4j/values/ByteArray.java
@@ -112,6 +112,12 @@ public Object asLegacyObject()
         return value();
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Arrays.toString( value() );
+    }
+
     static final class Direct extends ByteArray
     {
         final byte[] value;

diff --git a/community/values/src/main/java/org/neo4j/values/ByteValue.java b/community/values/src/main/java/org/neo4j/values/ByteValue.java
@@ -70,6 +70,12 @@ public Object asPublic()
         return value;
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Byte.toString( value );
+    }
+
     @Override
     public String toString()
     {

diff --git a/community/values/src/main/java/org/neo4j/values/CharArray.java b/community/values/src/main/java/org/neo4j/values/CharArray.java
@@ -95,6 +95,12 @@ public Object asLegacyObject()
         return value();
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Arrays.toString( value() );
+    }
+
     static final class Direct extends CharArray
     {
         final char[] value;

diff --git a/community/values/src/main/java/org/neo4j/values/CharValue.java b/community/values/src/main/java/org/neo4j/values/CharValue.java
@@ -78,6 +78,12 @@ public Object asPublic()
         return value;
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return format( "'%s'", value );
+    }
+
     @Override
     public String stringValue()
     {

diff --git a/community/values/src/main/java/org/neo4j/values/DoubleArray.java b/community/values/src/main/java/org/neo4j/values/DoubleArray.java
@@ -112,6 +112,12 @@ public Object asLegacyObject()
         return value();
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Arrays.toString( value() );
+    }
+
     static final class Direct extends DoubleArray
     {
         final double[] value;

diff --git a/community/values/src/main/java/org/neo4j/values/DoubleValue.java b/community/values/src/main/java/org/neo4j/values/DoubleValue.java
@@ -66,6 +66,12 @@ public Object asPublic()
         return value;
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Double.toString( value );
+    }
+
     @Override
     public String toString()
     {

diff --git a/community/values/src/main/java/org/neo4j/values/FloatArray.java b/community/values/src/main/java/org/neo4j/values/FloatArray.java
@@ -112,6 +112,12 @@ public Object asLegacyObject()
         return value();
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Arrays.toString( value() );
+    }
+
     static final class Direct extends FloatArray
     {
         final float[] value;

diff --git a/community/values/src/main/java/org/neo4j/values/FloatValue.java b/community/values/src/main/java/org/neo4j/values/FloatValue.java
@@ -66,6 +66,12 @@ public Object asPublic()
         return value;
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Float.toString( value );
+    }
+
     @Override
     public String toString()
     {

diff --git a/community/values/src/main/java/org/neo4j/values/IntArray.java b/community/values/src/main/java/org/neo4j/values/IntArray.java
@@ -112,6 +112,12 @@ public Object asLegacyObject()
         return value();
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Arrays.toString( value() );
+    }
+
     static final class Direct extends IntArray
     {
         final int[] value;

diff --git a/community/values/src/main/java/org/neo4j/values/IntValue.java b/community/values/src/main/java/org/neo4j/values/IntValue.java
@@ -48,6 +48,12 @@ public Object asPublic()
         return value;
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Integer.toString( value );
+    }
+
     @Override
     public String toString()
     {

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,6 +105,12 @@ public Object asPublic()
         return value().clone();
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Arrays.toString( value() );
+    }
+
     @Override
     @Deprecated
     public Object asLegacyObject()

diff --git a/community/values/src/main/java/org/neo4j/values/LongValue.java b/community/values/src/main/java/org/neo4j/values/LongValue.java
@@ -66,6 +66,12 @@ public Object asPublic()
         return value;
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Long.toString( value );
+    }
+
     @Override
     public String toString()
     {

diff --git a/community/values/src/main/java/org/neo4j/values/NoValue.java b/community/values/src/main/java/org/neo4j/values/NoValue.java
@@ -136,6 +136,12 @@ public Object asPublic()
         return null;
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return "NO_VALUE";
+    }
+
     public ValueGroup valueGroup()
     {
         return ValueGroup.NO_VALUE;

diff --git a/community/values/src/main/java/org/neo4j/values/ShortArray.java b/community/values/src/main/java/org/neo4j/values/ShortArray.java
@@ -112,6 +112,12 @@ public Object asLegacyObject()
         return value();
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Arrays.toString( value() );
+    }
+
     static final class Direct extends ShortArray
     {
         final short[] value;

diff --git a/community/values/src/main/java/org/neo4j/values/ShortValue.java b/community/values/src/main/java/org/neo4j/values/ShortValue.java
@@ -70,6 +70,12 @@ public Object asPublic()
         return value;
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Short.toString( value );
+    }
+
     @Override
     public String toString()
     {

diff --git a/community/values/src/main/java/org/neo4j/values/StringArray.java b/community/values/src/main/java/org/neo4j/values/StringArray.java
@@ -93,6 +93,12 @@ public int compareTo( TextArray other )
         return TextValues.compareTextArrays( this, other );
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return Arrays.toString( value() );
+    }
+
     static final class Direct extends StringArray
     {
         final String[] value;

diff --git a/community/values/src/main/java/org/neo4j/values/StringValue.java b/community/values/src/main/java/org/neo4j/values/StringValue.java
@@ -85,6 +85,12 @@ public String stringValue()
         return value();
     }
 
+    @Override
+    public String prettyPrint()
+    {
+        return format( "'%s'", value() );
+    }
+
     static final class Direct extends StringValue
     {
         final String value;

diff --git a/community/values/src/main/java/org/neo4j/values/Value.java b/community/values/src/main/java/org/neo4j/values/Value.java
@@ -75,6 +75,11 @@ public Object asLegacyObject()
         return asPublic();
     }
 
+    /**
+     * Returns a json-like string representation of the current value.
+     */
+    public abstract String prettyPrint();
+
     public abstract ValueGroup valueGroup();
 
     public abstract NumberType numberType();

diff --git a/community/values/src/test/java/org/neo4j/values/MyVirtualValue.java b/community/values/src/test/java/org/neo4j/values/MyVirtualValue.java
@@ -50,4 +50,10 @@ public Object asPublic()
     {
         return this;
     }
+
+    @Override
+    public String prettyPrint()
+    {
+        return null;
+    }
 }