toString should not show type

pontusmelke · pontusmelke · commit 620e26faa742 · 2016-01-04T12:55:46.000+01:00
diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java b/driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java
@@ -40,6 +40,7 @@
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 
+import static org.neo4j.driver.internal.value.InternalValue.Format.VALUE_ONLY;
 import static org.neo4j.driver.internal.value.InternalValue.Format.VALUE_WITH_TYPE;
 import static org.neo4j.driver.v1.Values.valueAsIs;
 
@@ -315,7 +316,7 @@ public <V> Iterable<Pair<String, V>> properties( final Function<Value, V> mapFun
 
     public String toString()
     {
-        return toString( VALUE_WITH_TYPE );
+        return toString( VALUE_ONLY );
     }
 
     protected String maybeWithType( boolean includeType, String text )
diff --git a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java b/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java
@@ -157,7 +157,7 @@ public void shouldMapDriverMapsToJavaMaps() throws Throwable
 
         // Then
         assertThat( result.size(), equalTo( 2 ) );
-        assertThat( result.get( "Dog" ), equalTo( "2 :: INTEGER" ) );
-        assertThat( result.get( "Cat" ), equalTo( "1 :: INTEGER" ) );
+        assertThat( result.get( "Dog" ), equalTo( "2" ) );
+        assertThat( result.get( "Cat" ), equalTo( "1" ) );
     }
 }
diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java
@@ -72,7 +72,7 @@ public void shouldLogRunMessage() throws Throwable
         handler.handleRunMessage( "stat", parameters( "value", new String[]{"cat", "cat", "cat"} ) );
 
         // Then
-        assertEquals( "S: [RUN \"stat\" {value=[\"cat\", \"cat\", \"cat\"] :: LIST OF ANY?}]", log );
+        assertEquals( "S: [RUN \"stat\" {value=[\"cat\", \"cat\", \"cat\"]}]", log );
         assertEquals( format( new RunMessage( "stat", parameters( "value", new String[]{"cat", "cat", "cat"} ) ) ),
                 log );
     }
diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/ListValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/ListValueTest.java
@@ -34,7 +34,7 @@ public class ListValueTest
     public void shouldHaveSensibleToString() throws Throwable
     {
         ListValue listValue = listValue( value( 1 ), value( 2 ), value( 3 ) );
-        assertThat( listValue.toString(), equalTo( "[1, 2, 3] :: LIST OF ANY?" ) );
+        assertThat( listValue.toString(), equalTo( "[1, 2, 3]" ) );
     }
 
     @Test
diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/MapValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/MapValueTest.java
@@ -37,7 +37,7 @@ public class MapValueTest
     public void shouldHaveSensibleToString() throws Throwable
     {
         MapValue mapValue = mapValue();
-        assertThat( mapValue.toString(), equalTo( "{k1: \"v1\", k2: 42} :: MAP" ) );
+        assertThat( mapValue.toString(), equalTo( "{k1: \"v1\", k2: 42}" ) );
     }
 
     @Test
diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java
@@ -42,8 +42,8 @@ public class NodeValueTest
     @Test
     public void shouldHaveSensibleToString() throws Throwable
     {
-        assertEquals( "node<#1234> :: NODE", emptyNodeValue().toString() );
-        assertEquals( "node<#1234> :: NODE", filledNodeValue().toString() );
+        assertEquals( "node<#1234>", emptyNodeValue().toString() );
+        assertEquals( "node<#1234>", filledNodeValue().toString() );
     }
 
     @Test
diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/PathValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/PathValueTest.java
@@ -36,7 +36,7 @@ public class PathValueTest
     @Test
     public void shouldHaveSensibleToString() throws Throwable
     {
-        assertEquals("path[(#42)-[#43:T]->(#44)] :: PATH", pathValue().toString());
+        assertEquals("path[(#42)-[#43:T]->(#44)]", pathValue().toString());
     }
 
     @Test
diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java
@@ -38,8 +38,8 @@ public class RelationshipValueTest
     @Test
     public void shouldHaveSensibleToString() throws Throwable
     {
-        assertEquals( "relationship<#1234> :: RELATIONSHIP", emptyRelationshipValue().toString() );
-        assertEquals( "relationship<#1234> :: RELATIONSHIP", filledRelationshipValue().toString() );
+        assertEquals( "relationship<#1234>", emptyRelationshipValue().toString() );
+        assertEquals( "relationship<#1234>", filledRelationshipValue().toString() );
     }
 
     @Test
diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/ExamplesIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/ExamplesIT.java
@@ -182,7 +182,7 @@ public void resultCursor() throws Throwable
         }
 
         // Then
-        assertThat( stdIO.stdout(), equalTo( asList("Record: 0","  p.age = 23 :: INTEGER") ) );
+        assertThat( stdIO.stdout(), equalTo( asList("Record: 0","  p.age = 23") ) );
     }
 
     @Test
@@ -244,7 +244,7 @@ public void retainResultsForNestedQuerying() throws Throwable
         }
 
         // Then
-        assertThat( stdIO.stdout(), equalTo( asList("p.age = 23 :: INTEGER") ) );
+        assertThat( stdIO.stdout(), equalTo( asList("p.age = 23") ) );
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`import static java.lang.String.format;`
`41`	`41`	`import static java.util.Collections.emptyList;`
`42`	`42`
	`43`	`+import static org.neo4j.driver.internal.value.InternalValue.Format.VALUE_ONLY;`
