Add --xmloutput to vespa-get + vespa-visit

1 files changed, 13 insertions, 2 deletions

diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
index 16d860a1d98..1df9a1e38cd 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
@@ -349,6 +349,13 @@ public class VdsVisit {
                 .hasArg(false)
                 .build());
 
+        options.addOption(Option.builder("x")
+              .longOpt("xmloutput")
+              .desc("Output documents as XML (default format)")
+              .hasArg(false)
+              .build());
+
+
         options.addOption(Option.builder()
                 .longOpt("bucketspace")
                 .hasArg(true)
@@ -573,9 +580,13 @@ public class VdsVisit {
                 throttlePolicy.setMaxPendingCount(((Number)line.getParsedOptionValue("maxpendingsuperbuckets")).intValue());
                 params.setThrottlePolicy(throttlePolicy);
             }
-            if (line.hasOption("jsonoutput")) {
-                allParams.setJsonOutput(true);
+
+            boolean jsonOutput = line.hasOption("jsonoutput");
+            boolean xmlOutput = line.hasOption("xmloutput");
+            if (jsonOutput && xmlOutput) {
+                throw new IllegalArgumentException("Cannot combine both xml and json output");
             }
+            allParams.setJsonOutput(!jsonOutput && !xmlOutput ? false : jsonOutput); // TODO Vespa 7 Change default to JSON
 
             allParams.setVisitorParameters(params);
             return allParams;