Use switch expressions in yang-data-impl

[yangtools.git] / data / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / codec / CompiledPatternContext.java

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;
         }