Cleanup - no functional changes

2 files changed, 11 insertions, 13 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) {