1 files changed, 6 insertions, 10 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java
index a93f8cb87d5..6f3e670b228 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java
@@ -52,16 +52,12 @@ public class Analyze {
     }
 
     static Optional<String> getClassName(Type aType) {
-        switch (aType.getSort()) {
-            case Type.ARRAY:
-                return getClassName(aType.getElementType());
-            case Type.OBJECT:
-                return Optional.of(aType.getClassName());
-            case Type.METHOD:
-                return getClassName(aType.getReturnType());
-            default:
-                return Optional.empty();
-        }
+        return switch (aType.getSort()) {
+            case Type.ARRAY -> getClassName(aType.getElementType());
+            case Type.OBJECT -> Optional.of(aType.getClassName());
+            case Type.METHOD -> getClassName(aType.getReturnType());
+            default -> Optional.empty();
+        };
     }
 
     static AnnotationVisitor visitAnnotationDefault(ImportCollector collector) {