Code clean up

[bgpcep.git] / bgp / openconfig-state / src / main / java / org / opendaylight / protocol / bgp / state / NeighborUtil.java

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 7ed5d40e6ff4b3bb06097d45c063b3f25948ab4f..c675662b3d84569f5f877307c2106753eba83344 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
@@ -325,13 +325,10 @@ public final class NeighborUtil {
     private static AfiSafi buildAfiSafi(@Nonnull final BGPAfiSafiState neighbor,
             @Nonnull final TablesKey tablesKey, @Nonnull final BGPTableTypeRegistryConsumer bgpTableTypeRegistry) {
         final Optional<Class<? extends AfiSafiType>> afiSafi = bgpTableTypeRegistry.getAfiSafiType(tablesKey);
-        if (!afiSafi.isPresent()) {
-            return null;
-        }
-
-        return new AfiSafiBuilder().setAfiSafiName(afiSafi.get())
+        return afiSafi.map(aClass -> new AfiSafiBuilder().setAfiSafiName(aClass)
                 .setState(buildAfiSafiState(neighbor, tablesKey, neighbor.isAfiSafiSupported(tablesKey)))
-                .setGracefulRestart(buildAfiSafiGracefulRestartState(neighbor, tablesKey)).build();
+                .setGracefulRestart(buildAfiSafiGracefulRestartState(neighbor, tablesKey)).build()).orElse(null);
+
     }
 
     private static org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi