Merge pull request #97 from praveenag/master

update java driver to 1.4

Author: spacecowboy

build.gradle

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

cypher-shell/src/test/java/org/neo4j/shell/state/BoltStateHandlerTest.java

@@ -38,6 +38,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
@@ -56,7 +57,7 @@ public class BoltStateHandlerTest {
 
     @Before
     public void setup() {
-        when(mockDriver.session(any(), any())).thenReturn(new FakeSession());
+        when(mockDriver.session(any(), anyString())).thenReturn(new FakeSession());
         doReturn(System.out).when(logger).getOutputStream();
     }
 
@@ -303,7 +304,7 @@ public void triesAgainOnSessionExpired() throws Exception {
         BoltResult boltResult = boltStateHandler.runCypher("RETURN 999",
                 new HashMap<>()).get();
 
-        verify(driverMock, times(2)).session(any(), any());
+        verify(driverMock, times(2)).session(any(), anyString());
         verify(sessionMock, times(2)).run(any(Statement.class));
 
         assertEquals("999", boltResult.getRecords().get(0).get(0).toString());
@@ -396,7 +397,7 @@ private Driver stubVersionInAnOpenSession(StatementResult versionMock, Session s
 
         when(sessionMock.isOpen()).thenReturn(true);
         when(sessionMock.run("RETURN 1")).thenReturn(versionMock);
-        when(driverMock.session(any(), any())).thenReturn(sessionMock);
+        when(driverMock.session(any(), anyString())).thenReturn(sessionMock);
 
         return driverMock;
     }

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

@@ -33,6 +33,16 @@ public Session session( AccessMode mode, String bookmark )
         return new FakeSession();
     }
 
+    @Override
+    public Session session(Iterable<String> bookmarks) {
+        return new FakeSession();
+    }
+
+    @Override
+    public Session session(AccessMode mode, Iterable<String> bookmarks) {
+        return new FakeSession();
+    }
+
     @Override
     public void close() throws Neo4jException {
     }

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

@@ -103,6 +103,11 @@ public boolean asBoolean() {
         throw new Uncoercible(getClass().getSimpleName(), "Bool");
     }
 
+    @Override
+    public byte[] asByteArray() {
+        throw new Uncoercible(getClass().getSimpleName(), "Byte[]");
+    }
+
     @Override
     public String asString() {
         throw new Uncoercible(getClass().getSimpleName(), "String");