From 1e8483d921223517800f63189f72ba956354e8b3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 6 Mar 2024 16:28:54 +0100 Subject: [PATCH] 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 --- .../protocol/bgp/state/NeighborUtil.java | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) 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 f78c9e2f29..b607e833e5 100644 --- 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 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(); } /** -- 2.36.6