`43`	`44`	`import static org.neo4j.driver.internal.value.InternalValue.Format.VALUE_WITH_TYPE;`
`44`	`45`	`import static org.neo4j.driver.v1.Values.valueAsIs;`
`45`	`46`
`@@ -315,7 +316,7 @@ public <V> Iterable<Pair<String, V>> properties( final Function<Value, V> mapFun`
`315`	`316`
`316`	`317`	`public String toString()`
`317`	`318`	`{`
`318`		`- return toString( VALUE_WITH_TYPE );`
	`319`	`+ return toString( VALUE_ONLY );`
`319`	`320`	`}`
`320`	`321`
`321`	`322`	`protected String maybeWithType( boolean includeType, String text )`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public void shouldMapDriverMapsToJavaMaps() throws Throwable`
`157`	`157`
`158`	`158`	`// Then`
`159`	`159`	`assertThat( result.size(), equalTo( 2 ) );`
`160`		`- assertThat( result.get( "Dog" ), equalTo( "2 :: INTEGER" ) );`
`161`		`- assertThat( result.get( "Cat" ), equalTo( "1 :: INTEGER" ) );`
	`160`	`+ assertThat( result.get( "Dog" ), equalTo( "2" ) );`
	`161`	`+ assertThat( result.get( "Cat" ), equalTo( "1" ) );`
`162`	`162`	`}`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public void shouldLogRunMessage() throws Throwable`
`72`	`72`	`handler.handleRunMessage( "stat", parameters( "value", new String[]{"cat", "cat", "cat"} ) );`
`73`	`73`
`74`	`74`	`// Then`
`75`		`- assertEquals( "S: [RUN \"stat\" {value=[\"cat\", \"cat\", \"cat\"] :: LIST OF ANY?}]", log );`
	`75`	`+ assertEquals( "S: [RUN \"stat\" {value=[\"cat\", \"cat\", \"cat\"]}]", log );`
`76`	`76`	`assertEquals( format( new RunMessage( "stat", parameters( "value", new String[]{"cat", "cat", "cat"} ) ) ),`
`77`	`77`	`log );`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class ListValueTest`
`34`	`34`	`public void shouldHaveSensibleToString() throws Throwable`
`35`	`35`	`{`
`36`	`36`	`ListValue listValue = listValue( value( 1 ), value( 2 ), value( 3 ) );`
`37`		`- assertThat( listValue.toString(), equalTo( "[1, 2, 3] :: LIST OF ANY?" ) );`
	`37`	`+ assertThat( listValue.toString(), equalTo( "[1, 2, 3]" ) );`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class MapValueTest`
`37`	`37`	`public void shouldHaveSensibleToString() throws Throwable`
`38`	`38`	`{`
`39`	`39`	`MapValue mapValue = mapValue();`
`40`		`- assertThat( mapValue.toString(), equalTo( "{k1: \"v1\", k2: 42} :: MAP" ) );`
	`40`	`+ assertThat( mapValue.toString(), equalTo( "{k1: \"v1\", k2: 42}" ) );`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ public class NodeValueTest`
`42`	`42`	`@Test`
`43`	`43`	`public void shouldHaveSensibleToString() throws Throwable`
`44`	`44`	`{`
`45`		`- assertEquals( "node<#1234> :: NODE", emptyNodeValue().toString() );`
`46`		`- assertEquals( "node<#1234> :: NODE", filledNodeValue().toString() );`
	`45`	`+ assertEquals( "node<#1234>", emptyNodeValue().toString() );`
	`46`	`+ assertEquals( "node<#1234>", filledNodeValue().toString() );`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public class PathValueTest`
`36`	`36`	`@Test`
`37`	`37`	`public void shouldHaveSensibleToString() throws Throwable`
`38`	`38`	`{`
`39`		`- assertEquals("path[(#42)-[#43:T]->(#44)] :: PATH", pathValue().toString());`
	`39`	`+ assertEquals("path[(#42)-[#43:T]->(#44)]", pathValue().toString());`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public class RelationshipValueTest`
`38`	`38`	`@Test`
`39`	`39`	`public void shouldHaveSensibleToString() throws Throwable`
`40`	`40`	`{`
`41`		`- assertEquals( "relationship<#1234> :: RELATIONSHIP", emptyRelationshipValue().toString() );`
`42`		`- assertEquals( "relationship<#1234> :: RELATIONSHIP", filledRelationshipValue().toString() );`
	`41`	`+ assertEquals( "relationship<#1234>", emptyRelationshipValue().toString() );`
	`42`	`+ assertEquals( "relationship<#1234>", filledRelationshipValue().toString() );`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public void resultCursor() throws Throwable`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`// Then`
`185`		`- assertThat( stdIO.stdout(), equalTo( asList("Record: 0"," p.age = 23 :: INTEGER") ) );`
	`185`	`+ assertThat( stdIO.stdout(), equalTo( asList("Record: 0"," p.age = 23") ) );`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`@Test`
`@@ -244,7 +244,7 @@ public void retainResultsForNestedQuerying() throws Throwable`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`// Then`
`247`		`- assertThat( stdIO.stdout(), equalTo( asList("p.age = 23 :: INTEGER") ) );`
	`247`	`+ assertThat( stdIO.stdout(), equalTo( asList("p.age = 23") ) );`
`248`	`248`	`}`
`249`	`249`
`250`	`250`