Inject DocumentTypeManager to IndexingProcessor

2 files changed, 4 insertions, 3 deletions

diff --git a/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java b/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java
index 15ccc17e318..7b553383daf 100644
--- a/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java
+++ b/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java
@@ -52,11 +52,11 @@ public class IndexingProcessor extends DocumentProcessor {
     }
 
     @Inject
-    public IndexingProcessor(DocumentmanagerConfig documentmanagerConfig,
+    public IndexingProcessor(DocumentTypeManager documentTypeManager,
                              IlscriptsConfig ilscriptsConfig,
                              Linguistics linguistics,
                              Embedder embedder) {
-        docTypeMgr = DocumentTypeManagerConfigurer.configureNewManager(documentmanagerConfig);
+        docTypeMgr = documentTypeManager;
         scriptMgr = new ScriptManager(docTypeMgr, ilscriptsConfig, linguistics, embedder);
         adapterFactory = new SimpleAdapterFactory(new ExpressionSelector());
     }
diff --git a/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java b/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java
index ac1d3f21997..13f9ea1a8c8 100644
--- a/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java
+++ b/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java
@@ -7,6 +7,7 @@ import com.yahoo.document.Document;
 import com.yahoo.document.DocumentPut;
 import com.yahoo.document.DocumentOperation;
 import com.yahoo.document.DocumentType;
+import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.document.DocumentUpdate;
 import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.document.datatypes.StringFieldValue;
@@ -124,7 +125,7 @@ public class IndexingProcessorTestCase {
     }
 
     private static IndexingProcessor newProcessor(String configId) {
-        return new IndexingProcessor(ConfigGetter.getConfig(DocumentmanagerConfig.class, configId),
+        return new IndexingProcessor(new DocumentTypeManager(ConfigGetter.getConfig(DocumentmanagerConfig.class, configId)),
                                      ConfigGetter.getConfig(IlscriptsConfig.class, configId),
                                      new SimpleLinguistics(),
                                      Embedder.throwsOnUse);