Fixed build failures

Author: pontusmelke

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

@@ -44,7 +44,7 @@
  *
  * <ul>
  *     <li>Read from or discard a result, for instance via {@link StatementResult#next()},
- *     {@link StatementResult#consume()}, {@link StatementResult#discard()}.</li>
+ *     {@link StatementResult#consume()}.</li>
  *     <li>Explicitly commit a transaction using {@link Transaction#close()}</li>
  *     <li>Return a session to the pool using {@link Session#close()}</li>
  * </ul>

driver/src/test/java/org/neo4j/driver/v1/integration/ConnectionPoolIT.java

@@ -136,7 +136,7 @@ private void startAndCloseSessions( Driver driver, int sessionCount )
                 {
                     Session s = driver.session();
                     sessions.add( s );
-                    s.run( "RETURN 1" ).discard();
+                    s.run( "RETURN 1" ).consume();
                 }
             }
             finally

driver/src/test/java/org/neo4j/driver/v1/integration/CredentialsIT.java

@@ -99,7 +99,7 @@ private void enableAuth( String password ) throws Exception
                         "credentials", "neo4j",
                         "new_credentials", password ).asMap( ofValue()) ) );
         Session sess = setPassword.session();
-        sess.run( "RETURN 1" ).discard();
+        sess.run( "RETURN 1" ).consume();
         sess.close();
         setPassword.close();
     }

driver/src/test/java/org/neo4j/driver/v1/integration/ErrorIT.java

@@ -51,7 +51,7 @@ public void shouldThrowHelpfulSyntaxError() throws Throwable
 
         // When
         StatementResult result = session.run( "invalid statement" );
-        result.discard();
+        result.consume();
     }
 
     @Test
@@ -61,7 +61,7 @@ public void shouldNotAllowMoreTxAfterClientException() throws Throwable
         Transaction tx = session.beginTransaction();
 
         // And Given an error has occurred
-        try { tx.run( "invalid" ).discard(); } catch ( ClientException e ) {}
+        try { tx.run( "invalid" ).consume(); } catch ( ClientException e ) {}
 
         // Expect
         exception.expect( ClientException.class );
@@ -77,7 +77,7 @@ public void shouldNotAllowMoreTxAfterClientException() throws Throwable
     public void shouldAllowNewStatementAfterRecoverableError() throws Throwable
     {
         // Given an error has occurred
-        try { session.run( "invalid" ).discard(); } catch ( ClientException e ) {}
+        try { session.run( "invalid" ).consume(); } catch ( ClientException e ) {}
 
         // When
         StatementResult cursor = session.run( "RETURN 1" );
@@ -93,7 +93,7 @@ public void shouldAllowNewTransactionAfterRecoverableError() throws Throwable
         // Given an error has occurred in a prior transaction
         try ( Transaction tx = session.beginTransaction() )
         {
-            tx.run( "invalid" ).discard();
+            tx.run( "invalid" ).consume();
         }
         catch ( ClientException e ) {}
 

driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4j.java

@@ -89,7 +89,7 @@ static void clearDatabaseContents( Session session, String reason )
         // Note - this hangs for extended periods some times, because there are tests that leave sessions running.
         // Thus, we need to wait for open sessions and transactions to time out before this will go through.
         // This could be helped by an extension in the future.
-        session.run( "MATCH (n) DETACH DELETE n" ).discard();
+        session.run( "MATCH (n) DETACH DELETE n" ).consume();
     }
 
     public void restartServerOnEmptyDatabase( Neo4jSettings neo4jSettings ) throws Exception