Create schema-info for global schema info

2 files changed, 9 insertions, 12 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/config/SchemaInfo.java b/container-search/src/main/java/com/yahoo/search/config/SchemaInfo.java
index 746f1c340f2..4a8ec83c847 100644
--- a/container-search/src/main/java/com/yahoo/search/config/SchemaInfo.java
+++ b/container-search/src/main/java/com/yahoo/search/config/SchemaInfo.java
@@ -2,9 +2,8 @@
 package com.yahoo.search.config;
 
 import com.yahoo.api.annotations.Beta;
-import com.yahoo.component.annotation.Inject;
 import com.yahoo.container.QrSearchersConfig;
-import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
+import com.yahoo.container.search.SchemaInfoConfig;
 import com.yahoo.search.Query;
 import com.yahoo.tensor.TensorType;
 
@@ -44,11 +43,10 @@ public class SchemaInfo {
     /** The schemas contained in each content cluster indexed by cluster name */
     private final Map<String, List<String>> clusters;
 
-    @Inject
     public SchemaInfo(IndexInfoConfig indexInfo, // will be used in the future
-                      DocumentdbInfoConfig documentdbInfoConfig,
+                      SchemaInfoConfig schemaInfoConfig,
                       QrSearchersConfig qrSearchersConfig) {
-        this(SchemaInfoConfigurer.toSchemas(documentdbInfoConfig), SchemaInfoConfigurer.toClusters(qrSearchersConfig));
+        this(SchemaInfoConfigurer.toSchemas(schemaInfoConfig), SchemaInfoConfigurer.toClusters(qrSearchersConfig));
     }
 
     public SchemaInfo(List<Schema> schemas, Map<String, List<String>> clusters) {
diff --git a/container-search/src/main/java/com/yahoo/search/config/SchemaInfoConfigurer.java b/container-search/src/main/java/com/yahoo/search/config/SchemaInfoConfigurer.java
index ae06babda66..49acf589ba3 100644
--- a/container-search/src/main/java/com/yahoo/search/config/SchemaInfoConfigurer.java
+++ b/container-search/src/main/java/com/yahoo/search/config/SchemaInfoConfigurer.java
@@ -2,11 +2,10 @@
 package com.yahoo.search.config;
 
 import com.yahoo.container.QrSearchersConfig;
-import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
+import com.yahoo.container.search.SchemaInfoConfig;
 import com.yahoo.tensor.TensorType;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,13 +18,13 @@ import java.util.stream.Collectors;
  */
 class SchemaInfoConfigurer {
 
-    static List<Schema> toSchemas(DocumentdbInfoConfig documentdbInfoConfig) {
-        return documentdbInfoConfig.documentdb().stream().map(config -> toSchema(config)).collect(Collectors.toList());
+    static List<Schema> toSchemas(SchemaInfoConfig documentdbInfoConfig) {
+        return documentdbInfoConfig.schema().stream().map(config -> toSchema(config)).collect(Collectors.toList());
     }
 
-    static Schema toSchema(DocumentdbInfoConfig.Documentdb documentDbConfig) {
-        Schema.Builder builder = new Schema.Builder(documentDbConfig.name());
-        for (var profileConfig : documentDbConfig.rankprofile()) {
+    static Schema toSchema(SchemaInfoConfig.Schema schemaInfoConfig) {
+        Schema.Builder builder = new Schema.Builder(schemaInfoConfig.name());
+        for (var profileConfig : schemaInfoConfig.rankprofile()) {
             RankProfile.Builder profileBuilder = new RankProfile.Builder(profileConfig.name());
             profileBuilder.setHasSummaryFeatures(profileConfig.hasSummaryFeatures());
             profileBuilder.setHasRankFeatures(profileConfig.hasRankFeatures());