Merge pull request #280 from loveleif/4.2-use-semicolon

Ignore empty statements

Author: loveleif

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellPlainIntegrationTest.java

@@ -108,7 +108,7 @@ public void cypherWithProfileWithMemory() throws CommandException
         //then
         String actual = linePrinter.output();
         System.out.println( actual );
-        assertThat( actual, containsString( "Memory (Bytes): 0" ) );
+        assertThat( actual, containsString( "Memory (Bytes): " ) );
     }
 
     @Test

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

@@ -46,6 +46,7 @@ public class CypherShell implements StatementExecuter, Connector, TransactionHan
 {
     // Final space to catch newline
     private static final Pattern cmdNamePattern = Pattern.compile( "^\\s*(?<name>[^\\s]+)\\b(?<args>.*)\\s*$" );
+    private static final Pattern emptyStatementPattern = Pattern.compile( "^\\s*;$" );
     private final ParameterMap parameterMap;
     private final LinePrinter linePrinter;
     private final BoltStateHandler boltStateHandler;
@@ -90,6 +91,11 @@ protected static String stripTrailingSemicolons( @Nonnull String text )
     @Override
     public void execute( @Nonnull final String cmdString ) throws ExitException, CommandException
     {
+        if ( isEmptyStatement( cmdString ) )
+        {
+            return;
+        }
+
         // See if it's a shell command
         final Optional<CommandExecutable> cmd = getCommandExecutable( cmdString );
         if ( cmd.isPresent() )
@@ -107,6 +113,11 @@ public void execute( @Nonnull final String cmdString ) throws ExitException, Com
         executeCypher( cmdString );
     }
 
+    private static boolean isEmptyStatement( final String statement )
+    {
+        return emptyStatementPattern.matcher( statement ).matches();
+    }
+
     @Override
     public String lastNeo4jErrorCode()
     {

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

@@ -293,4 +293,13 @@ public void setParameterDoesNotTriggerByBoltError() throws ParameterException, C
         Object result = shell.getParameterMap().setParameter( "bob", "99" );
         assertEquals( 99L, result );
     }
+
+    @Test
+    public void ignoreEmptyStatement() throws CommandException
+    {
+        when( mockedBoltStateHandler.runCypher( anyString(), anyMap() ) ).thenThrow( new IllegalStateException( "Test failed" ) );
+        OfflineTestShell shell = new OfflineTestShell( logger, mockedBoltStateHandler, mockedPrettyPrinter );
+
+        shell.execute( "  \t;" );
+    }
 }