Use switch expressions in yang-model-ri 21/101321/2
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 29 May 2022 17:36:01 +0000 (19:36 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sun, 29 May 2022 18:42:23 +0000 (20:42 +0200)
We are dealing with enumerations, hence we can take advantage of
exhaustiveness of switch expressions.

Change-Id: I370e3bf9004a540eaf1e55eb1d7f82862451a322
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatements.java

index 59626ca810517237b818b14657a99472983534c1..4fc04784dd89576d7b1ca2ba85dab5c9099eab61 100644 (file)
@@ -625,16 +625,11 @@ public final class DeclaredStatements {
     }
 
     private static StatusStatement createStatus(final Status argument) {
-        switch (argument) {
-            case CURRENT:
-                return EmptyStatusStatement.CURRENT;
-            case DEPRECATED:
-                return EmptyStatusStatement.DEPRECATED;
-            case OBSOLETE:
-                return EmptyStatusStatement.OBSOLETE;
-            default:
-                throw new IllegalStateException("Unhandled argument " + argument);
-        }
+        return switch (argument) {
+            case CURRENT -> EmptyStatusStatement.CURRENT;
+            case DEPRECATED -> EmptyStatusStatement.DEPRECATED;
+            case OBSOLETE -> EmptyStatusStatement.OBSOLETE;
+        };
     }
 
     public static SubmoduleStatement createSubmodule(final String rawArgument, final Unqualified argument,
@@ -700,14 +695,10 @@ public final class DeclaredStatements {
     }
 
     private static YangVersionStatement createYangVersion(final YangVersion argument) {
-        switch (argument) {
-            case VERSION_1:
-                return EmptyYangVersionStatement.VERSION_1;
-            case VERSION_1_1:
-                return EmptyYangVersionStatement.VERSION_1_1;
-            default:
-                throw new IllegalStateException("Unhandled version " + argument);
-        }
+        return switch (argument) {
+            case VERSION_1 -> EmptyYangVersionStatement.VERSION_1;
+            case VERSION_1_1 -> EmptyYangVersionStatement.VERSION_1_1;
+        };
     }
 
     public static YinElementStatement createYinElement(final boolean argument) {