diff options
| author | Marius Arhaug <mariusarhaug@hotmail.com> | 2024-04-24 15:27:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 15:27:32 +0200 |
| commit | ff1d604e77b1943a72fc6b585b09db82a5ee791d (patch) | |
| tree | 2195429e568fe6de8a680454d22efcac4b6a4120 /config-model/src/main/java/com/yahoo/vespa | |
| parent | 802c854e5190d37914f237d8626949781f3db9c2 (diff) | |
| parent | 8f69128279305dacd077b540d5e9be746508efc9 (diff) | |
Merge pull request #30871 from vespa-engine/marius/add-significance-searcher
Add significance searcher
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa')
2 files changed, 9 insertions, 9 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..c210c2621a6 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 @@ -23,19 +23,20 @@ import static com.yahoo.vespa.model.container.xml.ModelIdResolver.SIGNIFICANCE_M */ public class SignificanceModelRegistry extends SimpleComponent implements SignificanceConfig.Producer { - private static final String CLASS = "com.yahoo.search.significance.impl.DefaultSignificanceModelRegistry"; - private static final String BUNDLE = "linguistics"; + private static final String CLASS = "com.yahoo.language.significance.impl.DefaultSignificanceModelRegistry"; + private static final String BUNDLE = null; - 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 c6fca8d32c6..56e2a21e38b 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 @@ -778,7 +778,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); |