X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2FRestconfCompositeWrapper.java;h=f551904cb38b4940780cfc55d8d2dfacc0beeea3;hb=f9a9cd1ea40d2477ccb16b03c71a87595226595a;hp=5ad9596fe0ddaf9b857e21f99c3873a9330f5f2b;hpb=abf2977f78315abecb4f643e96cb091010ea3c20;p=controller.git

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfCompositeWrapper.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfCompositeWrapper.java
index 5ad9596fe0..f551904cb3 100644
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfCompositeWrapper.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfCompositeWrapper.java
@@ -7,9 +7,6 @@ import org.opendaylight.controller.md.sal.rest.schema.SchemaExportContext;
 import org.opendaylight.controller.md.sal.rest.schema.SchemaRetrievalService;
 import org.opendaylight.controller.sal.rest.api.RestconfService;
 import org.opendaylight.controller.sal.restconf.impl.NormalizedNodeContext;
-import org.opendaylight.controller.sal.restconf.impl.StructuredData;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.api.Node;
 
 public class RestconfCompositeWrapper implements RestconfService, SchemaRetrievalService {
 
@@ -42,7 +39,7 @@ public class RestconfCompositeWrapper implements RestconfService, SchemaRetrieva
     }
 
     @Override
-    public StructuredData getOperations(final UriInfo uriInfo) {
+    public NormalizedNodeContext getOperations(final UriInfo uriInfo) {
         return restconf.getOperations(uriInfo);
     }
 
@@ -52,12 +49,13 @@ public class RestconfCompositeWrapper implements RestconfService, SchemaRetrieva
     }
 
     @Override
-    public StructuredData invokeRpc(final String identifier, final CompositeNode payload, final UriInfo uriInfo) {
+    public NormalizedNodeContext invokeRpc(final String identifier, final NormalizedNodeContext payload, final UriInfo uriInfo) {
         return restconf.invokeRpc(identifier, payload, uriInfo);
     }
 
     @Override
-    public StructuredData invokeRpc(final String identifier, final String noPayload, final UriInfo uriInfo) {
+    @Deprecated
+    public NormalizedNodeContext invokeRpc(final String identifier, final String noPayload, final UriInfo uriInfo) {
         return restconf.invokeRpc(identifier, noPayload, uriInfo);
     }
 
@@ -72,18 +70,18 @@ public class RestconfCompositeWrapper implements RestconfService, SchemaRetrieva
     }
 
     @Override
-    public Response updateConfigurationData(final String identifier, final Node<?> payload) {
+    public Response updateConfigurationData(final String identifier, final NormalizedNodeContext payload) {
         return restconf.updateConfigurationData(identifier, payload);
     }
 
     @Override
-    public Response createConfigurationData(final String identifier, final Node<?> payload) {
-        return restconf.createConfigurationData(identifier, payload);
+    public Response createConfigurationData(final String identifier, final NormalizedNodeContext payload, final UriInfo uriInfo) {
+        return restconf.createConfigurationData(identifier, payload, uriInfo);
     }
 
     @Override
-    public Response createConfigurationData(final Node<?> payload) {
-        return restconf.createConfigurationData(payload);
+    public Response createConfigurationData(final NormalizedNodeContext payload, final UriInfo uriInfo) {
+        return restconf.createConfigurationData(payload, uriInfo);
     }
 
     @Override