diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-02-17 21:52:53 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-02-17 21:52:53 +0000 |
commit | 760e14dfef63c04d27a6b6e88bd2d003bafdd314 (patch) | |
tree | 159d419bffb47536db84089ce1c4c695cf0dee05 /config-model | |
parent | 6393b18c87614ab8bda956414bc0d9f2a963fd8d (diff) |
Use class.getName to get compile time error detection.
Use 'inject' and 'var' where obvious.
Diffstat (limited to 'config-model')
3 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java index 298a48c4e23..6048f3d62f2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java @@ -60,8 +60,8 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> for (AbstractSearchCluster searchCluster : searchClusters) { if ( ! ( searchCluster instanceof IndexedSearchCluster)) continue; Component dispatcher = new DispatcherComponent((IndexedSearchCluster)searchCluster); - Component rpcResoucePool = new RpcResourcePoolComponent(); - dispatcher.injectForName(rpcResoucePool.getComponentId().getName(), rpcResoucePool); + var rpcResoucePool = new RpcResourcePoolComponent(); + dispatcher.inject(rpcResoucePool); dispatcher.addComponent(rpcResoucePool); owningCluster.addComponent(dispatcher); } 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 704188e80e8..a196623cb92 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 @@ -26,7 +26,7 @@ public class DispatcherComponent extends Component<DispatcherComponent, Componen private static ComponentModel toComponentModel(IndexedSearchCluster indexedSearchCluster) { String dispatcherComponentId = "dispatcher." + indexedSearchCluster.getClusterName(); // used by ClusterSearcher return new ComponentModel(dispatcherComponentId, - "com.yahoo.search.dispatch.Dispatcher", + com.yahoo.search.dispatch.Dispatcher.class.getName(), BundleMapper.searchAndDocprocBundle, null); } 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 index b87580909b9..0450809ee51 100644 --- 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 @@ -12,7 +12,7 @@ public class RpcResourcePoolComponent extends Component<RpcResourcePoolComponent } private static ComponentModel toComponentModel() { - String className = "com.yahoo.search.dispatch.rpc.RpcResourcePool"; + String className = com.yahoo.search.dispatch.rpc.RpcResourcePool.class.getName(); return new ComponentModel(className, className, BundleMapper.searchAndDocprocBundle, null); } } |