Merge pull request #24424 from vespa-engine/bratseth/cleanup-0

Cleanup, and throw better exceptions

2 files changed, 8 insertions, 15 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 68ca8385b8a..730e2393b7f 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
@@ -31,18 +31,18 @@ import java.util.function.BiConsumer;
  */
 public class FastHit extends Hit {
 
-    private static final byte [] emptyGID = new byte[GlobalId.LENGTH];
+    private static final byte[] emptyGID = new byte[GlobalId.LENGTH];
     /** The index of the content node this hit originated at */
-    private int distributionKey = 0;
+    private int distributionKey;
 
     /** The local identifier of the content store for this hit on the node it originated at */
     private int partId;
 
     /** The global id of this document in the backend node which produced it */
-    private byte [] globalId;
+    private byte[] globalId;
 
     private transient byte[] sortData = null;
-    // TODO I suspect this one can be dropped.
+    // TODO: I suspect this one can be dropped.
     private transient Sorting sortDataSorting = null;
 
     /**
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 6067f85df9b..546a5d724a8 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
@@ -18,15 +18,14 @@ public class SortDataHitSorter {
             return;
         }
         var fallbackComparator = fallbackOrderer.getComparator();
-        Collections.sort(hits, getComparator(sorting, fallbackComparator));
+        hits.sort(getComparator(sorting, fallbackComparator));
     }
 
     public static boolean isSortable(Hit hit, Sorting sorting) {
         if (sorting == null) {
             return false;
         }
-        if (hit instanceof FastHit) {
-            var fhit = (FastHit) hit;
+        if (hit instanceof FastHit fhit) {
             return fhit.hasSortData(sorting);
         } else {
             return false;
@@ -42,20 +41,14 @@ public class SortDataHitSorter {
     }
 
     private static int compareTwo(Hit left, Hit right, Sorting sorting) {
-        if (left == null || right == null || !(left instanceof FastHit) || !(right instanceof FastHit)) {
-            return 0;
-        }
-        FastHit fl = (FastHit) left;
-        FastHit fr = (FastHit) right;
+        if (!(left instanceof FastHit fl) || !(right instanceof FastHit fr)) return 0;
         return FastHit.compareSortData(fl, fr, sorting);
     }
 
     private static int compareWithFallback(Hit left, Hit right, Sorting sorting, Comparator<Hit> fallback) {
-        if (left == null || right == null || !(left instanceof FastHit) || !(right instanceof FastHit)) {
+        if (!(left instanceof FastHit fl) || !(right instanceof FastHit fr)) {
             return fallback.compare(left, right);
         }
-        FastHit fl = (FastHit) left;
-        FastHit fr = (FastHit) right;
         if (fl.hasSortData(sorting) && fr.hasSortData(sorting)) {
             return FastHit.compareSortData(fl, fr, sorting);
         } else {