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

1 files changed, 4 insertions, 5 deletions

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();
         };
     }