Upgrade ietf-{inet,yang}-types to 2013-07-15

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

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchReactorMappingFactory.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchReactorMappingFactory.java
index de524f5ea8b48f616ff3d800307df6d6dd125919..bc4ca0c4e6654887b5fa9692ddd6bd17f7ad34a3 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchReactorMappingFactory.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchReactorMappingFactory.java
@@ -8,31 +8,31 @@
 
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match;
 
-import java.util.List;
-import java.util.Map;
-
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.FlowConvertor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.Convertor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.InjectionKey;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ResultInjector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmFieldsActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.field._case.SetFieldActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.v10.grouping.MatchV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.aggregate._case.MultipartRequestAggregateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.flow._case.MultipartRequestFlowBuilder;
+import java.util.List;
+import java.util.Map;
 
 /**
  * add prepared convertors and injectors into given mappings
+ *
  * @see MatchReactor
  */
 public class MatchReactorMappingFactory {
 
     /**
-     * @param conversionMapping
+     * @param conversionMapping conversion mapping
      */
     public static void addMatchConvertors(final Map<Short, Convertor<Match, ?>> conversionMapping) {
         conversionMapping.put(OFConstants.OFP_VERSION_1_3, new MatchConvertorImpl());
@@ -40,78 +40,78 @@ public class MatchReactorMappingFactory {
     }
 
     /**
-     * @param injectionMapping
+     * @param injectionMapping injection mapping
      */
     public static void addMatchIjectors(final Map<InjectionKey, ResultInjector<?, ?>> injectionMapping) {
         // OF-1.3|List<MatchEntries> --> FlowModInputBuilder
         injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, FlowModInputBuilder.class),
                 new ResultInjector<List<MatchEntry>, FlowModInputBuilder>() {
-            @Override
-            public void inject(final List<MatchEntry> value,
-                    final FlowModInputBuilder target) {
-                target.setMatch(wrapMatchV13(value).build());
-            }
-        });
+                    @Override
+                    public void inject(final List<MatchEntry> value,
+                                       final FlowModInputBuilder target) {
+                        target.setMatch(wrapMatchV13(value).build());
+                    }
+                });
 
         // OF-1.3|List<MatchEntries> --> OxmFieldsActionBuilder
-        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, OxmFieldsActionBuilder.class),
-                new ResultInjector<List<MatchEntry>, OxmFieldsActionBuilder>() {
-            @Override
-            public void inject(final List<MatchEntry> value,
-                    final OxmFieldsActionBuilder target) {
-                target.setMatchEntry(value);
-            }
-        });
+        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, SetFieldActionBuilder.class),
+                new ResultInjector<List<MatchEntry>, SetFieldActionBuilder>() {
+                    @Override
+                    public void inject(final List<MatchEntry> value,
+                                       final SetFieldActionBuilder target) {
+                        target.setMatchEntry(value);
+                    }
+                });
 
         // OF-1.0|MatchV10Builder --> FlowModInputBuilder
         injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_0, FlowModInputBuilder.class),
                 new ResultInjector<MatchV10, FlowModInputBuilder>() {
-            @Override
-            public void inject(final MatchV10 value,
-                    final FlowModInputBuilder target) {
-                target.setMatchV10(value);
-            }
-        });
+                    @Override
+                    public void inject(final MatchV10 value,
+                                       final FlowModInputBuilder target) {
+                        target.setMatchV10(value);
+                    }
+                });
 
         // OF-1.3|List<MatchEntries> --> MultipartRequestFlowBuilder
         injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, MultipartRequestFlowBuilder.class),
                 new ResultInjector<List<MatchEntry>, MultipartRequestFlowBuilder>() {
-            @Override
-            public void inject(final List<MatchEntry> value,
-                    final MultipartRequestFlowBuilder target) {
-                target.setMatch(wrapMatchV13(value).build());
-            }
-        });
+                    @Override
+                    public void inject(final List<MatchEntry> value,
+                                       final MultipartRequestFlowBuilder target) {
+                        target.setMatch(wrapMatchV13(value).build());
+                    }
+                });
 
         // OF-1.0|List<MatchEntries> --> MultipartRequestFlowBuilder
         injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_0, MultipartRequestFlowBuilder.class),
                 new ResultInjector<MatchV10, MultipartRequestFlowBuilder>() {
-            @Override
-            public void inject(final MatchV10 value,
-                    final MultipartRequestFlowBuilder target) {
-                target.setMatchV10(value);
-            }
-        });
+                    @Override
+                    public void inject(final MatchV10 value,
+                                       final MultipartRequestFlowBuilder target) {
+                        target.setMatchV10(value);
+                    }
+                });
 
         // OF-1.3|List<MatchEntries> --> MultipartRequestAggregateBuilder
         injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, MultipartRequestAggregateBuilder.class),
                 new ResultInjector<List<MatchEntry>, MultipartRequestAggregateBuilder>() {
-            @Override
-            public void inject(final List<MatchEntry> value,
-                    final MultipartRequestAggregateBuilder target) {
-                target.setMatch(wrapMatchV13(value).build());
-            }
-        });
+                    @Override
+                    public void inject(final List<MatchEntry> value,
+                                       final MultipartRequestAggregateBuilder target) {
+                        target.setMatch(wrapMatchV13(value).build());
+                    }
+                });
 
         // OF-1.0|List<MatchEntries> --> MultipartRequestAggregateBuilder
         injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_0, MultipartRequestAggregateBuilder.class),
                 new ResultInjector<MatchV10, MultipartRequestAggregateBuilder>() {
-            @Override
-            public void inject(final MatchV10 value,
-                    final MultipartRequestAggregateBuilder target) {
-                target.setMatchV10(value);
-            }
-        });
+                    @Override
+                    public void inject(final MatchV10 value,
+                                       final MultipartRequestAggregateBuilder target) {
+                        target.setMatchV10(value);
+                    }
+                });
     }
 
     /**