diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-01-31 13:09:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-31 13:09:56 +0100 |
| commit | 1a2072b757656946bf3300bf0f99658d28aa050f (patch) | |
| tree | 130714949c1ed162573654306b02e25c4ab3340e /config-model/src | |
| parent | 8c4bb624a2f36f3e4d6635abeaf474a1da2de9b1 (diff) | |
| parent | 66379a4cb632ca89296ee155f29b00dd8949f0ab (diff) | |
Merge pull request #8284 from vespa-engine/bratseth/minor-cleanup
Cleanup and simplify slightly
Diffstat (limited to 'config-model/src')
2 files changed, 11 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java index e59fcdf3dd0..6e089d6155b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java @@ -69,10 +69,16 @@ public class AdjustPositionSummaryFields extends Processor { summaryField.setTransform(SummaryTransform.GEOPOS); summaryField.getSources().clear(); summaryField.addSource(source); - ensureSummaryField(summary, PositionDataType.getPositionSummaryFieldName(summaryField.getName()), - DataType.getArray(DataType.STRING), source, SummaryTransform.POSITIONS); - ensureSummaryField(summary, PositionDataType.getDistanceSummaryFieldName(summaryField.getName()), - DataType.INT, source, SummaryTransform.DISTANCE); + ensureSummaryField(summary, + PositionDataType.getPositionSummaryFieldName(summaryField.getName()), + DataType.getArray(DataType.STRING), + source, + SummaryTransform.POSITIONS); + ensureSummaryField(summary, + PositionDataType.getDistanceSummaryFieldName(summaryField.getName()), + DataType.INT, + source, + SummaryTransform.DISTANCE); } private void ensureSummaryField(DocumentSummary summary, String fieldName, DataType dataType, Source source, SummaryTransform transform) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java index 2e6187d4545..eddb0adb8d6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java @@ -145,8 +145,7 @@ public class ImplicitSummaries extends Processor { // Returns whether this is valid. Warns if invalid and ignorable. Throws if not ignorable. private boolean isValid(SummaryField summaryField, Search search, boolean validate) { if (summaryField.getTransform() == SummaryTransform.DISTANCE || - summaryField.getTransform() == SummaryTransform.POSITIONS) - { + summaryField.getTransform() == SummaryTransform.POSITIONS) { int sourceCount = summaryField.getSourceCount(); if (validate && sourceCount != 1) { throw newProcessException(search.getName(), summaryField.getName(), |