Merge pull request #25096 from vespa-engine/revert-25091-revert-25088-balder/immutablelist-2-listv8.94.46

Revert "Revert "Let list handling catch up with Java 17""

1 files changed, 3 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java
index 59dad29ab5c..ea78b2365c5 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java
@@ -9,7 +9,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.ImmutableList;
 import com.yahoo.compress.IntegerCompressor;
 
 /**
@@ -30,7 +29,7 @@ public class WordAlternativesItem extends TermItem {
         this.alternatives = uniqueAlternatives(terms);
     }
 
-    private static ImmutableList<Alternative> uniqueAlternatives(Collection<Alternative> terms) {
+    private static List<Alternative> uniqueAlternatives(Collection<Alternative> terms) {
         List<Alternative> uniqueTerms = new ArrayList<>(terms.size());
         for (Alternative term : terms) {
             int i = Collections.binarySearch(uniqueTerms, term, (t0, t1) -> t0.word.compareTo(t1.word));
@@ -43,7 +42,7 @@ public class WordAlternativesItem extends TermItem {
                 uniqueTerms.add(~i, term);
             }
         }
-        return ImmutableList.copyOf(uniqueTerms);
+        return List.copyOf(uniqueTerms);
     }
 
     @Override
@@ -177,8 +176,7 @@ public class WordAlternativesItem extends TermItem {
 
         @Override
         public boolean equals(Object o) {
-            if ( ! (o instanceof Alternative)) return false;
-            var other = (Alternative)o;
+            if ( ! (o instanceof Alternative other)) return false;
             if ( ! Objects.equals(this.word, other.word)) return false;
             if (this.exactness != other.exactness) return false;
             return true;