diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-19 20:58:06 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-19 20:58:06 +0200 |
commit | 5600861439b0ceb4a0296a4be25938de660bfaea (patch) | |
tree | 098f2540e98a19e19b9656d9d02ea8bba6e9c9e9 /container-search/src | |
parent | 2b8ed567ba9d7ee0d178b9d99d7e3e43eaef7d07 (diff) |
Random code cleanup while reading up on some code.
Diffstat (limited to 'container-search/src')
2 files changed, 9 insertions, 8 deletions
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 1657b45b1b4..cf4f5f360ad 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 @@ -8,18 +8,20 @@ import com.yahoo.component.chain.dependencies.Dependencies; import com.yahoo.component.chain.model.ChainedComponentModel; import com.yahoo.search.Searcher; import com.yahoo.search.searchchain.model.federation.FederationSearcherModel; -import com.yahoo.search.searchchain.model.federation.FederationSearcherModel.TargetSpec; -import org.apache.commons.collections.CollectionUtils; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; /** * Defines the searcher models used in the vespa and native search chains, except for federation. * * @author Tony Vaagenes */ -@SuppressWarnings({"rawtypes", "deprecation", "unchecked"}) +@SuppressWarnings({"rawtypes", "unchecked"}) public class VespaSearchers { public static final Collection<ChainedComponentModel> vespaSearcherModels = toSearcherModels( @@ -58,7 +60,7 @@ public class VespaSearchers { private static FederationSearcherModel federationSearcherModel() { return new FederationSearcherModel(new ComponentSpecification("federation"), Dependencies.emptyDependencies(), - Collections.<TargetSpec>emptyList(), true); + Collections.emptyList(), true); } private static boolean allAdded(Collection<ChainedComponentModel> searcherModels, Set<ComponentId> componentIds) { diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java index 316baa26198..0dcfab92a8e 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java @@ -20,7 +20,6 @@ import net.jcip.annotations.Immutable; */ @Immutable public class LocalProviderSpec { - @SuppressWarnings("unchecked") public static final Collection<ChainedComponentModel> searcherModels = toSearcherModels( com.yahoo.prelude.querytransform.CJKSearcher.class, @@ -63,7 +62,7 @@ public class LocalProviderSpec { } @SafeVarargs - private static final Collection<ChainedComponentModel> toSearcherModels(Class<? extends Searcher>... searchers) { + private static Collection<ChainedComponentModel> toSearcherModels(Class<? extends Searcher>... searchers) { List<ChainedComponentModel> searcherModels = new ArrayList<>(); for (Class<? extends Searcher> c : searchers) { |