diff options
author | gjoranv <gv@verizonmedia.com> | 2020-05-19 22:42:09 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-05-22 14:33:52 +0200 |
commit | 57b2222304dbec9df28db42eaf360f700dfcef18 (patch) | |
tree | 597b04fae87ce45dbaa6b7c6d60bf5e37bd7871d /config-model | |
parent | ab4d0f83bfee18cfdf9b7ae41dd2e2ac7caaf546 (diff) |
Follow naming convention by using singular 'profileRegistry'
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java | 4 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java | 7 |
2 files changed, 5 insertions, 6 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 1154670cc96..8002f89a2e7 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 @@ -36,7 +36,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> SemanticRulesConfig.Producer, PageTemplatesConfig.Producer { - public static final String QUERY_PROFILES_REGISTRY_CLASS = CompiledQueryProfileRegistry.class.getName(); + public static final String QUERY_PROFILE_REGISTRY_CLASS = CompiledQueryProfileRegistry.class.getName(); private ApplicationContainerCluster owningCluster; private final List<AbstractSearchCluster> searchClusters = new LinkedList<>(); @@ -51,7 +51,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> this.owningCluster = cluster; this.options = options; - owningCluster.addComponent(new SimpleComponent(QUERY_PROFILES_REGISTRY_CLASS)); + owningCluster.addComponent(new SimpleComponent(QUERY_PROFILE_REGISTRY_CLASS)); } public void connectSearchClusters(Map<String, AbstractSearchCluster> searchClusters) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java index 572d12539aa..a2d13439f4e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java @@ -5,7 +5,6 @@ import com.yahoo.component.ComponentId; import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.container.core.ChainsConfig; import com.yahoo.container.jdisc.JdiscBindingsConfig; -import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.ApplicationContainerCluster; @@ -18,7 +17,7 @@ import org.w3c.dom.Element; import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER; import static com.yahoo.test.Matchers.hasItemWithMethod; -import static com.yahoo.vespa.model.container.search.ContainerSearch.QUERY_PROFILES_REGISTRY_CLASS; +import static com.yahoo.vespa.model.container.search.ContainerSearch.QUERY_PROFILE_REGISTRY_CLASS; import static com.yahoo.vespa.model.container.xml.ContainerModelBuilder.SEARCH_HANDLER_BINDING; import static com.yahoo.vespa.model.container.xml.ContainerModelBuilder.SEARCH_HANDLER_CLASS; import static org.hamcrest.CoreMatchers.is; @@ -134,8 +133,8 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { public void query_profiles_registry_component_is_added() { createClusterWithOnlyDefaultChains(); ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default"); - var queryProfilesRegistryId = ComponentId.fromString(QUERY_PROFILES_REGISTRY_CLASS); - assertTrue(cluster.getComponentsMap().containsKey(queryProfilesRegistryId)); + var queryProfileRegistryId = ComponentId.fromString(QUERY_PROFILE_REGISTRY_CLASS); + assertTrue(cluster.getComponentsMap().containsKey(queryProfileRegistryId)); } private void createClusterWithOnlyDefaultChains() { |