diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-10-10 16:05:14 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:23 +0100 |
| commit | 0e756e8765e2bfa1f950cb45ffc626543304f622 (patch) | |
| tree | b062306eafd0e17d983d773761d0099eb4ff0d83 /vespaclient-java | |
| parent | 3283ac626f69d7b2333e4fa31f9b04c8ba374142 (diff) | |
Make Json default output format for vespaget and vespavisit
- Also introduce --xmloutput parameter
Diffstat (limited to 'vespaclient-java')
| -rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java | 6 | ||||
| -rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java | 7 |
2 files changed, 6 insertions, 7 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..7cc7b95bdae 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java @@ -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; @@ -226,7 +226,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()); 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 a5c8fadc3a1..0f8f0df0f27 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java @@ -345,17 +345,16 @@ public class VdsVisit { options.addOption(Option.builder() .longOpt("jsonoutput") - .desc("Output documents as JSON") + .desc("Output documents as JSON (default format)") .hasArg(false) .build()); options.addOption(Option.builder("x") .longOpt("xmloutput") - .desc("Output documents as XML (default format)") + .desc("Output documents as XML") .hasArg(false) .build()); - options.addOption(Option.builder() .longOpt("bucketspace") .hasArg(true) @@ -586,7 +585,7 @@ public class VdsVisit { 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.setJsonOutput(!xmlOutput); allParams.setVisitorParameters(params); return allParams; |