diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2022-12-02 14:52:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-02 14:52:26 +0100 |
| commit | 81b884ac555806ae2f0a75773accfd8fe27ecbe1 (patch) | |
| tree | 0f92b9ef73a90854cacc96796562d3f21ff1cff6 /bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses | |
| parent | c956ac4cb73b329243072aabe35f0da508c02d0f (diff) | |
Revert "Let list handling catch up with Java 17"
Diffstat (limited to 'bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/sampleclasses')
2 files changed, 8 insertions, 6 deletions
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(); }; } |