Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertor.java
index 4c808af23d325b70dc2a21523cdb1146ca74a9d3..55582b5ab57cd3d5ea95e895a9e6cee18b4031fa 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertor.java
@@ -70,11 +70,11 @@ import org.opendaylight.yangtools.yang.binding.DataContainer;
  * ActionConvertorData data = new ActionConvertorData(version);
  * data.setDatapathId(datapathId);
  * data.setIpProtocol(ipProtocol);
- * Optional<List<Action>> ofActions = ConvertorManager.getInstance().convert(salActions, data);
+ * Optional<List<Action>> ofActions = convertorManager.convert(salActions, data);
  * }
  * </pre>
  */
-public final class ActionConvertor implements Convertor<
+public final class ActionConvertor extends Convertor<
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action>,
         List<Action>,
         ActionConvertorData> {
@@ -143,7 +143,7 @@ public final class ActionConvertor implements Convertor<
         // Iterate over SAL actions, run them through tokenizer and then add them to list of converted actions
         if (source != null) {
             for (final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action action : source) {
-                final Optional<Action> convertedAction = PROCESSOR.process(action.getAction(), data);
+                final Optional<Action> convertedAction = PROCESSOR.process(action.getAction(), data, getConvertorExecutor());
 
                 if (convertedAction.isPresent()) {
                     result.add(convertedAction.get());