Merge pull request #257 from pontusmelke/4.2-url-error

Support host:port without scheme

Author: pontusmelke

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

@@ -25,6 +25,7 @@
 import org.neo4j.shell.ParameterMap;
 
 import static java.lang.String.format;
+import static org.neo4j.shell.cli.CliArgs.DEFAULT_SCHEME;
 import static org.neo4j.shell.cli.FailBehavior.FAIL_AT_END;
 import static org.neo4j.shell.cli.FailBehavior.FAIL_FAST;
 
@@ -152,6 +153,12 @@ static URI parseURI( ArgumentParser parser, String address )
     {
         try
         {
+            String[] schemeSplit = address.split( "://" );
+            if ( schemeSplit.length == 1 )
+            {
+                // URI can't parse addresses without scheme, prepend fake "bolt://" to reuse the parsing facility
+                address = DEFAULT_SCHEME + "://" + address;
+            }
             return new URI( address );
         }
         catch ( URISyntaxException e )

cypher-shell/src/test/java/org/neo4j/shell/cli/CliArgHelperTest.java

@@ -165,6 +165,15 @@ public void defaultAddress()
         assertEquals( CliArgs.DEFAULT_PORT, cliArgs.getPort() );
     }
 
+    public void parseWithoutProtocol() {
+        CliArgs cliArgs = CliArgHelper.parse("--address", "localhost:10000");
+        assertNotNull(cliArgs);
+        assertNotNull(cliArgs);
+        assertEquals("bolt", cliArgs.getScheme());
+        assertEquals("localhost", cliArgs.getHost());
+        assertEquals(10000, cliArgs.getPort());
+    }
+
     @Test
     public void parseAddressWithRoutingContext()
     {