Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
BUG-2794: incorporate openflowjava api changes to openflowplugin
[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 7737ff010d54eb4d20ccc66f9c6aae2d79d3083d..de524f5ea8b48f616ff3d800307df6d6dd125919 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
@@ -11,17 +11,17 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match;
 import java.util.List;
 import java.util.Map;
 
-import org.opendaylight.openflowplugin.openflow.md.OFConstants;
+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.rev131002.OxmFieldsActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.v10.grouping.MatchV10;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.MatchEntries;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmFieldsActionBuilder;
+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.match.grouping.MatchBuilder;
 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;
 
@@ -30,101 +30,101 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * @see MatchReactor
  */
 public class MatchReactorMappingFactory {
-    
+
     /**
      * @param conversionMapping
      */
-    public static void addMatchConvertors(Map<Short, Convertor<Match, ?>> conversionMapping) {
+    public static void addMatchConvertors(final Map<Short, Convertor<Match, ?>> conversionMapping) {
         conversionMapping.put(OFConstants.OFP_VERSION_1_3, new MatchConvertorImpl());
         conversionMapping.put(OFConstants.OFP_VERSION_1_0, new MatchConvertorV10Impl());
     }
-    
+
     /**
-     * @param injectionMapping 
+     * @param injectionMapping
      */
-    public static void addMatchIjectors(Map<InjectionKey, ResultInjector<?, ?>> injectionMapping) {
+    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.getName()), 
-                new ResultInjector<List<MatchEntries>, FlowModInputBuilder>() {
+        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, FlowModInputBuilder.class),
+                new ResultInjector<List<MatchEntry>, FlowModInputBuilder>() {
             @Override
-            public void inject(List<MatchEntries> value,
-                    FlowModInputBuilder target) {
+            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.getName()), 
-                new ResultInjector<List<MatchEntries>, OxmFieldsActionBuilder>() {
+        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, OxmFieldsActionBuilder.class),
+                new ResultInjector<List<MatchEntry>, OxmFieldsActionBuilder>() {
             @Override
-            public void inject(List<MatchEntries> value,
-                    OxmFieldsActionBuilder target) {
-                target.setMatchEntries(value);
+            public void inject(final List<MatchEntry> value,
+                    final OxmFieldsActionBuilder target) {
+                target.setMatchEntry(value);
             }
         });
-        
+
         // OF-1.0|MatchV10Builder --> FlowModInputBuilder
-        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_0, FlowModInputBuilder.class.getName()), 
+        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_0, FlowModInputBuilder.class),
                 new ResultInjector<MatchV10, FlowModInputBuilder>() {
             @Override
-            public void inject(MatchV10 value,
-                    FlowModInputBuilder target) {
+            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.getName()), 
-                new ResultInjector<List<MatchEntries>, MultipartRequestFlowBuilder>() {
+        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, MultipartRequestFlowBuilder.class),
+                new ResultInjector<List<MatchEntry>, MultipartRequestFlowBuilder>() {
             @Override
-            public void inject(List<MatchEntries> value,
-                    MultipartRequestFlowBuilder target) {
+            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.getName()), 
+        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_0, MultipartRequestFlowBuilder.class),
                 new ResultInjector<MatchV10, MultipartRequestFlowBuilder>() {
             @Override
-            public void inject(MatchV10 value,
-                    MultipartRequestFlowBuilder target) {
+            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.getName()), 
-                new ResultInjector<List<MatchEntries>, MultipartRequestAggregateBuilder>() {
+        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, MultipartRequestAggregateBuilder.class),
+                new ResultInjector<List<MatchEntry>, MultipartRequestAggregateBuilder>() {
             @Override
-            public void inject(List<MatchEntries> value,
-                    MultipartRequestAggregateBuilder target) {
+            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.getName()), 
+        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_0, MultipartRequestAggregateBuilder.class),
                 new ResultInjector<MatchV10, MultipartRequestAggregateBuilder>() {
             @Override
-            public void inject(MatchV10 value,
-                    MultipartRequestAggregateBuilder target) {
+            public void inject(final MatchV10 value,
+                    final MultipartRequestAggregateBuilder target) {
                 target.setMatchV10(value);
             }
         });
     }
-    
+
     /**
      * @param value pure match
      * @return wrapped match
      */
-    public static MatchBuilder wrapMatchV13(List<MatchEntries> value) {
-        MatchBuilder matchBuilder = new MatchBuilder(); 
+    public static MatchBuilder wrapMatchV13(final List<MatchEntry> value) {
+        MatchBuilder matchBuilder = new MatchBuilder();
         matchBuilder.setType(FlowConvertor.DEFAULT_MATCH_TYPE);
         if (value == null) {
-            matchBuilder.setMatchEntries(FlowConvertor.DEFAULT_MATCH_ENTRIES);
+            matchBuilder.setMatchEntry(FlowConvertor.DEFAULT_MATCH_ENTRIES);
         } else {
-            matchBuilder.setMatchEntries(value);
+            matchBuilder.setMatchEntry(value);
         }
         return matchBuilder;
     }
OpenFlow Plugin