diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-02-09 19:04:25 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-02-09 19:04:25 +0100 |
commit | 7a9fe3fa0024c5dd995c1f48584bc7fab5284299 (patch) | |
tree | 0c0f12225835b99a1502cc1be156e33d67c65425 /container-search | |
parent | 893e6266501b37228d243460796d086219e79420 (diff) |
Remove getNodes(...): Always use list(...)
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 cf4f5f360ad..d24134e8d88 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, @@ -35,7 +36,6 @@ public class VespaSearchers { com.yahoo.prelude.semantics.SemanticSearcher.class, com.yahoo.search.grouping.GroupingQueryParser.class); - public static final Collection<ChainedComponentModel> nativeSearcherModels; static { @@ -81,4 +81,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; |