Cleanup - no functional changes

3 files changed, 18 insertions, 19 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index a094be943a2..68ca8385b8a 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -73,10 +73,10 @@ public class FastHit extends Hit {
         distributionKey = 0;
     }
 
-    public FastHit(byte [] gid, double relevance, int partId, int distributionKey) {
+    public FastHit(byte[] gid, double relevance, int partId, int distributionKey) {
         this(gid, new Relevance(relevance), partId, distributionKey);
     }
-    public FastHit(byte [] gid, Relevance relevance, int partId, int distributionKey) {
+    public FastHit(byte[] gid, Relevance relevance, int partId, int distributionKey) {
         super(relevance);
         this.globalId = gid;
         this.partId = partId;
@@ -109,8 +109,8 @@ public class FastHit extends Hit {
      */
     @Override
     public URI getId() {
-        URI uri = super.getId();
-        if (uri != null) return uri;
+        URI id = super.getId();
+        if (id != null) return id;
 
         // Fallback to index:[source]/[partid]/[id]
         StringBuilder sb = new StringBuilder(64);
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java
index 6ecf9cd906f..9f875347ccc 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java
@@ -20,7 +20,6 @@ import java.util.Map;
 
 import static com.yahoo.prelude.querytransform.NormalizingSearcher.ACCENT_REMOVAL;
 
-
 /**
  * Check sorting specification makes sense to the search cluster before
  * passing it on to the backend.
@@ -35,6 +34,13 @@ public class ValidateSortingSearcher extends Searcher {
     private String clusterName = "";
     private final QrSearchersConfig.Searchcluster.Indexingmode.Enum indexingMode;
 
+    public ValidateSortingSearcher(QrSearchersConfig qrsConfig, ClusterConfig clusterConfig,
+                                   AttributesConfig attributesConfig) {
+        initAttributeNames(attributesConfig);
+        setClusterName(qrsConfig.searchcluster(clusterConfig.clusterId()).name());
+        indexingMode = qrsConfig.searchcluster(clusterConfig.clusterId()).indexingmode();
+    }
+
     public String getClusterName() {
         return clusterName;
     }
@@ -63,14 +69,6 @@ public class ValidateSortingSearcher extends Searcher {
         setAttributeNames(attributes);
     }
 
-    public ValidateSortingSearcher(QrSearchersConfig qrsConfig, ClusterConfig clusterConfig,
-                                   AttributesConfig attributesConfig)
-    {
-        initAttributeNames(attributesConfig);
-        setClusterName(qrsConfig.searchcluster(clusterConfig.clusterId()).name());
-        indexingMode = qrsConfig.searchcluster(clusterConfig.clusterId()).indexingmode();
-    }
-
     @Override
     public Result search(Query query, Execution execution) {
         if (indexingMode != QrSearchersConfig.Searchcluster.Indexingmode.STREAMING) {
diff --git a/container-search/src/main/java/com/yahoo/search/result/Hit.java b/container-search/src/main/java/com/yahoo/search/result/Hit.java
index d7acccc75a7..0011d69fc2c 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Hit.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Hit.java
@@ -16,6 +16,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.BiConsumer;
@@ -50,7 +51,7 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
     private Map<String, Object> fields = null;
     private Map<String, Object> unmodifiableFieldMap = null;
 
-    /** Meta data describing how a given searcher should treat this hit. */
+    /** Metadata describing how a given searcher should treat this hit. */
     // TODO: The case for this is to allow multiple levels of federation searcher routing.
     //       Replace this by a cleaner specific solution to that problem.
     private Map<Searcher, Object> searcherSpecificMetaData;
@@ -289,7 +290,8 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
      * Returns the id to display, or null to not display (render) the id.
      * This is useful to avoid displaying ids when they are not assigned explicitly
      * but are just generated values for internal use.
-     * This default implementation returns {@link #getId()}.toString()
+     * This default implementation returns the field DOCUMENT_ID if set,
+     * and {@link #getId()}.toString() otherwise.
      */
     public String getDisplayId() {
         String id = null;
@@ -304,8 +306,7 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
 
     /** Sets the relevance of this hit */
     public void setRelevance(Relevance relevance) {
-        if (relevance == null) throw new NullPointerException("Cannot assign null as relevance");
-        this.relevance = relevance;
+        this.relevance = Objects.requireNonNull(relevance);
     }
 
     /** Does setRelevance(new Relevance(relevance) */
@@ -330,7 +331,7 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
      * have been used for filling so far. Invoking this method
      * multiple times is allowed and will have no addition
      * effect. Note that a fillable hit may not be made unfillable.
-     **/
+     */
     public void setFillable() {
         if (filled == null) {
             filled = Collections.emptySet();
@@ -344,7 +345,7 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
      * tag this hit as fillable if it is currently not.
      *
      * @param summaryClass summary class used for filling
-     **/
+     */
     public void setFilled(String summaryClass) {
         if (filled == null || filled.isEmpty()) {
             filled = Collections.singleton(summaryClass);