Merge "Technical debt MeterUtil, GroupUtil, FlowUtil"

[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..f10fce499655253c105abaaa05086f3605b7ee4e 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
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -10,14 +10,13 @@ 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.ConvertReactorConvertor;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorKey;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ResultInjector;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.FlowConvertor;
 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;
@@ -27,91 +26,92 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 
 /**
  * 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) {
+    public static void addMatchConvertors(final Map<Short, ConvertReactorConvertor<Match, ?>> conversionMapping) {
         conversionMapping.put(OFConstants.OFP_VERSION_1_3, new MatchConvertorImpl());
         conversionMapping.put(OFConstants.OFP_VERSION_1_0, new MatchConvertorV10Impl());
     }
 
     /**
-     * @param injectionMapping
+     * @param injectionMapping injection mapping
      */
-    public static void addMatchIjectors(final Map<InjectionKey, ResultInjector<?, ?>> injectionMapping) {
+    public static void addMatchIjectors(final Map<ConvertorKey, ResultInjector<?, ?>> injectionMapping) {
         // OF-1.3|List<MatchEntries> --> FlowModInputBuilder
-        injectionMapping.put(new InjectionKey(OFConstants.OFP_VERSION_1_3, FlowModInputBuilder.class),
+        injectionMapping.put(new ConvertorKey(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 ConvertorKey(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),
+        injectionMapping.put(new ConvertorKey(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),
+        injectionMapping.put(new ConvertorKey(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),
+        injectionMapping.put(new ConvertorKey(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),
+        injectionMapping.put(new ConvertorKey(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),
+        injectionMapping.put(new ConvertorKey(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);
+                    }
+                });
     }
 
     /**