diff options
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/yql')
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java | 13 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/FieldFilter.java | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java index e218726d58b..45d74da53eb 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java +++ b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java @@ -97,7 +97,7 @@ public class FieldFiller extends Searcher { for (Documentdb db : config.documentdb()) { for (Summaryclass summary : db.summaryclass()) { - Set<String> attributes = null; + Set<String> attributes; if (Execution.ATTRIBUTEPREFETCH.equals(summary.name())) { attributes = new HashSet<>(summary.fields().size()); for (Fields f : summary.fields()) { @@ -131,20 +131,19 @@ public class FieldFiller extends Searcher { Set<String> summaryFields = result.getQuery().getPresentation().getSummaryFields(); - if (summaryFields.isEmpty() - || summaryClass == null - || result.getQuery().properties() - .getBoolean(FIELD_FILLER_DISABLE)) { + if (summaryFields.isEmpty() || + summaryClass == null || + result.getQuery().properties().getBoolean(FIELD_FILLER_DISABLE)) { return; } if (intersectionOfAttributes.containsAll(summaryFields)) { - if (!Execution.ATTRIBUTEPREFETCH.equals(summaryClass)) { + if ( ! Execution.ATTRIBUTEPREFETCH.equals(summaryClass)) { execution.fill(result, Execution.ATTRIBUTEPREFETCH); } } else { // Yes, summaryClass may be Execution.ATTRIBUTEPREFETCH here - if (!summaryDb.hasAll(summaryFields, summaryClass, result.getQuery().getModel().getRestrict())) { + if ( ! summaryDb.hasAll(summaryFields, summaryClass, result.getQuery().getModel().getRestrict())) { execution.fill(result, null); } } diff --git a/container-search/src/main/java/com/yahoo/search/yql/FieldFilter.java b/container-search/src/main/java/com/yahoo/search/yql/FieldFilter.java index 80c3c633b0a..75c2865d0a5 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/FieldFilter.java +++ b/container-search/src/main/java/com/yahoo/search/yql/FieldFilter.java @@ -20,7 +20,7 @@ import com.yahoo.search.searchchain.Execution; * Remove fields which are not explicitly requested, if any field is explicitly * requested. Disable using FieldFilter.disable=true in request. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ @Beta @After(MinimalQueryInserter.EXTERNAL_YQL) |