Nonfunctional changes only

9 files changed, 24 insertions, 16 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/SortDataHitSorter.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/SortDataHitSorter.java
index ee64632d40a..93a21476f35 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/SortDataHitSorter.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/SortDataHitSorter.java
@@ -10,6 +10,7 @@ import java.util.Comparator;
 import java.util.List;
 
 public class SortDataHitSorter {
+
     public static void sort(HitGroup hitGroup, List<Hit> hits) {
         var sorting = hitGroup.getQuery().getRanking().getSorting();
         var fallbackOrderer = hitGroup.getOrderer();
@@ -61,4 +62,5 @@ public class SortDataHitSorter {
             return fallback.compare(left, right);
         }
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/result/Group.java b/container-search/src/main/java/com/yahoo/search/grouping/result/Group.java
index 2a1e3199d7d..30bf0ff4bb0 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/result/Group.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/result/Group.java
@@ -14,7 +14,6 @@ import com.yahoo.search.result.Relevance;
  */
 public class Group extends HitGroup {
 
-    private static final long serialVersionUID = 2122928012157537800L;
     private final GroupId groupId;
 
     /**
@@ -80,4 +79,5 @@ public class Group extends HitGroup {
         }
         return null;
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/result/HitList.java b/container-search/src/main/java/com/yahoo/search/grouping/result/HitList.java
index 03e0f7e6d59..653fc4cb978 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/result/HitList.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/result/HitList.java
@@ -6,20 +6,21 @@ import com.yahoo.search.grouping.GroupingRequest;
 import com.yahoo.search.result.Hit;
 
 /**
- * <p>This class represents a labeled hit list in the grouping result model. It is contained in {@link Group}, and
+ * This class represents a labeled hit list in the grouping result model. It is contained in {@link Group}, and
  * contains one or more {@link Hit hits} itself, making this the parent of leaf nodes in the hierarchy of grouping
- * results. Use the {@link GroupingRequest#getResultGroup(Result)} to retrieve grouping results.</p>
+ * results. Use the {@link GroupingRequest#getResultGroup(Result)} to retrieve grouping results.
  *
  * @author Simon Thoresen Hult
  */
 public class HitList extends AbstractList {
 
     /**
-     * <p>Constructs a new instance of this class.</p>
+     * Constructs a new instance of this class.
      *
-     * @param label The label to assign to this.
+     * @param label the label to assign to this
      */
     public HitList(String label) {
         super("hitlist", label);
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/result/HitRenderer.java b/container-search/src/main/java/com/yahoo/search/grouping/result/HitRenderer.java
index 3907f87a276..da115807fc2 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/result/HitRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/result/HitRenderer.java
@@ -11,7 +11,7 @@ import java.util.Arrays;
 import java.util.Map;
 
 /**
- * This is a helper class for rendering grouping results.
+ * A helper for rendering grouping results.
  *
  * @author Simon Thoresen Hult
  */
@@ -94,4 +94,5 @@ public abstract class HitRenderer {
     private static void renderContinuation(String id, Continuation continuation, XMLWriter writer) {
         writer.openTag(TAG_CONTINUATION).attribute(TAG_CONTINUATION_ID, id).content(continuation, false).closeTag();
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java
index e8f4d566028..5ea0e3a0838 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java
@@ -44,7 +44,8 @@ class HitConverter implements ResultBuilder.HitConverter {
     }
 
     private Hit convertFs4Hit(String summaryClass, FS4Hit groupHit) {
-        FastHit hit = new FastHit(groupHit.getGlobalId().getRawId(), new Relevance(groupHit.getRank()),
+        FastHit hit = new FastHit(groupHit.getGlobalId().getRawId(),
+                                  new Relevance(groupHit.getRank()),
                                   groupHit.getPath(), groupHit.getDistributionKey());
         hit.setFillable();
         hit.setSearcherSpecificMetaData(searcher, summaryClass);
@@ -72,4 +73,5 @@ class HitConverter implements ResultBuilder.HitConverter {
         }
         return ret;
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java
index 2402be27b9c..f45617d1cd7 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java
@@ -285,6 +285,7 @@ class ResultBuilder {
             page.putContinuations(hitList.continuations());
             return hitList;
         }
+
     }
 
     private class GroupListBuilder {
@@ -341,6 +342,7 @@ class ResultBuilder {
             }
             return ret;
         }
+
     }
 
     private class PageInfo {
@@ -381,16 +383,17 @@ class ResultBuilder {
                 }
             }
         }
+
     }
 
     /**
-     * Defines a helper interface to convert Vespa style grouping hits into corresponding instances of {@link Hit}. It
-     * is an interface to simplify testing.
-     *
-     * @author Simon Thoresen Hult
+     * Defines a helper interface to convert Vespa style grouping hits into corresponding instances of {@link Hit}.
+     * It is an interface to simplify testing.
      */
     public interface HitConverter {
 
-        public com.yahoo.search.result.Hit toSearchHit(String summaryClass, com.yahoo.searchlib.aggregation.Hit hit);
+        com.yahoo.search.result.Hit toSearchHit(String summaryClass, com.yahoo.searchlib.aggregation.Hit hit);
+
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java b/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java
index 331a9ab5852..848666d628b 100644
--- a/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java
+++ b/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java
@@ -9,15 +9,13 @@ import java.util.List;
  *
  * @author bratseth
  */
-
 public abstract class HitOrderer {
 
     /** Orders the given list of hits */
     public abstract void order(List<Hit> hits);
 
     /**
-     * Returns the Comparator that this HitOrderer uses internally to
-     * sort hits. Returns null if no Comparator is used.
+     * Returns the Comparator that this HitOrderer uses internally to sort hits. Returns null if no Comparator is used.
      * <p>
      * This default implementation returns null.
      *
diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
index b660d90072b..dfc603846fd 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
@@ -1039,7 +1039,7 @@ public class YqlParser implements Parser {
         assertHasOperator(ast, ExpressionOperator.CONTAINS);
         String field = getIndex(ast.getArgument(0));
         if (userQuery != null && indexFactsSession.getIndex(field).isAttribute()) {
-            userQuery.trace("Field '" + field + "' is an attribute, 'contains' will only match exactly", 1);
+            userQuery.trace("Field '" + field + "' is an attribute, 'contains' will only match exactly", 2);
         }
         return instantiateLeafItem(field, ast.<OperatorNode<ExpressionOperator>> getArgument(1));
     }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java
index b8cc25930e2..78694bdd1e7 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.grouping.result;
 
+import com.yahoo.search.Query;
 import com.yahoo.search.grouping.Continuation;
 import org.junit.Test;