From f9a5f6ec7beb29ad59f2016bdf8782ea59368142 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 6 Nov 2022 19:45:58 +0100 Subject: [PATCH] Use switch expression for EventFormatterFactory selection Useing a switch expression removes the unhandled case, promoting to a compile-time error if things do not match up. Change-Id: I8688e4bc76419194cb0d910105ff0733cd6d118f Signed-off-by: Robert Varga --- .../rfc8040/streams/listeners/ListenerAdapter.java | 12 ++++-------- .../listeners/NotificationListenerAdapter.java | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java index b438f36b02..4177ca19a6 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java @@ -48,14 +48,10 @@ public class ListenerAdapter extends AbstractCommonSubscriber JSON_FORMATTER_FACTORY; + case XML -> XMLDataTreeCandidateFormatter.FACTORY; + }; } @Override diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java index 5f43481862..120ac8d78e 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java @@ -40,14 +40,10 @@ public final class NotificationListenerAdapter extends AbstractCommonSubscriber< } private static NotificationFormatterFactory getFormatterFactory(final NotificationOutputType outputType) { - switch (outputType) { - case JSON: - return JSON_FORMATTER_FACTORY; - case XML: - return XMLNotificationFormatter.FACTORY; - default: - throw new IllegalArgumentException("Unsupported outputType " + outputType); - } + return switch (outputType) { + case JSON -> JSON_FORMATTER_FACTORY; + case XML -> XMLNotificationFormatter.FACTORY; + }; } @Override -- 2.36.6