Merge remote-tracking branch 'origin/1.1' into 1.2

# Conflicts:
#	cypher-shell/src/integration-test/java/org/neo4j/shell/MainIntegrationTest.java

Author: sherfert

cypher-shell/src/integration-test/java/org/neo4j/shell/MainIntegrationTest.java

@@ -1,6 +1,6 @@
 package org.neo4j.shell;
 
-import org.junit.Ignore;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -36,45 +36,73 @@ private static class ShellAndConnection
 
     @Rule
     public final ExpectedException exception = ExpectedException.none();
-
-    @Test
-    public void connectInteractivelyPromptOnWrongAuthentication() throws Exception
-    {
+    private String inputString = String.format( "neo4j%nneo%n" );
+    private ByteArrayOutputStream baos;
+    private ConnectionConfig connectionConfig;
+    private CypherShell shell;
+    private Main main;
+
+    @Before
+    public void setup() {
         // given
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        Main main = getMain( baos );
+        InputStream inputStream = new ByteArrayInputStream( inputString.getBytes() );
+
+        baos = new ByteArrayOutputStream();
+        PrintStream ps = new PrintStream( baos );
+
+        main = new Main( inputStream, ps );
 
         CliArgs cliArgs = new CliArgs();
-        cliArgs.setUsername( "", "" );
+        cliArgs.setUsername("", "");
         cliArgs.setPassword( "", "" );
 
         ShellAndConnection sac = getShell( cliArgs );
-        CypherShell shell = sac.shell;
-        ConnectionConfig connectionConfig = sac.connectionConfig;
+        shell = sac.shell;
+        connectionConfig = sac.connectionConfig;
+    }
 
+    @Test
+    public void promptsOnWrongAuthenticationIfInteractive() throws Exception {
         // when
-        assertEquals( "", connectionConfig.username() );
-        assertEquals( "", connectionConfig.password() );
+        assertEquals("", connectionConfig.username());
+        assertEquals("", connectionConfig.password());
 
-        main.connectMaybeInteractively( shell, connectionConfig, true );
+        main.connectMaybeInteractively(shell, connectionConfig, true, true);
 
         // then
         // should be connected
-        assertTrue( shell.isConnected() );
+        assertTrue(shell.isConnected());
         // should have prompted and set the username and password
-        assertEquals( "neo4j", connectionConfig.username() );
-        assertEquals( "neo", connectionConfig.password() );
+        assertEquals("neo4j", connectionConfig.username());
+        assertEquals("neo", connectionConfig.password());
 
         String out = baos.toString();
         assertEquals( String.format( "username: neo4j%npassword: ***%n" ), out );
     }
 
+    @Test
+    public void promptsSilentlyOnWrongAuthenticationIfOutputRedirected() throws Exception {
+        // when
+        assertEquals("", connectionConfig.username());
+        assertEquals("", connectionConfig.password());
+
+        main.connectMaybeInteractively(shell, connectionConfig, true, false);
+
+        // then
+        // should be connected
+        assertTrue(shell.isConnected());
+        // should have prompted silently and set the username and password
+        assertEquals("neo4j", connectionConfig.username());
+        assertEquals("neo", connectionConfig.password());
+
+        String out = baos.toString();
+        assertEquals( "", out );
+    }
+
     @Test
     public void wrongPortWithBolt() throws Exception
     {
         // given
-        Main main = getMain( new ByteArrayOutputStream() );
-
         CliArgs cliArgs = new CliArgs();
         cliArgs.setScheme( "bolt://", "" );
         cliArgs.setPort( 1234 );
@@ -85,15 +113,13 @@ public void wrongPortWithBolt() throws Exception
 
         exception.expect( ServiceUnavailableException.class );
         exception.expectMessage( "Unable to connect to localhost:1234, ensure the database is running and that there is a working network connection to it" );
-        main.connectMaybeInteractively( shell, connectionConfig, true );
+        main.connectMaybeInteractively( shell, connectionConfig, true, true );
     }
 
     @Test
     public void wrongPortWithNeo4j() throws Exception
     {
         // given
-        Main main = getMain( new ByteArrayOutputStream() );
-
         CliArgs cliArgs = new CliArgs();
         cliArgs.setScheme( "neo4j://", "" );
         cliArgs.setPort( 1234 );
@@ -104,18 +130,7 @@ public void wrongPortWithNeo4j() throws Exception
 
         exception.expect( ServiceUnavailableException.class );
         exception.expectMessage( "Unable to connect to database, ensure the database is running and that there is a working network connection to it" );
-        main.connectMaybeInteractively( shell, connectionConfig, true );
-    }
-
-    private Main getMain( ByteArrayOutputStream baos )
-    {
-        // what the user inputs when prompted
-        String inputString = String.format( "neo4j%nneo%n" );
-        InputStream inputStream = new ByteArrayInputStream( inputString.getBytes() );
-
-        PrintStream ps = new PrintStream( baos );
-
-        return new Main( inputStream, ps );
+        main.connectMaybeInteractively( shell, connectionConfig, true, true );
     }
 
     private ShellAndConnection getShell( CliArgs cliArgs )

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

@@ -5,7 +5,6 @@
 import org.neo4j.shell.build.Build;
 import org.neo4j.shell.cli.CliArgHelper;
 import org.neo4j.shell.cli.CliArgs;
-import org.neo4j.shell.cli.Format;
 import org.neo4j.shell.commands.CommandHelper;
 import org.neo4j.shell.exception.CommandException;
 import org.neo4j.shell.log.AnsiLogger;
@@ -15,9 +14,11 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
 
 import static org.neo4j.shell.ShellRunner.isInputInteractive;
+import static org.neo4j.shell.ShellRunner.isOutputInteractive;
 
 public class Main {
     static final String NEO_CLIENT_ERROR_SECURITY_UNAUTHORIZED = "Neo.ClientError.Security.Unauthorized";
@@ -73,7 +74,7 @@ void startShell(@Nonnull CliArgs cliArgs) {
         try {
             CypherShell shell = new CypherShell(logger, prettyConfig, ShellRunner.shouldBeInteractive( cliArgs ));
             // Can only prompt for password if input has not been redirected
-            connectMaybeInteractively(shell, connectionConfig, isInputInteractive());
+            connectMaybeInteractively(shell, connectionConfig, isInputInteractive(), isOutputInteractive());
 
             // Construct shellrunner after connecting, due to interrupt handling
             ShellRunner shellRunner = ShellRunner.getShellRunner(cliArgs, shell, logger, connectionConfig);
@@ -93,9 +94,20 @@ void startShell(@Nonnull CliArgs cliArgs) {
     /**
      * Connect the shell to the server, and try to handle missing passwords and such
      */
-    void connectMaybeInteractively(@Nonnull CypherShell shell, @Nonnull ConnectionConfig connectionConfig,
-                                   boolean interactively)
+    void connectMaybeInteractively(@Nonnull CypherShell shell,
+                                   @Nonnull ConnectionConfig connectionConfig,
+                                   boolean inputInteractive,
+                                   boolean outputInteractive)
             throws Exception {
+
+        OutputStream outputStream = outputInteractive ? out : new ThrowawayOutputStream();
+
+        ConsoleReader consoleReader = new ConsoleReader(in, outputStream);
+        // Disable expansion of bangs: !
+        consoleReader.setExpandEvents(false);
+        // Ensure Reader does not handle user input for ctrl+C behaviour
+        consoleReader.setHandleUserInterrupt(false);
+
         try {
             shell.connect(connectionConfig);
         } catch (AuthenticationException e) {
@@ -104,19 +116,24 @@ void connectMaybeInteractively(@Nonnull CypherShell shell, @Nonnull ConnectionCo
                 throw e;
             }
             // else need to prompt for username and password
-            if (interactively) {
+            if (inputInteractive) {
                 if (connectionConfig.username().isEmpty()) {
-                    connectionConfig.setUsername(promptForNonEmptyText("username", null));
+                    String username = outputInteractive ?
+                                      promptForNonEmptyText("username", consoleReader, null) :
+                                      promptForText("username", consoleReader, null);
+                    connectionConfig.setUsername(username);
                 }
                 if (connectionConfig.password().isEmpty()) {
-                    connectionConfig.setPassword(promptForText("password", '*'));
+                    connectionConfig.setPassword(promptForText("password", consoleReader, '*'));
                 }
                 // try again
                 shell.connect(connectionConfig);
             } else {
                 // Can't prompt because input has been redirected
                 throw e;
             }
+        } finally {
+            consoleReader.close();
         }
     }
 
@@ -130,40 +147,41 @@ void connectMaybeInteractively(@Nonnull CypherShell shell, @Nonnull ConnectionCo
      *         in case of errors
      */
     @Nonnull
-    private String promptForNonEmptyText(@Nonnull String prompt, @Nullable Character mask) throws Exception {
-        String text = promptForText(prompt, mask);
+    private String promptForNonEmptyText(@Nonnull String prompt, @Nonnull ConsoleReader consoleReader, @Nullable Character mask) throws Exception {
+        String text = promptForText(prompt, consoleReader, mask);
         if (!text.isEmpty()) {
             return text;
         }
-        out.println(prompt + " cannot be empty");
-        out.println();
-        return promptForNonEmptyText(prompt, mask);
+        consoleReader.println( prompt + " cannot be empty" );
+        consoleReader.println();
+        return promptForNonEmptyText(prompt, consoleReader, mask);
     }
 
     /**
      * @param prompt
      *         to display to the user
      * @param mask
      *         single character to display instead of what the user is typing, use null if text is not secret
+     * @param consoleReader
+     *         the reader
      * @return the text which was entered
      * @throws Exception
      *         in case of errors
      */
     @Nonnull
-    private String promptForText(@Nonnull String prompt, @Nullable Character mask) throws Exception {
-        String line;
-        ConsoleReader consoleReader = new ConsoleReader(in, out);
-        // Disable expansion of bangs: !
-        consoleReader.setExpandEvents(false);
-        // Ensure Reader does not handle user input for ctrl+C behaviour
-        consoleReader.setHandleUserInterrupt(false);
-        line = consoleReader.readLine(prompt + ": ", mask);
-        consoleReader.close();
-
+    private String promptForText(@Nonnull String prompt, @Nonnull ConsoleReader consoleReader, @Nullable Character mask) throws Exception {
+        String line = consoleReader.readLine(prompt + ": ", mask);
         if (line == null) {
             throw new CommandException("No text could be read, exiting...");
         }
 
         return line;
     }
+
+    private static class ThrowawayOutputStream extends OutputStream {
+        @Override
+        public void write( int b )
+        {
+        }
+    }
 }