switch default for map and wset rendering

2 files changed, 16 insertions, 11 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
index ae76747fb6d..a9195aaafa7 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
@@ -126,18 +126,18 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
     private Deque<Integer> renderedChildren;
     static class FieldConsumerSettings {
         boolean debugRendering = false;
-        boolean jsonDeepMaps = false;
-        boolean jsonWsets = false;
-        boolean jsonMapsAll = false;
+        boolean jsonDeepMaps = true;
+        boolean jsonWsets = true;
+        boolean jsonMapsAll = true;
         boolean jsonWsetsAll = false;
         boolean tensorShortForm = false;
         boolean convertDeep() { return (jsonDeepMaps || jsonWsets); }
         void init() {
             this.debugRendering = false;
-            this.jsonDeepMaps = false;
-            this.jsonWsets = false;
-            this.jsonMapsAll = false;
-            this.jsonWsetsAll = false;
+            this.jsonDeepMaps = true;
+            this.jsonWsets = true;
+            this.jsonMapsAll = true;
+            this.jsonWsetsAll = true;
             this.tensorShortForm = false;
         }
         void getSettings(Query q) {
@@ -147,11 +147,11 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
             }
             var props = q.properties();
             this.debugRendering = props.getBoolean(DEBUG_RENDERING_KEY, false);
-            this.jsonDeepMaps = props.getBoolean(WRAP_DEEP_MAPS, false);
-            this.jsonWsets = props.getBoolean(WRAP_WSETS, false);
+            this.jsonDeepMaps = props.getBoolean(WRAP_DEEP_MAPS, true);
+            this.jsonWsets = props.getBoolean(WRAP_WSETS, true);
             // we may need more fine tuning, but for now use the same query parameters here:
-            this.jsonMapsAll = props.getBoolean(WRAP_DEEP_MAPS, false);
-            this.jsonWsetsAll = props.getBoolean(WRAP_WSETS, false);
+            this.jsonMapsAll = props.getBoolean(WRAP_DEEP_MAPS, true);
+            this.jsonWsetsAll = props.getBoolean(WRAP_WSETS, true);
             this.tensorShortForm = q.getPresentation().getTensorShortForm();
         }
     }
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
index 2eed540310f..4a1ab693151 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
@@ -1309,6 +1309,11 @@ public class JsonRendererTestCase {
         r.setTotalHitCount(1L);
         String summary = render(r);
         assertEqualJson(expected.toString(), summary);
+        r = new Result(new Query("/?"));
+        r.hits().add(h);
+        r.setTotalHitCount(1L);
+        summary = render(r);
+        assertEqualJson(expected.toString(), summary);
 
         r = new Result(new Query("/?renderer.json.jsonMaps=false"));
         expected = dataFromSimplified(