Add endpoint parameter

- and allow building an endpoint from URL

1 files changed, 32 insertions, 0 deletions

diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
index 02509626176..6dd0c54e150 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
@@ -180,4 +180,36 @@ public class CommandLineArgumentsTest {
         CommandLineArguments arguments = CommandLineArguments.build(asArray());
         SessionParams params = arguments.createSessionParams(true /* use json */);
     }
+
+    @Test
+    public void testEndpointAndHost() {
+        args.clear();
+        add("endpoint", "http://myendpoint:1234");
+        CommandLineArguments arguments = CommandLineArguments.build(asArray());
+        SessionParams params = arguments.createSessionParams(true);
+
+        assertThat(params.getClusters().get(0).getEndpoints().get(0).getHostname(), is("myendpoint"));
+        assertThat(params.getClusters().get(0).getEndpoints().get(0).getPort(), is(1234));
+        assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(false));
+
+        add("host", "myhost");  // endpoint dominates host and port
+        add("port", "2345");
+        arguments = CommandLineArguments.build(asArray());
+        params = arguments.createSessionParams(true);
+        assertThat(params.getClusters().get(0).getEndpoints().get(0).getHostname(), is("myendpoint"));
+        assertThat(params.getClusters().get(0).getEndpoints().get(0).getPort(), is(1234));
+
+        args.clear();
+        add("endpoint", "https://myendpoint:1234");
+        arguments = CommandLineArguments.build(asArray());
+        params = arguments.createSessionParams(true);
+        assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(true));
+
+        args.clear();
+        add("endpoint", "https://myendpoint::1234");
+        arguments = CommandLineArguments.build(asArray());
+        params = arguments.createSessionParams(true);
+        assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(true));
+
+    }
 }