Revert "Let list handling catch up with Java 17"

4 files changed, 14 insertions, 10 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/PackageTally.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/PackageTally.java
index e2de90a6463..2ad77e2433b 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/PackageTally.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/PackageTally.java
@@ -1,6 +1,7 @@
 // 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.annotations.VisibleForTesting;
 import com.google.common.collect.Sets;
 import com.yahoo.container.plugin.util.Maps;
 
@@ -20,6 +21,7 @@ public class PackageTally {
     private final Map<String, Optional<ExportPackageAnnotation>> definedPackagesMap;
     private final Set<String> referencedPackagesUnfiltered;
 
+    @VisibleForTesting
     PackageTally(Map<String, Optional<ExportPackageAnnotation>> definedPackagesMap, Set<String> referencedPackagesUnfiltered) {
         this.definedPackagesMap = definedPackagesMap;
         this.referencedPackagesUnfiltered = referencedPackagesUnfiltered;
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 9a7aade7ffb..8f78363dab5 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,6 +1,7 @@
 // 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;
@@ -24,7 +25,6 @@ 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(List.class)));
+        assertTrue(referencedClasses.contains(name(ImmutableList.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(List.class),
+                name(java.util.List.class),
                 name(Byte.class),
-                name(String.class),
+                name(ImmutableList.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 67c6430ce06..299a9930215 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,6 +1,7 @@
 package com.yahoo.container.plugin.classanalysis.sampleclasses;
 
-import java.util.ArrayList;
+import com.google.common.collect.ImmutableList;
+
 import java.util.List;
 
 /**
@@ -12,7 +13,7 @@ import java.util.List;
 public record RecordWithOverride(List<Byte> list) {
 
     public RecordWithOverride {
-        if (list instanceof ArrayList<Byte> l) {
+        if (list instanceof ImmutableList<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 f665d31150e..5dbe90e2b58 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,8 +1,9 @@
 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.
@@ -14,8 +15,8 @@ public class SwitchStatement {
     void switchStatement() throws Exception{
         String foo = "";
         Collection<?> c = switch (foo) {
-            case "list" -> List.of();
-            case "set" -> Set.of();
+            case "list" -> ImmutableList.of();
+            case "set" -> ImmutableSet.of();
             default -> throw new IllegalArgumentException();
         };
     }