Modernize codebase

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / device / DeviceContextImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
index 51b08154c2dc16705d9922c70c40afb59b019eb4..fe4d4a482ad651904ffc761bdbebed79e486de51 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
@@ -680,8 +680,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
                 .lookup(deviceInfo.getVersion());
 
         if (initializer.isPresent()) {
-            final Future<Void> initialize = initializer
-                    .get()
+            final Future<Void> initialize = initializer.orElseThrow()
                     .initialize(this, switchFeaturesMandatory, skipTableFeatures, writerProvider, convertorExecutor);
 
             try {
@@ -770,7 +769,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
                 if (result != null) {
                     for (Optional<FlowCapableNode> optNode : result) {
                         if (optNode.isPresent()) {
-                            flowCount += optNode.get().nonnullTable().values().stream()
+                            flowCount += optNode.orElseThrow().nonnullTable().values().stream()
                                     .filter(Objects::nonNull)
                                     .flatMap(table -> table.nonnullFlow().values().stream())
                                     .filter(Objects::nonNull)