Use switch expressions in yang-data-impl

Switch expressions give us exhaustivity and more compact code, use them
where appropriate.

Change-Id: I13a9f146d92b17c1b87725926b4da6a0844cb97a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanStringCodec.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanStringCodec.java
index 068297015cc03003640bd039cee93b576a37db46..2cebf15377c6009536bd1349464bd27418c4b445 100644 (file)
--- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanStringCodec.java
+++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanStringCodec.java
@@ -30,15 +30,12 @@ public final class BooleanStringCodec extends TypeDefinitionAwareCodec<Boolean,
 
     @Override
     protected Boolean deserializeImpl(final String product) {
-        switch (product) {
-            case "true":
-                return Boolean.TRUE;
-            case "false":
-                return Boolean.FALSE;
-            default:
-                throw new IllegalArgumentException("Invalid value '" + product + "' for boolean type. Allowed values "
-                    + "are 'true' and 'false'");
-        }
+        return switch (product) {
+            case "true" -> Boolean.TRUE;
+            case "false" -> Boolean.FALSE;
+            default -> throw new IllegalArgumentException(
+                "Invalid value '" + product + "' for boolean type. Allowed values are 'true' and 'false'");
+        };
     }
 
     @Override

diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/CompiledPatternContext.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/CompiledPatternContext.java
index 20e9fac00ca5509f6ece5ffe8a6a2954c4d0de54..6bbf3406152a88c4c83231d069e2a7c918d6008b 100644 (file)
--- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/CompiledPatternContext.java
+++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/CompiledPatternContext.java
@@ -22,19 +22,14 @@ final class CompiledPatternContext {
     private final boolean invert;
 
     CompiledPatternContext(final PatternConstraint yangConstraint) {
-        this.constraint = requireNonNull(yangConstraint);
+        constraint = requireNonNull(yangConstraint);
         pattern = Pattern.compile(yangConstraint.getJavaPatternString());
 
         final Optional<ModifierKind> optModifier = yangConstraint.getModifier();
         if (optModifier.isPresent()) {
-            final ModifierKind modifier = optModifier.get();
-            switch (modifier) {
-                case INVERT_MATCH:
-                    invert = true;
-                    break;
-                default:
-                    throw new IllegalStateException("Unhandled modifier " + modifier);
-            }
+            invert = switch (optModifier.orElseThrow()) {
+                case INVERT_MATCH -> true;
+            };
         } else {
             invert = false;
         }