Further warning removal

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
index 95c45109920f0326deab94019b9eac582e68e38c..6964a3bd1b68f27a1aba572c972b9c2d31c38179 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import org.junit.Assert;
 import org.junit.Before;
@@ -67,7 +67,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModCommand;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInputBuilder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.AbstractAugmentable;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint64;
@@ -176,8 +176,7 @@ public class FlowConvertorTest {
         instructionBuilder = new InstructionBuilder();
         WriteActionsCaseBuilder writeCaseBuilder = new WriteActionsCaseBuilder();
         WriteActionsBuilder writeBuilder = new WriteActionsBuilder();
-        List<Action> actions = new ArrayList<>();
-        writeBuilder.setAction(actions);
+        writeBuilder.setAction(Map.of());
         writeCaseBuilder.setWriteActions(writeBuilder.build());
         instructionBuilder.setInstruction(writeCaseBuilder.build());
         instructionBuilder.setOrder(2);
@@ -185,8 +184,7 @@ public class FlowConvertorTest {
         instructionBuilder = new InstructionBuilder();
         ApplyActionsCaseBuilder applyCaseBuilder = new ApplyActionsCaseBuilder();
         ApplyActionsBuilder applyBuilder = new ApplyActionsBuilder();
-        actions = new ArrayList<>();
-        applyBuilder.setAction(actions);
+        applyBuilder.setAction(Map.of());
         applyCaseBuilder.setApplyActions(applyBuilder.build());
         instructionBuilder.setInstruction(applyCaseBuilder.build());
         instructionBuilder.setOrder(3);
@@ -194,8 +192,7 @@ public class FlowConvertorTest {
         instructionBuilder = new InstructionBuilder();
         ClearActionsCaseBuilder clearCaseBuilder = new ClearActionsCaseBuilder();
         ClearActionsBuilder clearBuilder = new ClearActionsBuilder();
-        actions = new ArrayList<>();
-        clearBuilder.setAction(actions);
+        clearBuilder.setAction(Map.of());
         clearCaseBuilder.setClearActions(clearBuilder.build());
         instructionBuilder.setInstruction(clearCaseBuilder.build());
         instructionBuilder.setOrder(4);
@@ -313,7 +310,7 @@ public class FlowConvertorTest {
                 .build())).build();
     }
 
-    private static class MockFlow implements AddFlowInput {
+    private static class MockFlow extends AbstractAugmentable<AddFlowInput> implements AddFlowInput {
         private Instructions instructions;
         private Match match;
 
@@ -325,17 +322,11 @@ public class FlowConvertorTest {
             this.match = match;
         }
 
-
         @Override
         public FlowRef getFlowRef() {
             return null;
         }
 
-        @Override
-        public <E extends Augmentation<AddFlowInput>> E augmentation(final Class<E> augmentationType) {
-            return null;
-        }
-
         @Override
         public FlowTableRef getFlowTable() {
             return null;
@@ -387,17 +378,17 @@ public class FlowConvertorTest {
         }
 
         @Override
-        public Boolean isInstallHw() {
+        public Boolean getInstallHw() {
             return null;
         }
 
         @Override
-        public Boolean isBarrier() {
+        public Boolean getBarrier() {
             return null;
         }
 
         @Override
-        public Boolean isStrict() {
+        public Boolean getStrict() {
             return null;
         }
 
@@ -435,10 +426,5 @@ public class FlowConvertorTest {
         public Uri getTransactionUri() {
             return null;
         }
-
-        @Override
-        public Class<AddFlowInput> implementedInterface() {
-            return AddFlowInput.class;
-        }
     }
 }