diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-10-15 13:46:34 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-10-15 13:46:34 +0200 |
| commit | 1ffdc40db7df1691e05b36d9970d407564835ed2 (patch) | |
| tree | 544ad6929056db61da172e340f3ff9fbdc37d6fd | |
| parent | b3e088d6a4cbbe629a4545f15107da56e1008ff2 (diff) | |
Add parathensis to make operator precedence explicit
| -rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java | 2 | ||||
| -rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java | 2 |
2 files changed, 2 insertions, 2 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 76aaf283a16..518eddfd021 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java @@ -227,7 +227,7 @@ public class CommandLineOptions { .setTraceLevel(trace) .setPriority(priority) .setTimeout(timeout) - .setJsonOutput(!jsonOutput && !xmlOutput ? false : jsonOutput) // TODO Vespa 7 Change default to JSON + .setJsonOutput((!jsonOutput && !xmlOutput) ? false : jsonOutput) // TODO Vespa 7 Change default to JSON .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 1df9a1e38cd..d23de081ec9 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java @@ -586,7 +586,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((!jsonOutput && !xmlOutput) ? false : jsonOutput); // TODO Vespa 7 Change default to JSON allParams.setVisitorParameters(params); return allParams; |