diff options
author | Tor Brede Vekterli <vekterli@oath.com> | 2018-10-15 14:04:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-15 14:04:06 +0200 |
commit | 2bf905fe31ae8f674655a6228bf93840289a1fd1 (patch) | |
tree | 46b3077aeb26034e012a7ae03798af685156772c | |
parent | 841a023378da6a6f0cecbb5ad0c4ccdb69d95a4c (diff) | |
parent | 1ffdc40db7df1691e05b36d9970d407564835ed2 (diff) |
Merge pull request #7312 from vespa-engine/bjorncs/improve-readability
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; |