BUG 2805 - Fixed Restconf RPC calls and POST to create data

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / main / java / org / opendaylight / controller / sal / restconf / impl / RestconfProviderImpl.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfProviderImpl.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfProviderImpl.java
index 44acf9e83a822c3cb6bf0c5b1a508ef0d38829b0..84b092e10eae92f9fc7715162c6bbdc48a975ad1 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfProviderImpl.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfProviderImpl.java
@@ -19,7 +19,7 @@ import org.opendaylight.controller.config.yang.md.sal.rest.connector.RestConnect
 import org.opendaylight.controller.config.yang.md.sal.rest.connector.Rpcs;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
 import org.opendaylight.controller.sal.core.api.Provider;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
@@ -33,7 +33,6 @@ public class RestconfProviderImpl implements Provider, AutoCloseable, RestConnec
 
     private final StatisticsRestconfServiceWrapper stats = StatisticsRestconfServiceWrapper.getInstance();
     private ListenerRegistration<SchemaContextListener> listenerRegistration;
-    private ListenerRegistration<SchemaContextListener> rpcRouterSchemalistenerRegistration;
     private PortNumber port;
     private Thread webSocketServerThread;
 
@@ -47,13 +46,9 @@ public class RestconfProviderImpl implements Provider, AutoCloseable, RestConnec
 
         BrokerFacade.getInstance().setContext(session);
         BrokerFacade.getInstance().setDomDataBroker( domDataBroker);
-
-        final DOMRpcRouter rpcRouter = new DOMRpcRouter();
-
         final SchemaService schemaService = session.getService(SchemaService.class);
         listenerRegistration = schemaService.registerSchemaContextListener(ControllerContext.getInstance());
-        rpcRouterSchemalistenerRegistration = schemaService.registerSchemaContextListener(rpcRouter);
-        BrokerFacade.getInstance().setRpcService(rpcRouter);
+        BrokerFacade.getInstance().setRpcService(session.getService(DOMRpcService.class));
 
 
         ControllerContext.getInstance().setSchemas(schemaService.getGlobalContext());
@@ -72,10 +67,6 @@ public class RestconfProviderImpl implements Provider, AutoCloseable, RestConnec
     @Override
     public void close() {
 
-        if (rpcRouterSchemalistenerRegistration != null) {
-            rpcRouterSchemalistenerRegistration.close();
-        }
-
         if (listenerRegistration != null) {
             listenerRegistration.close();
         }