Adding error check of unsupported types

Author: Zhen Li

driver/src/main/java/org/neo4j/driver/v1/Values.java

@@ -49,8 +49,11 @@
 import org.neo4j.driver.internal.value.LocalDateTimeValue;
 import org.neo4j.driver.internal.value.LocalTimeValue;
 import org.neo4j.driver.internal.value.MapValue;
+import org.neo4j.driver.internal.value.NodeValue;
 import org.neo4j.driver.internal.value.NullValue;
+import org.neo4j.driver.internal.value.PathValue;
 import org.neo4j.driver.internal.value.PointValue;
+import org.neo4j.driver.internal.value.RelationshipValue;
 import org.neo4j.driver.internal.value.StringValue;
 import org.neo4j.driver.internal.value.TimeValue;
 import org.neo4j.driver.v1.exceptions.ClientException;
@@ -91,6 +94,10 @@ public static Value value( Object value )
     {
         if ( value == null ) { return NullValue.NULL; }
 
+        if ( value instanceof NodeValue || value instanceof RelationshipValue || value instanceof PathValue )
+        {
+            throw new ClientException( "Unsupported param type " + ((AsValue) value).asValue().type().name() );
+        }
         if ( value instanceof AsValue ) { return ((AsValue) value).asValue(); }
         if ( value instanceof Boolean ) { return value( (boolean) value ); }
         if ( value instanceof String ) { return value( (String) value ); }

driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java

@@ -46,6 +46,9 @@
 import org.neo4j.driver.internal.value.LocalDateTimeValue;
 import org.neo4j.driver.internal.value.LocalTimeValue;
 import org.neo4j.driver.internal.value.MapValue;
+import org.neo4j.driver.internal.value.NodeValue;
+import org.neo4j.driver.internal.value.PathValue;
+import org.neo4j.driver.internal.value.RelationshipValue;
 import org.neo4j.driver.internal.value.TimeValue;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
@@ -60,6 +63,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThat;
+import static org.neo4j.driver.internal.value.NodeValueTest.emptyNodeValue;
+import static org.neo4j.driver.internal.value.PathValueTest.pathValue;
+import static org.neo4j.driver.internal.value.RelationshipValueTest.emptyRelationshipValue;
 import static org.neo4j.driver.v1.Values.isoDuration;
 import static org.neo4j.driver.v1.Values.ofDouble;
 import static org.neo4j.driver.v1.Values.ofFloat;
@@ -483,4 +489,40 @@ public void shouldCreateValueFromPoint3D()
         assertEquals( point3D, point3DValue2.asPoint() );
         assertEquals( point3DValue1, point3DValue2 );
     }
+
+    @Test
+    public void shouldComplainAboutNodeType() throws Throwable
+    {
+        // Expect
+        exception.expect( ClientException.class );
+        exception.expectMessage( "Unsupported param type NODE" );
+
+        // When
+        NodeValue node = emptyNodeValue();
+        value( node );
+    }
+
+    @Test
+    public void shouldComplainAboutRelationshipType() throws Throwable
+    {
+        // Expect
+        exception.expect( ClientException.class );
+        exception.expectMessage( "Unsupported param type RELATIONSHIP" );
+
+        // When
+        RelationshipValue rel = emptyRelationshipValue();
+        value( rel );
+    }
+
+    @Test
+    public void shouldComplainAboutPathType() throws Throwable
+    {
+        // Expect
+        exception.expect( ClientException.class );
+        exception.expectMessage( "Unsupported param type PATH" );
+
+        // When
+        PathValue path = pathValue();
+        value( path );
+    }
 }

driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java

@@ -70,12 +70,12 @@ public void shouldTypeAsNode()
         assertThat( value.typeConstructor(), equalTo( TypeConstructor.NODE ) );
     }
 
-    private NodeValue emptyNodeValue()
+    public static NodeValue emptyNodeValue()
     {
         return new NodeValue( new InternalNode( 1234, singletonList( "User" ), new HashMap<String, Value>() ) );
     }
 
-    private NodeValue filledNodeValue()
+    private static NodeValue filledNodeValue()
     {
         return new NodeValue( new InternalNode( 1234, singletonList( "User" ), singletonMap( "name", value( "Dodo" ) ) ) );
     }

driver/src/test/java/org/neo4j/driver/internal/value/PathValueTest.java

@@ -54,7 +54,7 @@ public void shouldHaveCorrectType() throws Throwable
         assertThat(pathValue().type(), equalTo( InternalTypeSystem.TYPE_SYSTEM.PATH() ));
     }
 
-    private PathValue pathValue()
+    public static PathValue pathValue()
     {
         return new PathValue( new InternalPath( new InternalNode(42L), new InternalRelationship( 43L, 42L, 44L, "T" ), new InternalNode( 44L ) ) );
     }

driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java

@@ -61,12 +61,12 @@ public void shouldTypeAsRelationship()
         assertThat( value.typeConstructor(), equalTo( TypeConstructor.RELATIONSHIP ) );
     }
 
-    private RelationshipValue emptyRelationshipValue()
+    public static RelationshipValue emptyRelationshipValue()
     {
         return new RelationshipValue( new InternalRelationship( 1234, 1, 2, "KNOWS" ) );
     }
 
-    private RelationshipValue filledRelationshipValue()
+    private static RelationshipValue filledRelationshipValue()
     {
         return new RelationshipValue( new InternalRelationship( 1234, 1, 2, "KNOWS", singletonMap( "name", value( "Dodo" ) ) ) );
     }