Migrate to simplified addAugmentation() method

[genius.git] / mdsalutil / mdsalutil-api / src / main / java / org / opendaylight / genius / mdsalutil / actions / ActionNdOptionType.java

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdOptionType.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdOptionType.java
index 80ab41c7439e0b16566ea6349b36a4c2c539d513..10124483639ff6458e81bce3667ead4b71ca6dfd 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdOptionType.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdOptionType.java
@@ -9,24 +9,20 @@ package org.opendaylight.genius.mdsalutil.actions;
 
 import java.util.Collections;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
-import org.opendaylight.openflowplugin.extension.api.ExtensionAugment;
 import org.opendaylight.openflowplugin.extension.api.GroupingLooseResolver;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.field._case.SetFieldBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlowBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.Icmpv6NdOptionsTypeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.eric.of.icmpv6.nd.options.type.grouping.EricOfIcmpv6NdOptionsTypeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowWriteActionsSetField;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralExtensionListGrouping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.ExtensionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionListBuilder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
 
 /**
  * Set source IPv6 action.
@@ -59,36 +55,27 @@ public class ActionNdOptionType extends ActionInfo {
                 new GroupingLooseResolver<>(GeneralExtensionListGrouping.class);
         eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class);
 
-        ExtensionAugment<? extends Augmentation<Extension>> extensionMatch
-                =  new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
-                new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdOptionsType(
-                        new EricOfIcmpv6NdOptionsTypeBuilder().setIcmpv6NdOptionsType(ndOptionType).build()).build(),
-                Icmpv6NdOptionsTypeKey.class);
-
-        ExtensionListBuilder extListBld = null;
-        ExtensionBuilder extBld = new ExtensionBuilder();
-        extBld.addAugmentation(extensionMatch.getAugmentationClass(), extensionMatch.getAugmentationObject());
-
-        extListBld = new ExtensionListBuilder();
-        extListBld.setExtension(extBld.build());
-        extListBld.setExtensionKey(extensionMatch.getKey());
-
-        GeneralAugMatchNodesNodeTableFlowWriteActionsSetField ndOptionsTypeSetField =
-                new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
-                        .setExtensionList(Collections.singletonList(extListBld.build())).build();
-
         return new ActionBuilder()
-                .setAction(new SetFieldCaseBuilder()
-                        .setSetField(new SetFieldBuilder()
-                                .addAugmentation(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class,
-                                        ndOptionsTypeSetField)
+            .setAction(new SetFieldCaseBuilder()
+                .setSetField(new SetFieldBuilder()
+                    .addAugmentation(new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
+                        .setExtensionList(Collections.singletonList(new ExtensionListBuilder()
+                            .setExtension(new ExtensionBuilder()
+                                .addAugmentation(new EricAugMatchNodesNodeTableFlowBuilder()
+                                    .setEricOfIcmpv6NdOptionsType(new EricOfIcmpv6NdOptionsTypeBuilder()
+                                        .setIcmpv6NdOptionsType(ndOptionType)
+                                        .build())
+                                    .build())
                                 .build())
+                            .setExtensionKey(Icmpv6NdOptionsTypeKey.class)
+                            .build()))
                         .build())
-                .withKey(new ActionKey(newActionKey))
-                .build();
+                    .build())
+                .build())
+            .withKey(new ActionKey(newActionKey))
+            .build();
     }
 
-
     @Override
     public boolean equals(Object other) {
         if (this == other) {