Remove use of Optional from DeviceInitializationUtil

The use here is completely unneeded -- we can serve the same thing
with checks for null.

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtil.java
index 819674df8062f65bf9f6acc9c69f57ceea577570..180bef535b282a069b439b03f699ac4be6db6c93 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtil.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtil.java
@@ -8,11 +8,12 @@
 package org.opendaylight.openflowplugin.impl.util;
 
 import java.net.InetSocketAddress;
-import java.util.Optional;
 import java.util.concurrent.ExecutionException;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.device.TxFacade;
@@ -95,14 +96,13 @@ public final class DeviceInitializationUtil {
     public static IpAddress getIpAddress(final ConnectionContext connectionContext,
                                          final InstanceIdentifier<Node> instanceIdentifier) {
         final String node = PathUtil.extractNodeId(instanceIdentifier).getValue();
-
-        return getRemoteAddress(connectionContext, instanceIdentifier)
-                .map(inetSocketAddress -> {
-                    final IpAddress ipAddress = IetfInetUtil.INSTANCE.ipAddressFor(inetSocketAddress.getAddress());
-                    LOG.info("IP address of the node {} is: {}", node, ipAddress);
-                    return ipAddress;
-                })
-                .orElse(null);
+        final InetSocketAddress address = getRemoteAddress(connectionContext, instanceIdentifier);
+        if (address == null) {
+            return null;
+        }
+        final IpAddress ipAddress = IetfInetUtil.INSTANCE.ipAddressFor(address.getAddress());
+        LOG.info("IP address of the node {} is: {}", node, ipAddress);
+        return ipAddress;
     }
 
     /**
@@ -115,15 +115,13 @@ public final class DeviceInitializationUtil {
     public static PortNumber getPortNumber(final ConnectionContext connectionContext,
                                            final InstanceIdentifier<Node> instanceIdentifier) {
         final String node = PathUtil.extractNodeId(instanceIdentifier).getValue();
-
-        return getRemoteAddress(connectionContext, instanceIdentifier)
-                .map(inetSocketAddress -> {
-                    final int port = inetSocketAddress.getPort();
-                    LOG.info("Port number of the node {} is: {}", node, port);
-                    return new PortNumber(port);
-                })
-                .orElse(null);
-
+        final InetSocketAddress address = getRemoteAddress(connectionContext, instanceIdentifier);
+        if (address == null) {
+            return null;
+        }
+        final int port = address.getPort();
+        LOG.info("Port number of the node {} is: {}", node, port);
+        return new PortNumber(port);
     }
 
     /**
@@ -140,18 +138,14 @@ public final class DeviceInitializationUtil {
                         .build());
     }
 
-    private static Optional<InetSocketAddress> getRemoteAddress(final ConnectionContext connectionContext,
+    private static @Nullable InetSocketAddress getRemoteAddress(final ConnectionContext connectionContext,
                                                                 final InstanceIdentifier<Node> instanceIdentifier) {
-        final Optional<InetSocketAddress> inetSocketAddress = Optional
-                .ofNullable(connectionContext.getConnectionAdapter())
-                .flatMap(connectionAdapter -> Optional.ofNullable(connectionAdapter.getRemoteAddress()));
-
-        if (!inetSocketAddress.isPresent()) {
-            LOG.warn("Remote address of the node {} cannot be obtained. No connection with switch.", PathUtil
-                    .extractNodeId(instanceIdentifier));
+        final ConnectionAdapter adapter = connectionContext.getConnectionAdapter();
+        final InetSocketAddress remoteAddress = adapter == null ? null : adapter.getRemoteAddress();
+        if (remoteAddress == null) {
+            LOG.warn("Remote address of the node {} cannot be obtained. No connection with switch.",
+                PathUtil.extractNodeId(instanceIdentifier));
         }
-
-        return inetSocketAddress;
+        return remoteAddress;
     }
-
 }