Migrate users of Optional.get()

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / flow / FlowConvertor.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertor.java
index 7f0cbe2c7147925509fb548acf4cd5c0a7b77015..71cba4512ebb9f05e321ef84f6424e7671bf96f4 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertor.java
@@ -335,7 +335,7 @@ public class FlowConvertor extends Convertor<Flow, List<FlowModInputBuilder>, Ve
                     .build())
                 .build());
             if (optional.isPresent()) {
-                list.add(toFlowModInput(optional.get(), versionDatapathIdConverterData));
+                list.add(toFlowModInput(optional.orElseThrow(), versionDatapathIdConverterData));
             }
         } else {
             // create 2 flows
@@ -344,7 +344,7 @@ public class FlowConvertor extends Convertor<Flow, List<FlowModInputBuilder>, Ve
             Optional<? extends Flow> optional1 = injectMatchAndAction(srcFlow,
                 new MatchBuilder(srcMatch).setVlanMatch(VLAN_MATCH_FALSE).build());
             if (optional1.isPresent()) {
-                list.add(toFlowModInput(optional1.get(), versionDatapathIdConverterData));
+                list.add(toFlowModInput(optional1.orElseThrow(), versionDatapathIdConverterData));
             }
 
             //flow2
@@ -352,7 +352,7 @@ public class FlowConvertor extends Convertor<Flow, List<FlowModInputBuilder>, Ve
             Optional<? extends Flow> optional2 = injectMatchToFlow(srcFlow,
                 new MatchBuilder(srcMatch).setVlanMatch(VLAN_MATCH_TRUE).build());
             if (optional2.isPresent()) {
-                list.add(toFlowModInput(optional2.get(), versionDatapathIdConverterData));
+                list.add(toFlowModInput(optional2.orElseThrow(), versionDatapathIdConverterData));
             }
         }
         return list;
@@ -408,10 +408,9 @@ public class FlowConvertor extends Convertor<Flow, List<FlowModInputBuilder>, Ve
         for (var srcInstruction : srcInstructionList.values()) {
             final var curSrcInstruction = srcInstruction.getInstruction();
 
-            if (curSrcInstruction instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026
-                    .instruction.instruction.ApplyActionsCase) {
-                final var applyActionscase = (org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types
-                            .rev131026.instruction.instruction.ApplyActionsCase) curSrcInstruction;
+            if (curSrcInstruction
+                    instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026
+                        .instruction.instruction.ApplyActionsCase applyActionscase) {
                 final var srcActionList = applyActionscase.getApplyActions().nonnullAction();
 
                 int offset = 0;