Merge pull request #61 from praveenag/master

support for colon form of :param command.

Author: praveenag

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

@@ -162,7 +162,7 @@ public void commitScenario() throws CommandException {
     }
 
     @Test
-    public void setAndListVariables() throws CommandException {
+    public void paramsAndListVariables() throws CommandException {
         assertTrue(shell.getAll().isEmpty());
 
         long randomLong = System.currentTimeMillis();
@@ -178,8 +178,5 @@ public void setAndListVariables() throws CommandException {
         List<String> queryResult = captor.getAllValues();
         assertThat(queryResult.get(0), is("{ bob }\n" + randomLong));
         assertEquals(randomLong, shell.getAll().get("bob"));
-
-        shell.remove("bob");
-        assertTrue(shell.getAll().isEmpty());
     }
 }

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

@@ -173,12 +173,6 @@ public Map<String, Object> getAll() {
         return queryParams;
     }
 
-    @Override
-    @Nonnull
-    public Optional remove(@Nonnull String name) {
-        return Optional.ofNullable(queryParams.remove(name));
-    }
-
     public void setCommandHelper(@Nonnull CommandHelper commandHelper) {
         this.commandHelper = commandHelper;
     }

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

@@ -22,10 +22,4 @@ public interface VariableHolder {
      */
     @Nonnull
     Map<String, Object> getAll();
-
-    /**
-     *
-     * @param name of variable to delete
-     */
-    Optional remove(@Nonnull String name);
 }

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

@@ -16,7 +16,7 @@
  */
 public class Param implements Command {
     // Match arguments such as "(key) (value with possible spaces)" where key and value are any strings
-    private static final Pattern argPattern = Pattern.compile("^\\s*(?<key>[^\\s]+)\\s+(?<value>.+)$");
+    private static final Pattern argPattern = Pattern.compile("^\\s*(?<key>.+?):?\\s+(?<value>.+)$");
     public static final String COMMAND_NAME = ":param";
     private final VariableHolder variableHolder;
 

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

@@ -144,9 +144,6 @@ public void verifyVariableMethods() throws CommandException {
         Optional result = offlineTestShell.set("bob", "99");
         assertEquals("99", result.get());
         assertEquals("99", offlineTestShell.getAll().get("bob"));
-
-        offlineTestShell.remove("bob");
-        assertTrue(offlineTestShell.getAll().isEmpty());
     }
 
     @Test
@@ -232,13 +229,6 @@ public void specifyingACypherStringShouldGiveAStringRunner() throws IOException
         }
     }
 
-    @Test
-    public void unsetAlreadyClearedValue() throws CommandException {
-        // when
-        // then
-        assertFalse("Expected param to be unset", offlineTestShell.remove("unknown var").isPresent());
-    }
-
     @Test
     public void setWithSomeBoltError() throws CommandException {
         // then

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

@@ -50,12 +50,34 @@ public void setValue() throws CommandException {
         verify(mockShell).set("bob", "9");
     }
 
+    @Test
+    public void setValueWithSpecialCharacters() throws CommandException {
+        cmd.execute("bob#   9");
+
+        verify(mockShell).set("bob#", "9");
+    }
+
     @Test
     public void shouldNotSplitOnSpace() throws CommandException {
         cmd.execute("bob 'one two'");
         verify(mockShell).set("bob", "'one two'");
     }
 
+    @Test
+    public void shouldAcceptColonFormOfParams() throws CommandException {
+        cmd.execute("bob: one");
+        verify(mockShell).set("bob", "one");
+    }
+
+    @Test
+    public void shouldAcceptForTwoColonsFormOfParams() throws CommandException {
+        cmd.execute("bob:: one");
+        verify(mockShell).set("bob:", "one");
+
+        cmd.execute("t:om two");
+        verify(mockShell).set("t:om", "two");
+    }
+
     @Test
     public void shouldNotExecuteEscapedCypher() throws CommandException {
         cmd.execute("bob \"RETURN 5 as bob\"");