Add index mode to Schema

3 files changed, 10 insertions, 11 deletions

diff --git a/config-model/src/test/java/com/yahoo/schema/derived/AbstractExportingTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/AbstractExportingTestCase.java
index 7d7ed2b23eb..52ddf238c96 100644
--- a/config-model/src/test/java/com/yahoo/schema/derived/AbstractExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/derived/AbstractExportingTestCase.java
@@ -47,12 +47,12 @@ public abstract class AbstractExportingTestCase extends AbstractSchemaTestCase {
                                         TestProperties properties,
                                         ApplicationBuilder builder,
                                         DeployLogger logger) throws IOException {
-        DerivedConfiguration config = new DerivedConfiguration(builder.getSchema(schemaName),
-                                                               new DeployState.Builder().properties(properties)
-                                                                                        .deployLogger(logger)
-                                                                                        .rankProfileRegistry(builder.getRankProfileRegistry())
-                                                                                        .queryProfiles(builder.getQueryProfileRegistry())
-                                                                                        .build(), false);
+        DerivedConfiguration config = new DerivedConfiguration(new DeployState.Builder()
+                                                                              .properties(properties)
+                                                                              .deployLogger(logger)
+                                                                              .rankProfileRegistry(builder.getRankProfileRegistry())
+                                                                              .queryProfiles(builder.getQueryProfileRegistry())
+                                                                              .build(), builder.getSchema(schemaName), SchemaInfo.IndexMode.INDEX);
         return export(dirName, builder, config);
     }
 
diff --git a/config-model/src/test/java/com/yahoo/schema/derived/SchemaToDerivedConfigExporter.java b/config-model/src/test/java/com/yahoo/schema/derived/SchemaToDerivedConfigExporter.java
index 2beab3d5ea9..c940afce428 100644
--- a/config-model/src/test/java/com/yahoo/schema/derived/SchemaToDerivedConfigExporter.java
+++ b/config-model/src/test/java/com/yahoo/schema/derived/SchemaToDerivedConfigExporter.java
@@ -41,12 +41,13 @@ public class SchemaToDerivedConfigExporter {
         var props = new TestProperties();
         var logger = new TestableDeployLogger();
         var builder = ApplicationBuilder.createFromDirectory(dirPath, new MockFileRegistry(), logger, props);
-        var derived = new DerivedConfiguration(builder.getSchema(null),
+        var derived = new DerivedConfiguration(
                 new DeployState.Builder().properties(props)
                         .deployLogger(logger)
                         .rankProfileRegistry(builder.getRankProfileRegistry())
                         .queryProfiles(builder.getQueryProfileRegistry())
-                        .build(), false);
+                        .build(),
+                builder.getSchema(null), SchemaInfo.IndexMode.INDEX);
         exportConfig(dirPath, derived, builder);
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTester.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTester.java
index 388c064daf4..9e4ca630340 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaInfoTester.java
@@ -2,13 +2,11 @@
 package com.yahoo.vespa.model.search.test;
 
 import com.yahoo.config.model.deploy.TestProperties;
-import com.yahoo.document.DataType;
 import com.yahoo.schema.RankProfileRegistry;
 import com.yahoo.schema.Schema;
 import com.yahoo.schema.derived.SchemaInfo;
 import com.yahoo.schema.derived.Summaries;
 import com.yahoo.schema.document.SDDocumentType;
-import com.yahoo.schema.document.SDField;
 import com.yahoo.search.config.SchemaInfoConfig;
 import com.yahoo.vespa.documentmodel.DocumentSummary;
 import com.yahoo.vespa.model.test.utils.DeployLoggerStub;
@@ -27,7 +25,7 @@ public class SchemaInfoTester {
     }
 
     public String schemaInfoConfig(Schema schema) {
-        var schemaInfo = new SchemaInfo(schema, new RankProfileRegistry(), new Summaries(schema, new DeployLoggerStub(), new TestProperties()));
+        var schemaInfo = new SchemaInfo(schema, SchemaInfo.IndexMode.INDEX, new RankProfileRegistry(), new Summaries(schema, new DeployLoggerStub(), new TestProperties()));
         var schemaInfoConfigBuilder = new SchemaInfoConfig.Builder();
         schemaInfo.getConfig(schemaInfoConfigBuilder);
         var schemaInfoConfig = schemaInfoConfigBuilder.build();