Merge pull request #118 from praveenag/upgrade-to-1.6

Upgrade to 1.6

Author: praveenag

build.gradle

@@ -72,7 +72,7 @@ ext {
 
     argparse4jVersion = '0.7.0'
     junitVersion = '4.12'
-    neo4jJavaVersion = '1.5.1'
+    neo4jJavaVersion = '1.6.0-beta01'
     findbugsVersion = '3.0.0'
     jansiVersion = '1.13'
     jlineVersion = '2.14.2'

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/OutputFormatter.java

@@ -10,9 +10,13 @@
 import org.neo4j.driver.v1.types.Relationship;
 import org.neo4j.shell.state.BoltResult;
 
-import java.util.*;
-import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -31,23 +35,23 @@ public interface OutputFormatter {
     @Nonnull default String formatValue(@Nonnull final Value value) {
         TypeRepresentation type = (TypeRepresentation) value.type();
         switch (type.constructor()) {
-            case LIST_TyCon:
+            case LIST:
                 return listAsString(value.asList(this::formatValue));
-            case MAP_TyCon:
+            case MAP:
                 return mapAsString(value.asMap(this::formatValue));
-            case NODE_TyCon:
+            case NODE:
                 return nodeAsString(value.asNode());
-            case RELATIONSHIP_TyCon:
+            case RELATIONSHIP:
                 return relationshipAsString(value.asRelationship());
-            case PATH_TyCon:
+            case PATH:
                 return pathAsString(value.asPath());
-            case ANY_TyCon:
-            case BOOLEAN_TyCon:
-            case STRING_TyCon:
-            case NUMBER_TyCon:
-            case INTEGER_TyCon:
-            case FLOAT_TyCon:
-            case NULL_TyCon:
+            case ANY:
+            case BOOLEAN:
+            case STRING:
+            case NUMBER:
+            case INTEGER:
+            case FLOAT:
+            case NULL:
             default:
                 return value.toString();
         }

cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeValue.java

@@ -2,9 +2,20 @@
 
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.exceptions.value.Uncoercible;
-import org.neo4j.driver.v1.types.*;
+import org.neo4j.driver.v1.types.Entity;
+import org.neo4j.driver.v1.types.IsoDuration;
+import org.neo4j.driver.v1.types.Node;
+import org.neo4j.driver.v1.types.Path;
+import org.neo4j.driver.v1.types.Point;
+import org.neo4j.driver.v1.types.Relationship;
+import org.neo4j.driver.v1.types.Type;
 import org.neo4j.driver.v1.util.Function;
 
+import java.time.ZonedDateTime;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetTime;
 import java.util.List;
 import java.util.Map;
 
@@ -168,6 +179,41 @@ public Path asPath() {
         throw new Uncoercible(getClass().getSimpleName(), "Path");
     }
 
+    @Override
+    public LocalDate asLocalDate() {
+        throw new Uncoercible(getClass().getSimpleName(), "LocalDate");
+    }
+
+    @Override
+    public OffsetTime asOffsetTime() {
+        throw new Uncoercible(getClass().getSimpleName(), "OffsetTime");
+    }
+
+    @Override
+    public LocalTime asLocalTime() {
+        throw new Uncoercible(getClass().getSimpleName(), "LocalTime");
+    }
+
+    @Override
+    public LocalDateTime asLocalDateTime() {
+        throw new Uncoercible(getClass().getSimpleName(), "LocalDateTime");
+    }
+
+    @Override
+    public ZonedDateTime asZonedDateTime() {
+        throw new Uncoercible(getClass().getSimpleName(), "ZonedDateTime");
+    }
+
+    @Override
+    public IsoDuration asIsoDuration() {
+        throw new Uncoercible(getClass().getSimpleName(), "IsoDuration");
+    }
+
+    @Override
+    public Point asPoint() {
+        throw new Uncoercible(getClass().getSimpleName(), "Point");
+    }
+
     @Override
     public Value get(String key, Value defaultValue) {
         return null;