diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-12-02 22:44:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-02 22:44:23 +0100 |
commit | c0a2a4c5b8c595b3f523026a9684d505cabedf05 (patch) | |
tree | 94fedd0f85998659dd956b5256e60ca8e4950817 /container-search/src/main/java/com/yahoo/prelude/query | |
parent | 7f870bf3cb8dd0a3d015a448608ba7291a783932 (diff) |
Revert "Revert "Let list handling catch up with Java 17""
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude/query')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java | 8 |
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; |