diff options
Diffstat (limited to 'config-model/src/main/java')
4 files changed, 27 insertions, 23 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterChains.java index bc9a45da08a..476c6249a1e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterChains.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/FilterChains.java @@ -11,6 +11,7 @@ import com.yahoo.vespa.model.container.component.chain.Chain; import com.yahoo.vespa.model.container.component.chain.Chains; import java.util.Collections; +import java.util.Set; /** * @author Tony Vaagenes @@ -44,8 +45,8 @@ public class FilterChains extends Chains<Chain<Filter>> { public static ChainSpecification emptyChainSpec(ComponentId chainId) { return new ChainSpecification(chainId, new ChainSpecification.Inheritance(null, null), - Collections.<Phase>emptySet(), - Collections.<ComponentSpecification>emptySet()); + Set.of(), + Set.of()); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/FederationSearcher.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/FederationSearcher.java index 1abb62fedab..799309b8ca1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/FederationSearcher.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/FederationSearcher.java @@ -45,7 +45,7 @@ public class FederationSearcher extends Searcher<FederationSearcherModel> implem this.documentTypes = documentTypes; } - public FederationConfig.Target.SearchChain.Builder getSearchChainConfig() { + FederationConfig.Target.SearchChain.Builder getSearchChainConfig() { FederationConfig.Target.SearchChain.Builder sB = new FederationConfig.Target.SearchChain.Builder(); FederationOptions resolvedOptions = targetOptions.inherit(searchChain.federationOptions()); sB. @@ -70,12 +70,12 @@ public class FederationSearcher extends Searcher<FederationSearcherModel> implem final ComponentId id; final FederationOptions targetOptions; - public Target(ComponentId id, FederationOptions targetOptions) { + Target(ComponentId id, FederationOptions targetOptions) { this.id = id; this.targetOptions = targetOptions; } - public FederationConfig.Target.Builder getTargetConfig() { + FederationConfig.Target.Builder getTargetConfig() { FederationConfig.Target.Builder tb = new FederationConfig.Target.Builder(); tb. id(id.stringValue()). @@ -92,7 +92,7 @@ public class FederationSearcher extends Searcher<FederationSearcherModel> implem private final SearchChainConfig searchChainConfig; - public SearchChainTarget(SearchChain searchChain, FederationOptions targetOptions) { + SearchChainTarget(SearchChain searchChain, FederationOptions targetOptions) { super(searchChain.getComponentId(), targetOptions); searchChainConfig = new SearchChainConfig(searchChain, null, targetOptions, searchChain.getDocumentTypes()); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/LocalClustersCreator.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/LocalClustersCreator.java index 229afd56360..0307d5d5774 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/LocalClustersCreator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/LocalClustersCreator.java @@ -2,15 +2,12 @@ package com.yahoo.vespa.model.container.search.searchchain.defaultsearchchains; import com.yahoo.component.ComponentId; -import com.yahoo.component.ComponentSpecification; -import com.yahoo.component.chain.Phase; import com.yahoo.component.chain.model.ChainSpecification; import com.yahoo.search.searchchain.model.federation.FederationOptions; import com.yahoo.search.searchchain.model.federation.LocalProviderSpec; import com.yahoo.vespa.model.container.search.searchchain.LocalProvider; import com.yahoo.vespa.model.container.search.searchchain.SearchChains; -import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -21,20 +18,20 @@ import java.util.Set; */ public class LocalClustersCreator { - static ChainSpecification emptySearchChainSpecification(String componentName) { + private static ChainSpecification emptySearchChainSpecification(String componentName) { return new ChainSpecification(new ComponentId(componentName), VespaSearchChainsCreator.inheritsVespaPhases(), //TODO: refactor List.of(), Set.of()); } - static LocalProvider createDefaultLocalProvider(String clusterName) { + private static LocalProvider createDefaultLocalProvider(String clusterName) { return new LocalProvider(emptySearchChainSpecification(clusterName), new FederationOptions(), new LocalProviderSpec(clusterName)); } - static Set<String> presentClusters(SearchChains searchChains) { + private static Set<String> presentClusters(SearchChains searchChains) { Set<String> presentClusters = new LinkedHashSet<>(); for (LocalProvider provider : searchChains.localProviders()) { presentClusters.add(provider.getClusterName()); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/VespaSearchChainsCreator.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/VespaSearchChainsCreator.java index eb396c52fca..d9c3beaaf0e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/VespaSearchChainsCreator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/defaultsearchchains/VespaSearchChainsCreator.java @@ -9,10 +9,18 @@ import com.yahoo.component.chain.model.ChainedComponentModel; import com.yahoo.search.searchchain.PhaseNames; import com.yahoo.search.searchchain.model.VespaSearchers; import com.yahoo.search.searchchain.model.federation.FederationSearcherModel; -import com.yahoo.vespa.model.container.component.Component; -import com.yahoo.vespa.model.container.search.searchchain.*; +import com.yahoo.vespa.model.container.search.searchchain.FederationSearcher; +import com.yahoo.vespa.model.container.search.searchchain.SearchChain; +import com.yahoo.vespa.model.container.search.searchchain.SearchChains; +import com.yahoo.vespa.model.container.search.searchchain.Searcher; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import java.util.Optional; -import java.util.*; /** * Creates the search chains vespaPhases, vespa and native. @@ -36,17 +44,15 @@ public class VespaSearchChainsCreator { return new Phase(phase, set(before), null); } - public static Collection<Phase> linearPhases(String... phases) { + static Collection<Phase> linearPhases(String... phases) { List<Phase> result = new ArrayList<>(); for (int i=0; i < phases.length - 1; ++i) { - result.add( - createPhase(phases[i], phases[i+1])); + result.add(createPhase(phases[i], phases[i+1])); } if (phases.length > 0) { - result.add( - createPhase(lastElement(phases), null)); + result.add(createPhase(lastElement(phases), null)); } return result; @@ -54,11 +60,11 @@ public class VespaSearchChainsCreator { } private static Set<ComponentSpecification> noSearcherReferences() { - return Collections.emptySet(); + return Set.of(); } private static Collection<Phase> noPhases() { - return Collections.emptySet(); + return Set.of(); } private static ChainSpecification.Inheritance inherits(ComponentId chainId) { @@ -79,7 +85,7 @@ public class VespaSearchChainsCreator { private static Searcher<? extends ChainedComponentModel> createSearcher(ChainedComponentModel searcherModel) { if (searcherModel instanceof FederationSearcherModel) { - return new FederationSearcher((FederationSearcherModel) searcherModel, Optional.<Component>empty()); + return new FederationSearcher((FederationSearcherModel) searcherModel, Optional.empty()); } else { return new Searcher<>(searcherModel); } |