diff options
4 files changed, 8 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/SignificanceModelRegistry.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/SignificanceModelRegistry.java index eb3f63cdf10..5b203f35640 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/SignificanceModelRegistry.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/SignificanceModelRegistry.java @@ -26,16 +26,17 @@ public class SignificanceModelRegistry extends SimpleComponent implements Signif private static final String CLASS = "com.yahoo.search.significance.impl.DefaultSignificanceModelRegistry"; private static final String BUNDLE = "linguistics"; - private final List<SignificanceModelConfig> configList; + private final List<SignificanceModelConfig> configList = new ArrayList<>(); public SignificanceModelRegistry(DeployState deployState, Element spec) { super(new ComponentModel(BundleInstantiationSpecification.fromStrings(CLASS, CLASS, BUNDLE))); - configList = new ArrayList<>(); + if (spec != null) { - for (Element modelElement : XML.getChildren(spec, "model")) { - addConfig( - modelElement.getAttribute("language"), - Model.fromXml(deployState, modelElement, Set.of(SIGNIFICANCE_MODEL)).modelReference()); + for (Element modelElement : XML.getChildren(spec, "model")) { + addConfig( + modelElement.getAttribute("language"), + Model.fromXml(deployState, modelElement, Set.of(SIGNIFICANCE_MODEL)).modelReference()); + } } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 456ce8fdbc2..021753eb3f3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -772,7 +772,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { private void addSignificance(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { Element significanceElement = XML.getChild(spec, "significance"); - if (significanceElement == null) return; SignificanceModelRegistry significanceModelRegistry = new SignificanceModelRegistry(deployState, significanceElement); cluster.addComponent(significanceModelRegistry); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java index 5a316f69a9f..ea43f5c8124 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java @@ -159,7 +159,7 @@ public class SchemaChainsTest extends SchemaChainsTestBase { @Test public void require_all_default_chains_are_correct() { - assertEquals(61, chainsConfig.components().size()); + assertEquals(63, chainsConfig.components().size()); assertEquals(10, chainsConfig.chains().size()); validateVespaPhasesChain(findChain("vespaPhases")); validateNativeChain(findChain("native")); diff --git a/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java b/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java index 1a0f82cc068..0a42bf8a259 100644 --- a/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java @@ -41,8 +41,6 @@ public class SignificanceSearcher extends Searcher { @Override public Result search(Query query, Execution execution) { - if (significanceModelRegistry == null) return execution.search(query); - Language language = query.getModel().getParsingLanguage(); Optional<SignificanceModel> model = significanceModelRegistry.getModel(language); |