Bug 5540 - Remove ConvertorManager singleton

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / OpenflowPluginProvider.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OpenflowPluginProvider.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OpenflowPluginProvider.java
index 58754980b056e55a3ea56f20250fa08864831720..dd88be1c5ea5883b13b4d9316781d2ef7f81e617 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OpenflowPluginProvider.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OpenflowPluginProvider.java
@@ -22,6 +22,8 @@ import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionCon
 import org.opendaylight.openflowplugin.openflow.md.core.MDController;
 import org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionConverterManagerImpl;
 import org.opendaylight.openflowplugin.openflow.md.core.role.OfEntityManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory;
 import org.opendaylight.openflowplugin.openflow.md.core.session.OFRoleManager;
 import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
 import org.opendaylight.openflowplugin.statistics.MessageSpyCounterImpl;
@@ -67,6 +69,8 @@ public class OpenflowPluginProvider implements AutoCloseable, OpenFlowPluginExte
      * Initialization of services and msgSpy counter
      */
     public void initialization() {
+        final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
+
         messageCountProvider = new MessageSpyCounterImpl();
         extensionConverterManager = new ExtensionConverterManagerImpl();
         roleManager = new OFRoleManager(OFSessionUtil.getSessionManager());
@@ -76,14 +80,14 @@ public class OpenflowPluginProvider implements AutoCloseable, OpenFlowPluginExte
         entManager.init();
 
         LOG.debug("dependencies gathered..");
-        registrationManager = new SalRegistrationManager();
+        registrationManager = new SalRegistrationManager(convertorManager);
         registrationManager.setDataService(dataBroker);
         registrationManager.setPublishService(notificationService);
         registrationManager.setRpcProviderRegistry(rpcRegistry);
         registrationManager.setOfEntityManager(entManager);
         registrationManager.init();
 
-        mdController = new MDController();
+        mdController = new MDController(convertorManager);
         mdController.setSwitchConnectionProviders(switchConnectionProviders);
         mdController.setMessageSpyCounter(messageCountProvider);
         mdController.setExtensionConverterProvider(extensionConverterManager);