diff options
Diffstat (limited to 'predicate-search-core/src')
9 files changed, 45 insertions, 50 deletions
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java index a5b190d95ab..afe5ea29111 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java @@ -2,7 +2,6 @@ package com.yahoo.document.predicate; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -15,7 +14,7 @@ public class Conjunction extends PredicateOperator { private List<Predicate> operands; public Conjunction(Predicate... operands) { - this(Arrays.asList(operands)); + this(List.of(operands)); } public Conjunction(List<? extends Predicate> operands) { diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java index 0b03f8afc40..db8392dcdb3 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java @@ -2,7 +2,6 @@ package com.yahoo.document.predicate; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -15,7 +14,7 @@ public class Disjunction extends PredicateOperator { private List<Predicate> operands; public Disjunction(Predicate... operands) { - this(Arrays.asList(operands)); + this(List.of(operands)); } public Disjunction(List<? extends Predicate> operands) { diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java index d2486850f3a..bf1d006fda0 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java @@ -1,9 +1,9 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; +import java.util.List; import java.util.Objects; import java.util.Set; import java.util.TreeSet; @@ -17,7 +17,7 @@ public class FeatureSet extends PredicateValue { private String key; public FeatureSet(String key, String... values) { - this(key, Arrays.asList(values)); + this(key, List.of(values)); } public FeatureSet(String key, Collection<String> values) { @@ -83,10 +83,9 @@ public class FeatureSet extends PredicateValue { if (obj == this) { return true; } - if (!(obj instanceof FeatureSet)) { + if (!(obj instanceof FeatureSet rhs)) { return false; } - FeatureSet rhs = (FeatureSet)obj; if (!key.equals(rhs.key)) { return false; } diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java index 62ad522e655..5e138fe8909 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java @@ -28,7 +28,7 @@ public class Negation extends PredicateOperator { @Override public List<Predicate> getOperands() { - return java.util.Arrays.asList(operand); + return java.util.List.of(operand); } @Override diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java index 56b338453d2..a698248ab6b 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java @@ -3,7 +3,7 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -22,18 +22,18 @@ public class ConjunctionTest { Conjunction node = new Conjunction(); Predicate a = SimplePredicates.newString("a"); node.addOperand(a); - assertEquals(Arrays.asList(a), node.getOperands()); + assertEquals(List.of(a), node.getOperands()); Predicate b = SimplePredicates.newString("b"); node.addOperand(b); - assertEquals(Arrays.asList(a, b), node.getOperands()); + assertEquals(List.of(a, b), node.getOperands()); Predicate c = SimplePredicates.newString("c"); Predicate d = SimplePredicates.newString("d"); - node.addOperands(Arrays.asList(c, d)); - assertEquals(Arrays.asList(a, b, c, d), node.getOperands()); + node.addOperands(List.of(c, d)); + assertEquals(List.of(a, b, c, d), node.getOperands()); Predicate e = SimplePredicates.newString("e"); Predicate f = SimplePredicates.newString("f"); - node.setOperands(Arrays.asList(e, f)); - assertEquals(Arrays.asList(e, f), node.getOperands()); + node.setOperands(List.of(e, f)); + assertEquals(List.of(e, f), node.getOperands()); } @Test @@ -41,10 +41,10 @@ public class ConjunctionTest { Predicate foo = SimplePredicates.newString("foo"); Predicate bar = SimplePredicates.newString("bar"); Conjunction node = new Conjunction(foo, bar); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + assertEquals(List.of(foo, bar), node.getOperands()); - node = new Conjunction(Arrays.asList(foo, bar)); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + node = new Conjunction(List.of(foo, bar)); + assertEquals(List.of(foo, bar), node.getOperands()); } @Test diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java index efde8ec7532..fa1cde8fdd3 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java @@ -3,7 +3,7 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -22,18 +22,18 @@ public class DisjunctionTest { Disjunction node = new Disjunction(); Predicate a = SimplePredicates.newString("a"); node.addOperand(a); - assertEquals(Arrays.asList(a), node.getOperands()); + assertEquals(List.of(a), node.getOperands()); Predicate b = SimplePredicates.newString("b"); node.addOperand(b); - assertEquals(Arrays.asList(a, b), node.getOperands()); + assertEquals(List.of(a, b), node.getOperands()); Predicate c = SimplePredicates.newString("c"); Predicate d = SimplePredicates.newString("d"); - node.addOperands(Arrays.asList(c, d)); - assertEquals(Arrays.asList(a, b, c, d), node.getOperands()); + node.addOperands(List.of(c, d)); + assertEquals(List.of(a, b, c, d), node.getOperands()); Predicate e = SimplePredicates.newString("e"); Predicate f = SimplePredicates.newString("f"); - node.setOperands(Arrays.asList(e, f)); - assertEquals(Arrays.asList(e, f), node.getOperands()); + node.setOperands(List.of(e, f)); + assertEquals(List.of(e, f), node.getOperands()); } @Test @@ -41,10 +41,10 @@ public class DisjunctionTest { Predicate foo = SimplePredicates.newString("foo"); Predicate bar = SimplePredicates.newString("bar"); Disjunction node = new Disjunction(foo, bar); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + assertEquals(List.of(foo, bar), node.getOperands()); - node = new Disjunction(Arrays.asList(foo, bar)); - assertEquals(Arrays.asList(foo, bar), node.getOperands()); + node = new Disjunction(List.of(foo, bar)); + assertEquals(List.of(foo, bar), node.getOperands()); } @Test diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java index 06c1a445494..3977ad02999 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java @@ -3,7 +3,7 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -249,15 +249,15 @@ public class FeatureRangeTest { @Test void requireThatFeatureRangeCanBeBuiltFromMixedInNode() { assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10-19"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10-19"), 10)); assertEquals(new FeatureRange("foo", -19L, -10L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=-10-19"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=-10-19"), 10)); assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10,10,9"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10,10,9"), 10)); assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10,10,1073741833"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10,10,1073741833"), 10)); assertEquals(new FeatureRange("foo", 10L, 19L), - FeatureRange.buildFromMixedIn("foo", Arrays.asList("foo=10,10,2147483648"), 10)); + FeatureRange.buildFromMixedIn("foo", List.of("foo=10,10,2147483648"), 10)); } } diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java index b61f843c10e..31cfe4318fb 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java @@ -4,7 +4,6 @@ package com.yahoo.document.predicate; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -25,35 +24,35 @@ public class FeatureSetTest { void requireThatAccessorsWork() { FeatureSet node = new FeatureSet("key", "valueA", "valueB"); assertEquals("key", node.getKey()); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); node.addValue("valueC"); - assertValues(Arrays.asList("valueA", "valueB", "valueC"), node); - node.addValues(Arrays.asList("valueD", "valueE")); - assertValues(Arrays.asList("valueA", "valueB", "valueC", "valueD", "valueE"), node); - node.setValues(Arrays.asList("valueF", "valueG")); - assertValues(Arrays.asList("valueF", "valueG"), node); + assertValues(List.of("valueA", "valueB", "valueC"), node); + node.addValues(List.of("valueD", "valueE")); + assertValues(List.of("valueA", "valueB", "valueC", "valueD", "valueE"), node); + node.setValues(List.of("valueF", "valueG")); + assertValues(List.of("valueF", "valueG"), node); } @Test void requireThatValueSetIsMutable() { FeatureSet node = new FeatureSet("key"); node.getValues().add("valueA"); - assertValues(Arrays.asList("valueA"), node); + assertValues(List.of("valueA"), node); node = new FeatureSet("key", "valueA"); node.getValues().add("valueB"); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); } @Test void requireThatConstructorsWork() { FeatureSet node = new FeatureSet("key", "valueA", "valueB"); assertEquals("key", node.getKey()); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); - node = new FeatureSet("key", Arrays.asList("valueA", "valueB")); + node = new FeatureSet("key", List.of("valueA", "valueB")); assertEquals("key", node.getKey()); - assertValues(Arrays.asList("valueA", "valueB"), node); + assertValues(List.of("valueA", "valueB"), node); } @Test @@ -123,7 +122,7 @@ public class FeatureSetTest { } catch (NullPointerException e) { assertEquals("value", e.getMessage()); } - assertValues(Arrays.asList("bar"), node); + assertValues(List.of("bar"), node); } @Test diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java index 8bc434218b7..b8ec623410c 100644 --- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java @@ -4,7 +4,6 @@ package com.yahoo.search.predicate; import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,7 +33,7 @@ public class PredicateQueryParserTest { (k, v, s) -> result.add(String.format("%s:%s:%#x", k, v, s)), (k, v, s) -> result.add(String.format("%s:%d:%#x", k, v, s))); - assertEquals(result, Arrays.asList( + assertEquals(result, List.of( "k1:value1:0x1", "k2:value2:0x3", "range1:123456789123:0xffff", "range2:0:0xffffffffffffffff")); } |