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""

3 files changed, 10 insertions, 12 deletions

diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.java
index 8f78363dab5..9a7aade7ffb 100644
--- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.java
+++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.plugin.classanalysis;
 
-import com.google.common.collect.ImmutableList;
 import com.yahoo.container.plugin.classanalysis.sampleclasses.Base;
 import com.yahoo.container.plugin.classanalysis.sampleclasses.ClassAnnotation;
 import com.yahoo.container.plugin.classanalysis.sampleclasses.InvisibleAnnotation;
@@ -25,6 +24,7 @@ import java.awt.image.ImagingOpException;
 import java.awt.image.Kernel;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import static com.yahoo.container.plugin.classanalysis.TestUtilities.analyzeClass;
 import static com.yahoo.container.plugin.classanalysis.TestUtilities.classFile;
@@ -176,7 +176,7 @@ public class AnalyzeClassTest {
     @Test
     void switch_statements_are_analyzed() {
         var referencedClasses = analyzeClass(SwitchStatement.class).getReferencedClasses();
-        assertTrue(referencedClasses.contains(name(ImmutableList.class)));
+        assertTrue(referencedClasses.contains(name(List.class)));
         assertTrue(referencedClasses.contains(name(IllegalArgumentException.class)));
     }
 
@@ -184,9 +184,9 @@ public class AnalyzeClassTest {
     void records_are_analyzed() {
         var referencedClasses = analyzeClass(RecordWithOverride.class).getReferencedClasses();
         assertTrue(referencedClasses.containsAll(List.of(
-                name(java.util.List.class),
+                name(List.class),
                 name(Byte.class),
-                name(ImmutableList.class),
+                name(String.class),
                 name(IllegalArgumentException.class)
         )));
 
diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses/RecordWithOverride.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses/RecordWithOverride.java
index 299a9930215..67c6430ce06 100644
--- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses/RecordWithOverride.java
+++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses/RecordWithOverride.java
@@ -1,7 +1,6 @@
 package com.yahoo.container.plugin.classanalysis.sampleclasses;
 
-import com.google.common.collect.ImmutableList;
-
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -13,7 +12,7 @@ import java.util.List;
 public record RecordWithOverride(List<Byte> list) {
 
     public RecordWithOverride {
-        if (list instanceof ImmutableList<Byte> l) {
+        if (list instanceof ArrayList<Byte> l) {
             throw new IllegalArgumentException(l.toString());
         }
     }
diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses/SwitchStatement.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses/SwitchStatement.java
index 5dbe90e2b58..f665d31150e 100644
--- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses/SwitchStatement.java
+++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses/SwitchStatement.java
@@ -1,9 +1,8 @@
 package com.yahoo.container.plugin.classanalysis.sampleclasses;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
 import java.util.Collection;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Input for class analysis test verifying Java 14 switch statement.
@@ -15,8 +14,8 @@ public class SwitchStatement {
     void switchStatement() throws Exception{
         String foo = "";
         Collection<?> c = switch (foo) {
-            case "list" -> ImmutableList.of();
-            case "set" -> ImmutableSet.of();
+            case "list" -> List.of();
+            case "set" -> Set.of();
             default -> throw new IllegalArgumentException();
         };
     }