Print warning if deprecated option is given to vespa http client.

2 files changed, 42 insertions, 3 deletions

diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java
index 84d3b320772..837df3c98ef 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java
@@ -66,6 +66,16 @@ public class CommandLineArguments {
                 return null;
             }
         }
+        if (cmdArgs.enableV2Protocol) {
+            if (cmdArgs.enableV3Protocol) {
+                System.err.println("both --useV2Protocol and --useV3Protocol options specified, ignoring deprecated --useV2Protocol option");
+                cmdArgs.enableV2Protocol = false;
+            } else {
+                System.err.println("--useV2Protocol option is deprecated");
+            }
+        } else {
+            cmdArgs.enableV3Protocol = true;
+        }
 
         return cmdArgs;
     }
@@ -99,10 +109,10 @@ public class CommandLineArguments {
     @Inject
     private HelpOption helpOption;
 
-    @Option(name = {"--useV3Protocol"}, description = "Not used anymore, see useV2Protocol.")
-    private boolean notUsedBoolean = true;
+    @Option(name = {"--useV3Protocol"}, description = "Use V3 protocol to gateway. This is the default protocol.")
+    private boolean enableV3Protocol = false;
 
-    @Option(name = {"--useV2Protocol"}, description = "Use old V2 protocol to gateway.")
+    @Option(name = {"--useV2Protocol"}, description = "Use old V2 protocol to gateway. This option is deprecated.")
     private boolean enableV2Protocol = false;
 
     @Option(name = {"--file"},
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 84a69520a84..fd10aeb6100 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
@@ -95,6 +95,7 @@ public class CommandLineArgumentsTest {
         assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(false));
         assertThat(params.getConnectionParams().getUseCompression(), is(false));
         assertThat(params.getConnectionParams().getNumPersistentConnectionsPerEndpoint(), is(16));
+        assertThat(params.getConnectionParams().isEnableV3Protocol(), is(true));
         assertThat(params.getFeedParams().getRoute(), is("default"));
         assertThat(params.getFeedParams().getDataFormat(), is(FeedParams.DataFormat.XML_UTF8));
         assertThat(params.getFeedParams().getLocalQueueTimeOut(), is(180000L));
@@ -174,4 +175,32 @@ public class CommandLineArgumentsTest {
         assertThat(hosts, hasItem("hostValue2"));
         assertThat(hosts, hasItem("hostValue3"));
     }
+
+    @Test
+    public void testDeprecatedUseV2Protocol() {
+        addMinimum();
+        args.add("--useV2Protocol");
+        CommandLineArguments arguments = CommandLineArguments.build(asArray());
+        SessionParams params = arguments.createSessionParams(true /* use json */);
+        assertThat(params.getConnectionParams().isEnableV3Protocol(), is(false));
+    }
+
+    @Test
+    public void testUseV3Protocol() {
+        addMinimum();
+        args.add("--useV3Protocol");
+        CommandLineArguments arguments = CommandLineArguments.build(asArray());
+        SessionParams params = arguments.createSessionParams(true /* use json */);
+        assertThat(params.getConnectionParams().isEnableV3Protocol(), is(true));
+    }
+
+    @Test
+    public void testDeprecatedUseV2ProtocolAndUseV3Protocol() {
+        addMinimum();
+        args.add("--useV2Protocol");
+        args.add("--useV3Protocol");
+        CommandLineArguments arguments = CommandLineArguments.build(asArray());
+        SessionParams params = arguments.createSessionParams(true /* use json */);
+        assertThat(params.getConnectionParams().isEnableV3Protocol(), is(true));
+    }
 }