remove some now-irrelevant wiring

9 files changed, 4 insertions, 35 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
index f013b480ca6..19805adc637 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
@@ -78,11 +78,9 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra
     }
 
     private boolean useV8GeoPositions = false;
-    private boolean useV8DocManagerCfg = true;
 
     public void useFeatureFlags(ModelContext.FeatureFlags featureFlags) {
         this.useV8GeoPositions = featureFlags.useV8GeoPositions();
-        this.useV8DocManagerCfg = featureFlags.useV8DocManagerCfg();
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index 3e251a621ab..cb1e2e047ad 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -79,7 +79,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private boolean persistenceThrottlingOfMergeFeedOps = true;
     private boolean inhibitDefaultMergesWhenGlobalMergesPending = false;
     private boolean useV8GeoPositions = false;
-    private boolean useV8DocManagerCfg = true;
     private List<String> environmentVariables = List.of();
     private boolean avoidRenamingSummaryFeatures = false;
     private boolean experimentalSdParsing = false;
@@ -141,7 +140,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public boolean persistenceThrottlingOfMergeFeedOps() { return persistenceThrottlingOfMergeFeedOps; }
     @Override public boolean inhibitDefaultMergesWhenGlobalMergesPending() { return inhibitDefaultMergesWhenGlobalMergesPending; }
     @Override public boolean useV8GeoPositions() { return useV8GeoPositions; }
-    @Override public boolean useV8DocManagerCfg() { return useV8DocManagerCfg; }
     @Override public List<String> environmentVariables() { return environmentVariables; }
     @Override public boolean avoidRenamingSummaryFeatures() { return this.avoidRenamingSummaryFeatures; }
     @Override public boolean experimentalSdParsing() { return this.experimentalSdParsing; }
@@ -373,11 +371,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties setUseV8DocManagerCfg(boolean value) {
-        this.useV8DocManagerCfg = value;
-        return this;
-    }
-
     public TestProperties setEnvironmentVariables(List<String> value) {
         this.environmentVariables = value;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java
index cb6f01d2406..c90855896ec 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java
@@ -37,11 +37,6 @@ public class Deriver {
         return new DocumentManager().produce(getSchemaBuilder(schemas).getModel(), new DocumentmanagerConfig.Builder());
     }
 
-    public static DocumentmanagerConfig.Builder getDocumentManagerConfig(List<String> schemas, boolean useV8DocManagerCfg) {
-        return new DocumentManager()
-            .produce(getSchemaBuilder(schemas).getModel(), new DocumentmanagerConfig.Builder());
-    }
-
     public static DocumenttypesConfig.Builder getDocumentTypesConfig(String schema) {
         return getDocumentTypesConfig(Collections.singletonList(schema));
     }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java
index bab56c9db2c..fdd7fe95c45 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java
@@ -31,10 +31,6 @@ public class FieldOfTypeDocumentTestCase extends AbstractSchemaTestCase {
         assertConfigFile("src/test/examples/fieldoftypedocument.cfg",
                          new DocumentmanagerConfig(value).toString() + "\n");
 
-        value = Deriver.getDocumentManagerConfig(sds, true);
-        assertConfigFile("src/test/examples/fieldoftypedocument-doctypes.cfg",
-                         new DocumentmanagerConfig(value).toString() + "\n");
-
         DocumentTypeManager manager = new DocumentTypeManager();
         DocumentTypeManagerConfigurer.configure(manager, "raw:" + new DocumentmanagerConfig(value).toString());
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
index b8ad3c24ed7..47c7e1d74bd 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
@@ -28,8 +28,6 @@ public abstract class AbstractExportingTestCase extends AbstractSchemaTestCase {
     private static final String tempDir = "temp/";
     private static final String searchDefRoot = "src/test/derived/";
 
-    boolean useV8DocManagerCfg() { return true; }
-
     private DerivedConfiguration derive(String dirName,
                                         String searchDefinitionName,
                                         TestProperties properties,
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java
index 05b16c9d30b..8e221583bff 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java
@@ -13,8 +13,7 @@ public class DuplicateStructTestCase extends AbstractExportingTestCase {
     public void exact_duplicate_struct_works() throws Exception {
         assertCorrectDeriving("duplicate_struct", "foobar",
                               new TestProperties()
-                              .setExperimentalSdParsing(false)
-                              .setUseV8DocManagerCfg(true),
+                              .setExperimentalSdParsing(false),
                               new TestableDeployLogger());
     }
 
@@ -22,8 +21,7 @@ public class DuplicateStructTestCase extends AbstractExportingTestCase {
     public void exact_duplicate_struct_works_new() throws Exception {
         assertCorrectDeriving("duplicate_struct", "foobar",
                               new TestProperties()
-                              .setExperimentalSdParsing(true)
-                              .setUseV8DocManagerCfg(true),
+                              .setExperimentalSdParsing(true),
                               new TestableDeployLogger());
     }
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
index d27c081ce30..851a9e616cd 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
@@ -33,9 +33,6 @@ import static org.junit.Assert.assertNull;
  */
 public class InheritanceTestCase extends AbstractExportingTestCase {
 
-    @Override
-    boolean useV8DocManagerCfg() { return true; }
-
     @Rule
     public TemporaryFolder tmpDir = new TemporaryFolder();
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java
index 4f5316724f5..fd7cdb9c95c 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java
@@ -14,13 +14,10 @@ import org.junit.Test;
  */
 public class MultiStructTestCase extends AbstractExportingTestCase {
 
-    @Override
-    boolean useV8DocManagerCfg() { return false; }
-
     @Test
     public void testDocTypeConfigs() throws Exception {
         var logger = new TestableDeployLogger();
-        var props = new TestProperties().setExperimentalSdParsing(false).setUseV8DocManagerCfg(false);
+        var props = new TestProperties().setExperimentalSdParsing(false);
         ApplicationBuilder builder = ApplicationBuilder.createFromDirectory
             ("src/test/derived/multi_struct/", new MockFileRegistry(), logger, props);
         derive("multi_struct", builder, builder.getSchema("shop"));
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java
index 17684306cce..480b72d78d6 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java
@@ -14,13 +14,10 @@ import org.junit.Test;
  */
 public class ReferenceFromSeveralTestCase extends AbstractExportingTestCase {
 
-    @Override
-    boolean useV8DocManagerCfg() { return false; }
-
     @Test
     public void testDocManConfigs() throws Exception {
         var logger = new TestableDeployLogger();
-        var props = new TestProperties().setExperimentalSdParsing(false).setUseV8DocManagerCfg(false);
+        var props = new TestProperties().setExperimentalSdParsing(false);
         ApplicationBuilder builder = ApplicationBuilder.createFromDirectory
             ("src/test/derived/reference_from_several/", new MockFileRegistry(), logger, props);
         derive("reference_from_several", builder, builder.getSchema("foo"));