summaryrefslogtreecommitdiffstats
path: root/predicate-search/src/test/java/com/yahoo/search/predicate/annotator
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2024-04-12 08:30:35 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2024-04-12 08:39:04 +0200
commit76a89b62274060452022ddf24a7685ee2f380cb4 (patch)
treeef924603de22efd026f519ab31fd8f5a6ff60f2f /predicate-search/src/test/java/com/yahoo/search/predicate/annotator
parent7e7ebf7b527be1f163d497a41898e2252d878fe7 (diff)
Replace all usages of Arrays.asList with List.of where possible.
Diffstat (limited to 'predicate-search/src/test/java/com/yahoo/search/predicate/annotator')
-rw-r--r--predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java18
-rw-r--r--predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java7
2 files changed, 10 insertions, 15 deletions
diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java
index 401c006b273..bc330a7d1f3 100644
--- a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java
+++ b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java
@@ -6,7 +6,8 @@ import com.yahoo.document.predicate.Predicate;
import com.yahoo.document.predicate.PredicateOperator;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
+
+import java.util.List;
import static com.yahoo.document.predicate.Predicates.and;
import static com.yahoo.document.predicate.Predicates.feature;
@@ -208,7 +209,7 @@ public class PredicateTreeAnalyzerTest {
}
private static FeatureConjunction conj(Predicate... operands) {
- return new FeatureConjunction(Arrays.asList(operands));
+ return new FeatureConjunction(List.of(operands));
}
private static void assertSizeMapContains(PredicateTreeAnalyzerResult r, PredicateSelector selector, int expectedValue) {
@@ -217,18 +218,13 @@ public class PredicateTreeAnalyzerTest {
assertEquals(expectedValue, actualValue.intValue());
}
- private static class PredicateSelector {
- public final Predicate predicate;
-
- public PredicateSelector(Predicate predicate) {
- this.predicate = predicate;
- }
+ private record PredicateSelector(Predicate predicate) {
public PredicateSelector child(int index) {
- PredicateOperator op = (PredicateOperator) predicate;
- return new PredicateSelector(op.getOperands().get(index));
+ PredicateOperator op = (PredicateOperator) predicate;
+ return new PredicateSelector(op.getOperands().get(index));
+ }
}
- }
private static PredicateSelector pred(Predicate p) {
return new PredicateSelector(p);
diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java
index 18cdc4defff..237aeda4fb3 100644
--- a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java
+++ b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java
@@ -13,7 +13,6 @@ import com.yahoo.search.predicate.index.IntervalWithBounds;
import com.yahoo.search.predicate.index.conjunction.IndexableFeatureConjunction;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -229,7 +228,7 @@ public class PredicateTreeAnnotatorTest {
long hash = PredicateHash.hash64(feature);
List<Integer> actualIntervals = r.intervalMap.get(hash);
assertNotNull(actualIntervals);
- assertArrayEquals(Ints.toArray(Arrays.asList(expectedIntervals)), Ints.toArray(actualIntervals));
+ assertArrayEquals(Ints.toArray(List.of(expectedIntervals)), Ints.toArray(actualIntervals));
}
private static void assertBoundsContains(PredicateTreeAnnotations r, String feature, IntervalWithBounds expectedBounds) {
@@ -258,11 +257,11 @@ public class PredicateTreeAnnotatorTest {
private static FeatureRange range(String key, Long lower, Long upper, RangePartition... partitions) {
FeatureRange range = new FeatureRange(key, lower, upper);
- Arrays.asList(partitions).forEach(range::addPartition);
+ List.of(partitions).forEach(range::addPartition);
return range;
}
private static FeatureConjunction conj(Predicate... operands) {
- return new FeatureConjunction(Arrays.asList(operands));
+ return new FeatureConjunction(List.of(operands));
}
}