diff options
Diffstat (limited to 'vespaclient-java/src/main/java')
-rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java | 18 | ||||
-rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java | 11 |
2 files changed, 13 insertions, 16 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()); 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..4430af19fbc 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java @@ -189,7 +189,7 @@ public class VdsVisit { .desc("Only visit up to the given timestamp (microseconds).") .type(Number.class).build()); - options.addOption("e", "headersonly", false, "Only visit headers of documents.[Deprecated]"); + options.addOption("e", "headersonly", false, "Only visit headers of documents.[Removed in Vespa 7]"); options.addOption(Option.builder("l") .longOpt("fieldset") @@ -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) @@ -481,7 +480,7 @@ public class VdsVisit { params.setToTimestamp(((Number) line.getParsedOptionValue("t")).longValue()); } if (line.hasOption("e")) { - params.fieldSet("[header]"); + throw new IllegalArgumentException("Headers only option has been removed."); } if (line.hasOption("l")) { params.fieldSet(line.getOptionValue("l")); @@ -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; |