Fix some review comments

Author: henriknyman

cypher-shell/src/main/java/org/neo4j/shell/cli/InteractiveShellRunner.java

@@ -34,9 +34,9 @@
  */
 public class InteractiveShellRunner implements ShellRunner, SignalHandler {
     static final String INTERRUPT_SIGNAL = "INT";
-    private final static String freshPrompt = "> ";
-    private final static AnsiFormattedText continuationPrompt = AnsiFormattedText.s().bold().append("  ");
-    private final static String transactionPrompt = "# ";
+    private final static String FRESH_PROMPT = "> ";
+    private final static AnsiFormattedText CONTINUATION_PROMPT = AnsiFormattedText.s().bold().append("  ");
+    private final static String TRANSACTION_PROMPT = "# ";
     // Need to know if we are currently executing when catch Ctrl-C, needs to be atomic due to
     // being called from different thread
     private final AtomicBoolean currentlyExecuting;
@@ -155,7 +155,7 @@ public List<String> readUntilStatement() throws IOException, NoMoreInputExceptio
      */
     AnsiFormattedText getPrompt() {
         if (statementParser.containsText()) {
-            return continuationPrompt;
+            return CONTINUATION_PROMPT;
         }
 
         String databaseName = databaseManager.getActiveDatabase();
@@ -173,7 +173,7 @@ AnsiFormattedText getPrompt() {
                 .append("@")
                 .append(databaseName)
                 .appendNewLine()
-                .append(txHandler.isTransactionOpen()? transactionPrompt : freshPrompt);
+                .append( txHandler.isTransactionOpen() ? TRANSACTION_PROMPT : FRESH_PROMPT );
         return prompt;
     }
 

cypher-shell/src/main/java/org/neo4j/shell/commands/Begin.java

@@ -5,7 +5,7 @@
 import org.neo4j.shell.exception.ExitException;
 
 import javax.annotation.Nonnull;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static org.neo4j.shell.commands.CommandHelper.simpleArgParse;
@@ -49,7 +49,7 @@ public String getHelp() {
     @Nonnull
     @Override
     public List<String> getAliases() {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
     @Override

cypher-shell/src/main/java/org/neo4j/shell/commands/Commit.java

@@ -3,14 +3,10 @@
 import org.neo4j.shell.TransactionHandler;
 import org.neo4j.shell.exception.CommandException;
 import org.neo4j.shell.exception.ExitException;
-import org.neo4j.shell.log.Logger;
-import org.neo4j.shell.prettyprint.PrettyPrinter;
-import org.neo4j.shell.state.BoltResult;
 
 import javax.annotation.Nonnull;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 import static org.neo4j.shell.commands.CommandHelper.simpleArgParse;
 
@@ -52,7 +48,7 @@ public String getHelp() {
     @Nonnull
     @Override
     public List<String> getAliases() {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
     @Override

cypher-shell/src/main/java/org/neo4j/shell/commands/History.java

@@ -6,7 +6,7 @@
 import org.neo4j.shell.log.Logger;
 
 import javax.annotation.Nonnull;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static org.neo4j.shell.commands.CommandHelper.simpleArgParse;
@@ -19,7 +19,7 @@ public class History implements Command {
 
     private final Logger logger;
     private final Historian historian;
-    private final List<String> aliases = new ArrayList<>();
+    private final List<String> aliases = Collections.emptyList();
 
     public History(@Nonnull final Logger logger, @Nonnull final Historian historian) {
         this.logger = logger;

cypher-shell/src/main/java/org/neo4j/shell/commands/Rollback.java

@@ -5,7 +5,7 @@
 import org.neo4j.shell.exception.ExitException;
 
 import javax.annotation.Nonnull;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static org.neo4j.shell.commands.CommandHelper.simpleArgParse;
@@ -48,7 +48,7 @@ public String getHelp() {
     @Nonnull
     @Override
     public List<String> getAliases() {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
     @Override

cypher-shell/src/main/java/org/neo4j/shell/commands/Use.java

@@ -1,6 +1,6 @@
 package org.neo4j.shell.commands;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nonnull;
 
@@ -49,7 +49,7 @@ public String getHelp() {
     @Nonnull
     @Override
     public List<String> getAliases() {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
     @Override

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

@@ -1,10 +1,11 @@
 package org.neo4j.shell;
 
 import org.junit.Test;
-import org.neo4j.driver.Config;
 import org.neo4j.shell.log.Logger;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.neo4j.driver.internal.messaging.request.MultiDatabaseUtil.ABSENT_DB_NAME;
 
@@ -45,9 +46,7 @@ public void driverUrlDefaultScheme() throws Exception {
 
     @Test
     public void encryption() {
-        assertEquals(true,
-                new ConnectionConfig("bolt://", "", -1, "", "", true, ABSENT_DB_NAME).encryption());
-        assertEquals(false,
-                new ConnectionConfig("bolt://", "", -1, "", "", false, ABSENT_DB_NAME).encryption());
+        assertTrue(new ConnectionConfig("bolt://", "", -1, "", "", true, ABSENT_DB_NAME).encryption());
+        assertFalse(new ConnectionConfig("bolt://", "", -1, "", "", false, ABSENT_DB_NAME).encryption());
     }
 }

cypher-shell/src/test/java/org/neo4j/shell/commands/HelpTest.java

@@ -11,6 +11,7 @@
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static junit.framework.TestCase.fail;
@@ -140,7 +141,7 @@ public String getHelp() {
         @Nonnull
         @Override
         public List<String> getAliases() {
-            return new ArrayList<>();
+            return Collections.emptyList();
         }
 
         @Override