Use switch expressions in mdsal-yanglib-rfc8525

[mdsal.git] / yanglib / mdsal-yanglib-rfc8525 / src / main / java / org / opendaylight / mdsal / yanglib / rfc8525 / MountPointContextFactoryImpl.java

diff --git a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/MountPointContextFactoryImpl.java b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/MountPointContextFactoryImpl.java
index 5af1079128a291d443199d6f0ccb243be3c5054d..05d2c28e58070b28abb80b86711bb34488c7b772 100644 (file)
--- a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/MountPointContextFactoryImpl.java
+++ b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/MountPointContextFactoryImpl.java
@@ -86,27 +86,18 @@ final class MountPointContextFactoryImpl extends AbstractMountPointContextFactor
 
     @Override
     protected Optional<EffectiveModelContext> findSchemaForLibrary(final ContainerName containerName) {
-        switch (containerName) {
-            case RFC7895:
-            case RFC8525:
-                return Optional.of(yangLibContext);
-            default:
-                LOG.debug("Unhandled YANG library container {}", containerName);
-                return Optional.empty();
-        }
+        return switch (containerName) {
+            case RFC7895, RFC8525 -> Optional.of(yangLibContext);
+        };
     }
 
     @Override
     protected EffectiveModelContext bindLibrary(final ContainerName containerName, final ContainerNode libData)
             throws YangParserException {
-        switch (containerName) {
-            case RFC7895:
-                return bindLibrary(verifyNotNull(legacyCodec.deserialize(libData)));
-            case RFC8525:
-                return bindLibrary(verifyNotNull(codec.deserialize(libData)));
-            default:
-                throw new IllegalStateException("Unhandled container type " + containerName);
-        }
+        return switch (containerName) {
+            case RFC7895 -> bindLibrary(verifyNotNull(legacyCodec.deserialize(libData)));
+            case RFC8525 -> bindLibrary(verifyNotNull(codec.deserialize(libData)));
+        };
     }
 
     private @NonNull EffectiveModelContext bindLibrary(final @NonNull YangLibrary yangLib) throws YangParserException {