More NodeList

2 files changed, 8 insertions, 2 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java b/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java
index ec85cb6de56..2b7f4027fbc 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java
@@ -68,8 +68,14 @@ public abstract class AbstractFilteringList<Type, ListType extends AbstractFilte
         return matching(new HashSet<>(others.asList())::contains);
     }
 
-    /** Returns the union of the two lists. */
+    /** @deprecated use and(others) */
+    @Deprecated // TODO: Remove on Vespa 8
     public ListType concat(ListType others) {
+        return and(others);
+    }
+
+    /** Returns the union of the two lists. */
+    public ListType and(ListType others) {
         return constructor.apply(Stream.concat(items.stream(), others.asList().stream()).collect(toUnmodifiableList()), false);
     }
 
diff --git a/vespajlib/src/test/java/com/yahoo/collections/AbstractFilteringListTest.java b/vespajlib/src/test/java/com/yahoo/collections/AbstractFilteringListTest.java
index 3524f507701..475b0c38200 100644
--- a/vespajlib/src/test/java/com/yahoo/collections/AbstractFilteringListTest.java
+++ b/vespajlib/src/test/java/com/yahoo/collections/AbstractFilteringListTest.java
@@ -49,7 +49,7 @@ public class AbstractFilteringListTest {
                      list.not().in(MyList.of("ABC", "CBA")).asList());
 
         assertEquals(List.of("ABC", "abc", "cba", "bbb", "ABC", "aaa", "ABC"),
-                     list.concat(MyList.of("aaa", "ABC")).asList());
+                     list.and(MyList.of("aaa", "ABC")).asList());
     }
 
     private static class MyList extends AbstractFilteringList<String, MyList> {