No functional changes

2 files changed, 3 insertions, 21 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/result/Group.java b/container-search/src/main/java/com/yahoo/search/grouping/result/Group.java
index be50b572f5b..8e3d0269bbe 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/result/Group.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/result/Group.java
@@ -6,7 +6,7 @@ import com.yahoo.search.result.HitGroup;
 import com.yahoo.search.result.Relevance;
 
 /**
- * This class represents a single group in the grouping result model. A group may contain any number of results (stored
+ * A single group in the grouping result model. A group may contain any number of results (stored
  * as fields, use {@link #getField(String)} to access), {@link GroupList} and {@link HitList}. Use the {@link
  * com.yahoo.search.grouping.GroupingRequest#getResultGroup(com.yahoo.search.Result)} to retrieve an instance of this.
  *
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 2ba507a83b8..d5303d205a0 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
@@ -401,8 +401,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
     private void renderGroupingGroupSyntheticFields(Hit hit) throws IOException {
         renderGroupMetadata(((Group) hit).getGroupId());
         if (hit instanceof RootGroup) {
-            renderContinuations(Collections.singletonMap(
-                    Continuation.THIS_PAGE, ((RootGroup) hit).continuation()));
+            renderContinuations(Map.of(Continuation.THIS_PAGE, ((RootGroup) hit).continuation()));
         }
     }
 
@@ -732,23 +731,6 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
             return object;
         }
 
-        private static Inspector wrapAsMap(Inspector data) {
-            if (data.type() != Type.ARRAY) return null;
-            if (data.entryCount() == 0) return null;
-            Value.ObjectValue map = new Value.ObjectValue();
-            for (int i = 0; i < data.entryCount(); i++) {
-                Inspector obj = data.entry(i);
-                if (obj.type() != Type.OBJECT) return null;
-                if (obj.fieldCount() != 2) return null;
-                Inspector key = obj.field("key");
-                Inspector value = obj.field("value");
-                if (key.type() != Type.STRING) return null;
-                if (! value.valid()) return null;
-                map.put(key.asString(), value);
-            }
-            return map;
-        }
-
         private Inspector deepMaybeConvert(Inspector data) {
             if (data.type() == Type.ARRAY) {
                 if (settings.jsonDeepMaps) {
@@ -786,7 +768,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
             return data;
         }
 
-        private Inspector maybeConvertData(Inspector data) throws IOException {
+        private Inspector maybeConvertData(Inspector data) {
             if (data.type() == Type.ARRAY) {
                 return convertTopLevelArray(data);
             }