summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-03-06 19:32:00 +0100
committergjoranv <gv@verizonmedia.com>2022-03-06 19:53:35 +0100
commit316461a4778011fc2fadd68270f33b34c83d99b6 (patch)
tree4f0a6356dc2cad981e6f73bd61408fdb3eeb62f2 /config-model
parent13e19780e749303f73b90bdaa15227951c81bfca (diff)
Inject DocumentTypeManager to ReindexingV1ApiHandler
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java4
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java5
2 files changed, 8 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index 20c3e007e3b..dbc055ef02e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -28,6 +28,8 @@ import com.yahoo.vespa.model.container.PlatformBundles;
import java.util.Set;
import java.util.TreeSet;
+import static com.yahoo.vespa.model.container.docproc.DocprocChains.DOCUMENT_TYPE_MANAGER_CLASS;
+
/**
* Container implementation for cluster-controllers
*/
@@ -148,6 +150,8 @@ public class ClusterControllerContainer extends Container implements
addComponent("reindexing-maintainer",
"ai.vespa.reindexing.ReindexingMaintainer",
REINDEXING_CONTROLLER_BUNDLE);
+
+ addComponent(new SimpleComponent(DOCUMENT_TYPE_MANAGER_CLASS));
addHandler("reindexing-status",
"ai.vespa.reindexing.http.ReindexingV1ApiHandler",
"/reindexing/v1/*",
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java
index e037a854716..56606210bb9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java
@@ -16,13 +16,16 @@ import com.yahoo.vespa.model.container.component.chain.ProcessingHandler;
* @author Einar M R Rosenvinge
*/
public class DocprocChains extends Chains<DocprocChain> {
+
+ public static final String DOCUMENT_TYPE_MANAGER_CLASS = "com.yahoo.document.DocumentTypeManager";
+
private final ProcessingHandler<DocprocChains> docprocHandler;
public DocprocChains(AbstractConfigProducer parent, String subId) {
super(parent, subId);
docprocHandler = new ProcessingHandler<>(this, "com.yahoo.docproc.jdisc.DocumentProcessingHandler");
addComponent(docprocHandler);
- addComponent(new SimpleComponent("com.yahoo.document.DocumentTypeManager"));
+ addComponent(new SimpleComponent(DOCUMENT_TYPE_MANAGER_CLASS));
}
private void addComponent(Component<?, ?> component) {