Revert "Merge pull request #22439 from vespa-engine/revert-22429-bratseth/schema-info-5-take-2"

This reverts commit 3726fd997c0cbacd37e64ff493f8775fc3fcdd9f, reversing
changes made to d9ea4c99b13fa83a75bd8612d5f6c4d50510e3e9.

1 files changed, 8 insertions, 6 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java
index ba54c3808f2..6c66c8f4ca6 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java
@@ -13,6 +13,8 @@ import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.Relevance;
+import com.yahoo.search.schema.DocumentSummary;
+import com.yahoo.search.schema.Schema;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.searchlib.aggregation.FS4Hit;
 import com.yahoo.searchlib.aggregation.VdsHit;
@@ -98,17 +100,17 @@ public class HitConverterTestCase {
         return new GroupingListHit(Collections.emptyList(), null);
     }
 
-    private static DocumentdbInfoConfig.Documentdb sixtynine() {
-        DocumentdbInfoConfig.Documentdb.Builder summaryConfig = new DocumentdbInfoConfig.Documentdb.Builder();
-        summaryConfig.name("none");
-        summaryConfig.summaryclass(new DocumentdbInfoConfig.Documentdb.Summaryclass.Builder().id(0).name("69"));
-        return new DocumentdbInfoConfig.Documentdb(summaryConfig);
+    private static DocsumDefinitionSet sixtynine() {
+        var schema = new Schema.Builder("none");
+        var summary = new DocumentSummary.Builder("69");
+        schema.add(summary.build());
+        return new DocsumDefinitionSet(schema.build());
     }
 
     @Test
     public void requireThatVdsHitCanBeConverted() {
         HitConverter converter = new HitConverter(new MySearcher(), new Query());
-        GroupingListHit context = new GroupingListHit(null, new DocsumDefinitionSet(sixtynine()));
+        GroupingListHit context = new GroupingListHit(null, sixtynine());
         VdsHit lowHit = new VdsHit("id:ns:type::", new byte[] { 0x55, 0x55, 0x55, 0x55 }, 1);
         lowHit.setContext(context);
         Hit hit = converter.toSearchHit("69", lowHit);