diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-02-11 09:20:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 09:20:30 +0100 |
| commit | b78423a2dbacd4505c18fc600009c7b3812eb402 (patch) | |
| tree | df4f36852eaf21ab4b6aaa62b69c4eab646ecf13 /container-search | |
| parent | ab86947680c13a882b9f62db1ec852e40a313332 (diff) | |
| parent | 8e1cae2a0725567b15d49b99317523853cb033e4 (diff) | |
Merge pull request #16479 from vespa-engine/bratseth/remove-getNodes
Bratseth/remove get nodes
Diffstat (limited to 'container-search')
3 files changed, 4 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/PhaseNames.java b/container-search/src/main/java/com/yahoo/search/searchchain/PhaseNames.java index ec79979387b..d2809e8fe33 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/PhaseNames.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/PhaseNames.java @@ -10,6 +10,7 @@ package com.yahoo.search.searchchain; * @author Steinar Knutsen */ public final class PhaseNames { + private PhaseNames() { } diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java index 39d7ab6ad7a..c264425cb9c 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java @@ -23,6 +23,7 @@ import java.util.Set; */ @SuppressWarnings({"rawtypes", "unchecked"}) public class VespaSearchers { + public static final Collection<ChainedComponentModel> vespaSearcherModels = toSearcherModels( com.yahoo.prelude.querytransform.PhrasingSearcher.class, @@ -36,7 +37,6 @@ public class VespaSearchers { com.yahoo.search.grouping.GroupingQueryParser.class, com.yahoo.search.querytransform.WeakAndReplacementSearcher.class); - public static final Collection<ChainedComponentModel> nativeSearcherModels; static { @@ -82,4 +82,5 @@ public class VespaSearchers { } return searcherModels; } + } diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java index e1c95e9478e..2778f7e97db 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationSearcherModel.java @@ -34,7 +34,7 @@ public class FederationSearcherModel extends ChainedComponentModel { } } - private static ComponentSpecification federationSearcherComponentSpecification = + private static final ComponentSpecification federationSearcherComponentSpecification = new ComponentSpecification(FederationSearcher.class.getName()); public final List<TargetSpec> targets; |