diff options
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search')
5 files changed, 11 insertions, 11 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java index f463ff67ad9..7345868cae7 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java +++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java @@ -5,7 +5,6 @@ import com.yahoo.component.ComponentSpecification; import com.yahoo.prelude.IndexFacts; import com.yahoo.processing.request.Properties; -import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; diff --git a/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java b/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java index bc78579ea77..d61da0ebedf 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java @@ -52,9 +52,10 @@ public class GroupingValidator extends Searcher { public GroupingValidator(QrSearchersConfig qrsConfig, ClusterConfig clusterConfig, AttributesConfig attributesConfig) { int clusterId = clusterConfig.clusterId(); - QrSearchersConfig.Searchcluster.Indexingmode.Enum indexingMode = qrsConfig.searchcluster(clusterId).indexingmode(); + var searchCluster = qrsConfig.searchcluster(clusterId); + QrSearchersConfig.Searchcluster.Indexingmode.Enum indexingMode = searchCluster.indexingmode(); enabled = (indexingMode != QrSearchersConfig.Searchcluster.Indexingmode.STREAMING); - clusterName = enabled ? qrsConfig.searchcluster(clusterId).name() : null; + clusterName = enabled ? searchCluster.name() : null; for (AttributesConfig.Attribute attr : attributesConfig.attribute()) { attributes.put(attr.name(), attr); } diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java index 2f327dcd952..e07b290f66e 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java @@ -138,7 +138,7 @@ public class PageTemplateSearcher extends Searcher { List<String> pageIds = (List<String>) query.properties().get(pageIdListName); if (pageIds == null) { String pageIdString = query.properties().getString(pageIdName,"").trim(); - if (pageIdString.length() > 0) + if (!pageIdString.isEmpty()) pageIds = Arrays.asList(pageIdString.split(" ")); } @@ -179,7 +179,7 @@ public class PageTemplateSearcher extends Searcher { addErrorIfSameSourceMultipleTimes(pages,pageSources,query); - if (query.getModel().getSources().size() > 0) { + if (!query.getModel().getSources().isEmpty()) { // Add properties if the source list is set explicitly, but do not modify otherwise addParametersForIncludedSources(pageSources, query); return; @@ -208,7 +208,7 @@ public class PageTemplateSearcher extends Searcher { private void addParametersForIncludedSources(Set<Source> sources, Query query) { for (Source source : sources) { - if (source.parameters().size() > 0 && query.getModel().getSources().contains(source.getName())) + if (!source.parameters().isEmpty() && query.getModel().getSources().contains(source.getName())) addParameters(source,query); } } diff --git a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java index 12d5ab4fb53..84cf1744e27 100644 --- a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java +++ b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java @@ -46,11 +46,11 @@ class SchemaInfoConfigurer { static List<Cluster> toClusters(QrSearchersConfig config) { List<Cluster> clusters = new ArrayList<>(); - for (int i = 0; i < config.searchcluster().size(); ++i) { - String clusterName = config.searchcluster(i).name(); + for (var searchCluster : config.searchcluster()) { + String clusterName = searchCluster.name(); var clusterInfo = new Cluster.Builder(clusterName); - clusterInfo.setStreaming(config.searchcluster(i).indexingmode() == QrSearchersConfig.Searchcluster.Indexingmode.Enum.STREAMING); - for (var schemaDef : config.searchcluster(i).searchdef()) + clusterInfo.setStreaming(searchCluster.indexingmode() == QrSearchersConfig.Searchcluster.Indexingmode.Enum.STREAMING); + for (var schemaDef : searchCluster.searchdef()) clusterInfo.addSchema(schemaDef); clusters.add(clusterInfo.build()); } diff --git a/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java b/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java index 7ce629df8b1..0116d668d48 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java +++ b/container-search/src/main/java/com/yahoo/search/yql/MinimalQueryInserter.java @@ -121,7 +121,7 @@ public class MinimalQueryInserter extends Searcher { for (VespaGroupingStep step : parser.getGroupingSteps()) GroupingQueryParser.createGroupingRequestIn(query, step.getOperation(), step.continuations()); - if (parser.getYqlSources().size() == 0) { + if (parser.getYqlSources().isEmpty()) { query.getModel().getSources().clear(); } else { query.getModel().getSources().addAll(parser.getYqlSources()); |