Only have the DispatchNodesConfig inject into one component.

Let RpcResourcePool/RpcClient be owned by the dispatcher.
Step 2 in preparing for smooth handling of content cluster changes.

2 files changed, 3 insertions, 25 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/DispatcherComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/DispatcherComponent.java
index 634b1ae3275..bfa3bfc5f9f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/DispatcherComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/DispatcherComponent.java
@@ -23,16 +23,12 @@ public class DispatcherComponent extends Component<AbstractConfigProducer<?>, Co
     private final IndexedSearchCluster indexedSearchCluster;
 
     public DispatcherComponent(IndexedSearchCluster indexedSearchCluster) {
-        super(toComponentModel(indexedSearchCluster));
+        super(toComponentModel(indexedSearchCluster.getClusterName()));
         this.indexedSearchCluster = indexedSearchCluster;
-        String clusterName = indexedSearchCluster.getClusterName();
-        var rpcResoucePool = new RpcResourcePoolComponent(clusterName);
-        inject(rpcResoucePool);
-        addComponent(rpcResoucePool);
     }
 
-    private static ComponentModel toComponentModel(IndexedSearchCluster indexedSearchCluster) {
-        String dispatcherComponentId = "dispatcher." + indexedSearchCluster.getClusterName(); // used by ClusterSearcher
+    private static ComponentModel toComponentModel(String clusterName) {
+        String dispatcherComponentId = "dispatcher." + clusterName; // used by ClusterSearcher
         return new ComponentModel(dispatcherComponentId,
                                   com.yahoo.search.dispatch.Dispatcher.class.getName(),
                                   PlatformBundles.SEARCH_AND_DOCPROC_BUNDLE);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/RpcResourcePoolComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/RpcResourcePoolComponent.java
deleted file mode 100644
index b4b2af3c808..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/RpcResourcePoolComponent.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.container.search;
-
-import com.yahoo.osgi.provider.model.ComponentModel;
-import com.yahoo.vespa.model.container.component.Component;
-import com.yahoo.vespa.model.container.PlatformBundles;
-
-public class RpcResourcePoolComponent extends Component<RpcResourcePoolComponent, ComponentModel> {
-
-    public RpcResourcePoolComponent(String clusterName) {
-        super(toComponentModel(clusterName));
-    }
-
-    private static ComponentModel toComponentModel(String clusterName) {
-        String componentId = "rpcresourcepool." + clusterName;
-        return new ComponentModel(componentId, com.yahoo.search.dispatch.rpc.RpcResourcePool.class.getName(), PlatformBundles.SEARCH_AND_DOCPROC_BUNDLE);
-    }
-}