Check non-interactive cli arg before checking tty

Lots of checks are done if stdin is connected to a tty and somewhere in
the mess of logic a check doesn't work properly (at least on Linux) when
using --non-interactive via a shell. For instance, if the user account
requires a password being changed, it still prompts the user.

This checks the cli arg first before bothering to check the
System.console() / isatty() results. This trickles down to checks again
during the initial exception handling AuthenticationException or
Neo4jException handling.

Author: voutilad

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

@@ -104,14 +104,18 @@ int runShell(@Nonnull CliArgs cliArgs, @Nonnull CypherShell shell, Logger logger
             if ( cliArgs.getCypher().isPresent() )
             {
                 // Can only prompt for password if input has not been redirected
-                connectMaybeInteractively( shell, connectionConfig, isInputInteractive(), isOutputInteractive(),
+                connectMaybeInteractively( shell, connectionConfig,
+                        !cliArgs.getNonInteractive() && isInputInteractive(),
+                        !cliArgs.getNonInteractive() && isOutputInteractive(),
                         () -> shell.execute( cliArgs.getCypher().get() ) );
                 return EXIT_SUCCESS;
             }
             else
             {
                 // Can only prompt for password if input has not been redirected
-                connectMaybeInteractively( shell, connectionConfig, isInputInteractive(), isOutputInteractive());
+                connectMaybeInteractively( shell, connectionConfig,
+                        !cliArgs.getNonInteractive() && isInputInteractive(),
+                        !cliArgs.getNonInteractive() && isOutputInteractive());
                 // Construct shellrunner after connecting, due to interrupt handling
                 ShellRunner shellRunner = ShellRunner.getShellRunner( cliArgs, shell, logger, connectionConfig );
                 CommandHelper commandHelper = new CommandHelper( logger, shellRunner.getHistorian(), shell );
@@ -173,7 +177,7 @@ private void connectMaybeInteractively( @Nonnull CypherShell shell,
                 promptForUsernameAndPassword(connectionConfig, outputInteractive);
                 didPrompt = true;
             } catch (Neo4jException e) {
-                if (isPasswordChangeRequiredException(e)) {
+                if (inputInteractive && isPasswordChangeRequiredException(e)) {
                     promptForPasswordChange(connectionConfig, outputInteractive);
                     shell.changePassword(connectionConfig);
                     didPrompt = true;