Bug 499: Added support for old DOM Broker APIs.

[controller.git] / opendaylight / md-sal / sal-dom-broker / src / main / java / org / opendaylight / controller / sal / dom / broker / BrokerConfigActivator.xtend

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.xtend b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.xtend
index 6b5f5acb1945a872d48b925da58283e314014af4..9cbf4282e47649ee42302746d4078d202924c2fe 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.xtend
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.xtend
@@ -22,13 +22,22 @@ import org.osgi.framework.BundleContext
 import org.osgi.framework.ServiceRegistration
 import org.opendaylight.controller.sal.dom.broker.impl.SchemaContextProviders
 import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry
+import org.opendaylight.controller.md.sal.dom.broker.impl.compat.BackwardsCompatibleDataBroker
+import org.opendaylight.controller.md.sal.dom.broker.impl.DOMDataBrokerImpl
+import com.google.common.util.concurrent.MoreExecutors
+import com.google.common.collect.ImmutableMap
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType
+import org.opendaylight.controller.sal.core.spi.data.DOMStore
+import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore
+import java.util.concurrent.Executors
+import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker
 
 class BrokerConfigActivator implements AutoCloseable {
 
     private static val ROOT = InstanceIdentifier.builder().toInstance();
 
     @Property
-    private var DataBrokerImpl dataService;
+    private var DataProviderService dataService;
 
     private var ServiceRegistration<DataBrokerService> dataReg;
     private var ServiceRegistration<DataProviderService> dataProviderReg;
@@ -40,7 +49,7 @@ class BrokerConfigActivator implements AutoCloseable {
 
     SchemaAwareDataStoreAdapter wrappedStore
 
-    public def void start(BrokerImpl broker, DataStore store, BundleContext context) {
+    public def void start(BrokerImpl broker, DataStore store, DOMDataBroker asyncBroker,BundleContext context) {
         val emptyProperties = new Hashtable<String, String>();
         broker.setBundleContext(context);
 
@@ -48,27 +57,32 @@ class BrokerConfigActivator implements AutoCloseable {
         schemaService = context.getService(serviceRef);
 
         broker.setRouter(new SchemaAwareRpcBroker("/", SchemaContextProviders.fromSchemaService(schemaService)));
-
-        dataService = new DataBrokerImpl();
-        //dataService.setExecutor(broker.getExecutor());
-
-        dataReg = context.registerService(DataBrokerService, dataService, emptyProperties);
-        dataProviderReg = context.registerService(DataProviderService, dataService, emptyProperties);
-
-        wrappedStore = new SchemaAwareDataStoreAdapter();
-        wrappedStore.changeDelegate(store);
-        wrappedStore.setValidationEnabled(false);
-
-        context.registerService(SchemaServiceListener, wrappedStore, emptyProperties)
-
-        dataService.registerConfigurationReader(ROOT, wrappedStore);
-        dataService.registerCommitHandler(ROOT, wrappedStore);
-        dataService.registerOperationalReader(ROOT, wrappedStore);
+        
+
+        if(asyncBroker == null) {
+            dataService = new DataBrokerImpl();
+            dataProviderReg = context.registerService(DataProviderService, dataService, emptyProperties);
+    
+            wrappedStore = new SchemaAwareDataStoreAdapter();
+            wrappedStore.changeDelegate(store);
+            wrappedStore.setValidationEnabled(false);
+            context.registerService(SchemaServiceListener, wrappedStore, emptyProperties)
+            
+            dataService.registerConfigurationReader(ROOT, wrappedStore);
+            dataService.registerCommitHandler(ROOT, wrappedStore);
+            dataService.registerOperationalReader(ROOT, wrappedStore);
+        } else {
+            val compatibleDataBroker = new BackwardsCompatibleDataBroker(asyncBroker);
+            context.registerService(SchemaServiceListener,compatibleDataBroker,emptyProperties);
+            dataService = compatibleDataBroker;
+        }
+        
+
+//        
 
         mountService = new MountPointManagerImpl();
-        mountService.setDataBroker(dataService);
-
-        mountReg = context.registerService(MountService, mountService, emptyProperties);
+        dataReg = context.registerService(DataBrokerService, dataService, emptyProperties);
+            mountReg = context.registerService(MountService, mountService, emptyProperties);
         mountProviderReg = context.registerService(MountProvisionService, mountService, emptyProperties);
 
         rpcProvisionRegistryReg = context.registerService(RpcProvisionRegistry, broker.getRouter(), emptyProperties);