Bug 5679 - renamed package rest.services to base.services

[netconf.git] / restconf / sal-rest-connector / src / main / java / org / opendaylight / restconf / common / wrapper / services / ServicesWrapperImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/wrapper/services/ServicesWrapperImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/wrapper/services/ServicesWrapperImpl.java
index febb30802bc851141f6e33e7c6bcc1602ddf9902..f2602d02bb72d66764fc27bb6ce39797900e2286 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/wrapper/services/ServicesWrapperImpl.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/wrapper/services/ServicesWrapperImpl.java
@@ -14,20 +14,21 @@ import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContext;
 import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.restconf.impl.PATCHContext;
 import org.opendaylight.netconf.sal.restconf.impl.PATCHStatusContext;
+import org.opendaylight.restconf.base.services.api.BaseServicesWrapper;
+import org.opendaylight.restconf.base.services.api.RestconfModulesService;
+import org.opendaylight.restconf.base.services.api.RestconfOperationsService;
+import org.opendaylight.restconf.base.services.api.RestconfSchemaService;
+import org.opendaylight.restconf.base.services.api.RestconfStreamsService;
+import org.opendaylight.restconf.base.services.impl.RestconfModulesServiceImpl;
+import org.opendaylight.restconf.base.services.impl.RestconfOperationsServiceImpl;
+import org.opendaylight.restconf.base.services.impl.RestconfSchemaServiceImpl;
+import org.opendaylight.restconf.base.services.impl.RestconfStreamsServiceImpl;
 import org.opendaylight.restconf.handlers.DOMDataBrokerHandler;
 import org.opendaylight.restconf.handlers.DOMMountPointServiceHandler;
+import org.opendaylight.restconf.handlers.NotificationServiceHandler;
 import org.opendaylight.restconf.handlers.RpcServiceHandler;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
 import org.opendaylight.restconf.handlers.TransactionChainHandler;
-import org.opendaylight.restconf.rest.services.api.BaseServicesWrapper;
-import org.opendaylight.restconf.rest.services.api.RestconfModulesService;
-import org.opendaylight.restconf.rest.services.api.RestconfOperationsService;
-import org.opendaylight.restconf.rest.services.api.RestconfSchemaService;
-import org.opendaylight.restconf.rest.services.api.RestconfStreamsService;
-import org.opendaylight.restconf.rest.services.impl.RestconfModulesServiceImpl;
-import org.opendaylight.restconf.rest.services.impl.RestconfOperationsServiceImpl;
-import org.opendaylight.restconf.rest.services.impl.RestconfSchemaServiceImpl;
-import org.opendaylight.restconf.rest.services.impl.RestconfStreamsServiceImpl;
 import org.opendaylight.restconf.restful.services.api.RestconfDataService;
 import org.opendaylight.restconf.restful.services.api.RestconfInvokeOperationsService;
 import org.opendaylight.restconf.restful.services.api.RestconfStreamsSubscriptionService;
@@ -112,8 +113,8 @@ public class ServicesWrapperImpl implements BaseServicesWrapper, TransactionServ
     }
 
     @Override
-    public Response putData(final String identifier, final NormalizedNodeContext payload) {
-        return this.delegRestconfDataService.putData(identifier, payload);
+    public Response putData(final String identifier, final NormalizedNodeContext payload, final UriInfo uriInfo) {
+        return this.delegRestconfDataService.putData(identifier, payload, uriInfo);
     }
 
     @Override
@@ -148,7 +149,7 @@ public class ServicesWrapperImpl implements BaseServicesWrapper, TransactionServ
     }
 
     @Override
-    public Response subscribeToStream(final String identifier, final UriInfo uriInfo) {
+    public NormalizedNodeContext subscribeToStream(final String identifier, final UriInfo uriInfo) {
         return this.delegRestconfSubscrService.subscribeToStream(identifier, uriInfo);
     }
 
@@ -156,7 +157,7 @@ public class ServicesWrapperImpl implements BaseServicesWrapper, TransactionServ
                             final DOMMountPointServiceHandler domMountPointServiceHandler,
                             final TransactionChainHandler transactionChainHandler,
                             final DOMDataBrokerHandler domDataBrokerHandler,
-                            final RpcServiceHandler rpcServiceHandler) {
+            final RpcServiceHandler rpcServiceHandler, final NotificationServiceHandler notificationServiceHandler) {
         this.delegRestModService = new RestconfModulesServiceImpl(schemaCtxHandler, domMountPointServiceHandler);
         this.delegRestOpsService = new RestconfOperationsServiceImpl(schemaCtxHandler, domMountPointServiceHandler);
         this.delegRestSchService = new RestconfSchemaServiceImpl(schemaCtxHandler, domMountPointServiceHandler);
@@ -165,6 +166,8 @@ public class ServicesWrapperImpl implements BaseServicesWrapper, TransactionServ
                 domMountPointServiceHandler);
         this.delegRestconfInvokeOpsService = new RestconfInvokeOperationsServiceImpl(rpcServiceHandler,
                 schemaCtxHandler);
-        this.delegRestconfSubscrService = new RestconfStreamsSubscriptionServiceImpl(domDataBrokerHandler);
+        this.delegRestconfSubscrService =
+                new RestconfStreamsSubscriptionServiceImpl(domDataBrokerHandler, notificationServiceHandler,
+                        schemaCtxHandler);
     }
 }