Use a switch expression in NeighborUtil

Use a switch expression to convert enum values, ensuring exhaustive
coverage.

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

diff --git a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java
index f78c9e2f292509d22e6456f5630c431792f188cd..b607e833e54512f71bb1e1f4d12aafefc594ebd1 100644 (file)
--- a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java
+++ b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java
@@ -266,23 +266,15 @@ public final class NeighborUtil {
      * @return Neighbor State
      */
     public static NeighborStateAugmentation buildCapabilityState(final @NonNull BGPSessionState neighbor) {
-
-        final Set<BgpCapability> supportedCapabilities = buildSupportedCapabilities(neighbor);
-        SessionState sessionState = null;
-        switch (neighbor.getSessionState()) {
-            case IDLE:
-                sessionState = SessionState.IDLE;
-                break;
-            case UP:
-                sessionState = SessionState.ESTABLISHED;
-                break;
-            case OPEN_CONFIRM:
-                sessionState = SessionState.OPENCONFIRM;
-                break;
-            default:
-        }
-        return new NeighborStateAugmentationBuilder().setSupportedCapabilities(supportedCapabilities)
-                .setSessionState(sessionState).build();
+        final var state = switch (neighbor.getSessionState()) {
+            case IDLE -> SessionState.IDLE;
+            case UP -> SessionState.ESTABLISHED;
+            case OPEN_CONFIRM -> SessionState.OPENCONFIRM;
+        };
+        return new NeighborStateAugmentationBuilder()
+            .setSupportedCapabilities(buildSupportedCapabilities(neighbor))
+            .setSessionState(state)
+            .build();
     }
 
     /**