Use enhanced switch / switch expression

2 files changed, 10 insertions, 22 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) {
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java
index e57af606b3a..310527e9254 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java
@@ -120,18 +120,10 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector {
             public void visit(String name, Object value) {
                 if (name != null) {
                     switch (name) {
-                    case "major":
-                        major = (int) value;
-                        break;
-                    case "minor":
-                        minor = (int) value;
-                        break;
-                    case "micro":
-                        micro = (int) value;
-                        break;
-                    case "qualifier":
-                        qualifier = (String) value;
-                        break;
+                        case "major" -> major = (int) value;
+                        case "minor" -> minor = (int) value;
+                        case "micro" -> micro = (int) value;
+                        case "qualifier" -> qualifier = (String) value;
                     }
                 }
             }