aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-01-30 15:40:23 +0100
committerGitHub <noreply@github.com>2023-01-30 15:40:23 +0100
commit849bfd9a56ecaa001ef00395ad1afb07aedc5732 (patch)
tree999167092ce829824f1aaf414621c1bd3f94ed0d
parent8b9930f5fcf28a40085b9374065b5976c926a51e (diff)
parente39fead7e211fcc21470582196efcd86946fbd29 (diff)
Merge pull request #25797 from vespa-engine/balder/explicit-json-as-default
Let json be default explicit
-rw-r--r--vespaclient-java/src/main/java/com/yahoo/vespaget/ClientParameters.java4
-rw-r--r--vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/ClientParameters.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/ClientParameters.java
index 91837cb4b09..c7dc33f095f 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespaget/ClientParameters.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/ClientParameters.java
@@ -5,7 +5,7 @@ import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
import java.util.Iterator;
/**
- * This class contains the the program parameters.
+ * This class contains the program parameters.
*
* @author bjorncs
*/
@@ -79,7 +79,7 @@ public class ClientParameters {
private boolean noRetry;
private int traceLevel;
private DocumentProtocol.Priority priority;
- private boolean jsonOutput;
+ private boolean jsonOutput = true;
private boolean tensorShortForm;
private boolean tensorDirectValues;
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
index e6fe985acbf..d0eac5c7e23 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
@@ -108,7 +108,7 @@ public class DocumentRetrieverTest {
private void assertContainsDocument(String documentId) {
assertTrue(outContent.toString().contains(String.format(
- "<document documenttype=\"document\" documentid=\"%s\"/>", documentId)));
+ "{\"id\":\"%s\"", documentId)));
}
private DocumentRetriever createDocumentRetriever(ClientParameters params) {