1 files changed, 8 insertions, 10 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
index 20d25b63d30..703cdeba247 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java
@@ -68,7 +68,7 @@ public class CommandLineOptions {
 
         options.addOption(Option.builder("e")
                 .hasArg(false)
-                .desc("Retrieve header fields only. [Deprecated].")
+                .desc("Retrieve header fields only. [Removed in Vespa 7].")
                 .longOpt(HEADERSONLY_OPTION).build());
 
         options.addOption(Option.builder("f")
@@ -133,12 +133,12 @@ public class CommandLineOptions {
 
         options.addOption(Option.builder("j")
                 .hasArg(false)
-                .desc("JSON output")
+                .desc("JSON output (default format)")
                 .longOpt(JSONOUTPUT_OPTION).build());
 
         options.addOption(Option.builder("x")
                 .hasArg(false)
-                .desc("XML output (default format)")
+                .desc("XML output")
                 .longOpt(XMLOUTPUT_OPTION).build());
 
         return options;
@@ -180,17 +180,15 @@ public class CommandLineOptions {
                 throw new IllegalArgumentException("Cannot combine both xml and json output");
             }
 
-            if (printIdsOnly && headersOnly) {
-                throw new IllegalArgumentException("Print ids and headers only options are mutually exclusive.");
+            if (headersOnly) {
+                throw new IllegalArgumentException("Headers only option has been removed.");
             }
-            if ((printIdsOnly || headersOnly) && !fieldSet.isEmpty()) {
-                throw new IllegalArgumentException("Field set option can not be used in combination with print ids or headers only options.");
+            if (printIdsOnly && !fieldSet.isEmpty()) {
+                throw new IllegalArgumentException("Field set option can not be used in combination with print ids option.");
             }
 
             if (printIdsOnly) {
                 fieldSet = "[id]";
-            } else if (headersOnly) {
-                fieldSet = "[header]";
             } else if (fieldSet.isEmpty()) {
                 fieldSet = "[all]";
             }
@@ -226,7 +224,7 @@ public class CommandLineOptions {
                     .setTraceLevel(trace)
                     .setPriority(priority)
                     .setTimeout(timeout)
-                    .setJsonOutput((!jsonOutput && !xmlOutput) ? false : jsonOutput) // TODO Vespa 7 Change default to JSON
+                    .setJsonOutput(!xmlOutput)
                     .build();
         } catch (ParseException pe) {
             throw new IllegalArgumentException(pe.getMessage());