Commit does not return results.

Author: sherfert

cypher-shell/src/main/java/org/neo4j/shell/CypherShell.java

@@ -1,6 +1,5 @@
 package org.neo4j.shell;
 
-import java.util.List;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -158,12 +157,10 @@ public void beginTransaction() throws CommandException {
     }
 
     @Override
-    public Optional<List<BoltResult>> commitTransaction() throws CommandException {
+    public void commitTransaction() throws CommandException {
         try {
-            Optional<List<BoltResult>> results = boltStateHandler.commitTransaction();
-            results.ifPresent(boltResult -> boltResult.forEach(result -> prettyPrinter.format(result, linePrinter)));
+            boltStateHandler.commitTransaction();
             lastNeo4jErrorCode = null;
-            return results;
         } catch (Neo4jException e) {
             lastNeo4jErrorCode = getErrorCode(e);
             throw e;

cypher-shell/src/main/java/org/neo4j/shell/TransactionHandler.java

@@ -1,10 +1,6 @@
 package org.neo4j.shell;
 
 import org.neo4j.shell.exception.CommandException;
-import org.neo4j.shell.state.BoltResult;
-
-import java.util.List;
-import java.util.Optional;
 
 /**
  * An object capable of starting, committing, and rolling back transactions.
@@ -21,7 +17,7 @@ public interface TransactionHandler {
      *
      * @throws CommandException if current transaction could not be committed
      */
-    Optional<List<BoltResult>> commitTransaction() throws CommandException;
+    void commitTransaction() throws CommandException;
 
     /**
      *

cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java

@@ -118,7 +118,7 @@ public void beginTransaction() throws CommandException {
     }
 
     @Override
-    public Optional<List<BoltResult>> commitTransaction() throws CommandException {
+    public void commitTransaction() throws CommandException {
         if (!isConnected()) {
             throw new CommandException("Not connected to Neo4j");
         }
@@ -128,8 +128,6 @@ public Optional<List<BoltResult>> commitTransaction() throws CommandException {
         tx.commit();
         tx.close();
         tx = null;
-
-        return Optional.empty();
     }
 
     @Override

cypher-shell/src/test/java/org/neo4j/shell/CypherShellTest.java

@@ -100,7 +100,6 @@ public void verifyDelegationOfIsTransactionOpenMethod() throws CommandException
     @Test
     public void verifyDelegationOfTransactionMethods() throws CommandException {
         CypherShell shell = new CypherShell(logger, mockedBoltStateHandler, mockedPrettyPrinter, new ShellParameterMap());
-        when(mockedBoltStateHandler.commitTransaction()).thenReturn(Optional.empty());
 
         shell.beginTransaction();
         verify(mockedBoltStateHandler).beginTransaction();
@@ -187,21 +186,6 @@ public void executeShouldPrintResult() throws CommandException {
         verify(logger).printOut(contains("999"));
     }
 
-    @Test
-    public void commitShouldPrintResult() throws CommandException {
-        BoltResult result = mock(ListBoltResult.class);
-
-        BoltStateHandler boltStateHandler = mock(BoltStateHandler.class);
-
-        doAnswer((a) -> { ((LinePrinter)a.getArguments()[1]).printOut("999"); return null;}).when(mockedPrettyPrinter).format(any(BoltResult.class), anyObject());
-        when(boltStateHandler.commitTransaction()).thenReturn(Optional.of(asList(result)));
-
-        OfflineTestShell shell = new OfflineTestShell(logger, boltStateHandler, mockedPrettyPrinter);
-
-        shell.commitTransaction();
-        verify(logger).printOut(contains("999"));
-    }
-
     @Test
     public void shouldStripEndingSemicolonsFromCommand() throws Exception {
         // Should not throw