From 1dc7abbb7b1fc5effca3d72a384acb08b4ae71b3 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Tue, 9 Nov 2021 21:10:30 +0100
Subject: Cleanup

---
 .../yahoo/searchdefinition/processing/ImplicitSummaries.java   |  8 ++++----
 .../processing/MakeDefaultSummaryTheSuperSet.java              | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'config-model/src/main/java/com/yahoo/searchdefinition/processing')

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 ef2e75cfcd8..9eb8b921e81 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
@@ -32,7 +32,7 @@ public class ImplicitSummaries extends Processor {
         DocumentSummary defaultSummary = schema.getSummariesInThis().get("default");
         if (defaultSummary == null) {
             defaultSummary = new DocumentSummary("default", schema);
-            defaultSummary.setFromDisk(true); // TODO: Not necessarily
+            defaultSummary.setFromDisk(true); // As we add documentid to this
             schema.addSummary(defaultSummary);
         }
 
@@ -164,13 +164,13 @@ public class ImplicitSummaries extends Processor {
             throw newProcessException(schema, summaryField, "Source field '" + fieldName + "' does not exist.");
         }
         if (! sourceField.doesSummarying() &&
-            ! summaryField.getTransform().equals(SummaryTransform.ATTRIBUTE) &&
-            ! summaryField.getTransform().equals(SummaryTransform.GEOPOS))
+            summaryField.getTransform() != SummaryTransform.ATTRIBUTE &&
+            summaryField.getTransform() != SummaryTransform.GEOPOS)
         {
             // Summary transform attribute may indicate that the ilscript was rewritten to remove summary
             // by another search that uses this same field in inheritance.
             deployLogger.logApplicationPackage(Level.WARNING, "Ignoring " + summaryField + ": " + sourceField +
-                                           " is not creating a summary value in its indexing statement");
+                                                              " is not creating a summary value in its indexing statement");
             return false;
         }
 
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java
index f38de14bb9e..49a56bafe2a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java
@@ -10,20 +10,20 @@ import com.yahoo.vespa.documentmodel.SummaryTransform;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
 /**
- * <p>All summary fields which are not attributes
+ * All summary fields which are not attributes
  * must currently be present in the default summary class,
  * since the default summary class also defines the docsum.dat format.
  * This processor adds any missing summaries to the default summary.
  * When that is decoupled from the actual summaries returned, this
  * processor can be removed. Note: the StreamingSummary also takes advantage of
- * the fact that default is the superset.</p>
+ * the fact that default is the superset.
  *
- * <p>All other summary logic should work unchanged without this processing step
+ * All other summary logic should work unchanged without this processing step
  * except that IndexStructureValidator.validateSummaryFields must be changed to
  * consider all summaries, not just the default, i.e change to
- * if (search.getSummaryField(expr.getFieldName()) == null)</p>
+ * if (search.getSummaryField(expr.getFieldName()) == null)
  *
- * <p>This must be done after other summary processors.</p>
+ * This must be done after other summary processors.
  *
  * @author bratseth
  */
-- 
cgit v1.2.3