Eliminate UriInfo parameters

PATCH requests are not using URI information, hence we do not need to
specify them.

JIRA: NETCONF-1128
Change-Id: Ib3b574039a6e16944d62e21b6a3352b22a66cfd5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java
index 8b8fd4a8807885f852ad18ad774225a192a2ceb8..388590375a52f985fb43b89a358d26adf4b213fc 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java
@@ -429,7 +429,6 @@ public final class RestconfDataServiceImpl {
      *
      * @param identifier path to target
      * @param context edits
-     * @param uriInfo URI info
      * @return {@link PatchStatusContext}
      */
     @PATCH
@@ -443,17 +442,14 @@ public final class RestconfDataServiceImpl {
         MediaTypes.APPLICATION_YANG_DATA_XML
     })
     public PatchStatusContext patchData(@Encoded @PathParam("identifier") final String identifier,
-            final PatchContext context, @Context final UriInfo uriInfo) {
-        return patchData(context, uriInfo);
+            final PatchContext context) {
+        return patchData(context);
     }
 
     /**
      * Ordered list of edits that are applied to the datastore by the server.
      *
-     * @param context
-     *            edits
-     * @param uriInfo
-     *            URI info
+     * @param context edits
      * @return {@link PatchStatusContext}
      */
     @PATCH
@@ -466,7 +462,7 @@ public final class RestconfDataServiceImpl {
         MediaTypes.APPLICATION_YANG_DATA_JSON,
         MediaTypes.APPLICATION_YANG_DATA_XML
     })
-    public PatchStatusContext patchData(final PatchContext context, @Context final UriInfo uriInfo) {
+    public PatchStatusContext patchData(final PatchContext context) {
         final InstanceIdentifierContext iid = RestconfDocumentedException.throwIfNull(context,
             ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE, "No patch documented provided")
             .getInstanceIdentifierContext();
@@ -491,7 +487,7 @@ public final class RestconfDataServiceImpl {
         MediaType.TEXT_XML
     })
     public void patchData(@Encoded @PathParam("identifier") final String identifier,
-            final NormalizedNodePayload payload, @Context final UriInfo uriInfo, @Suspended final AsyncResponse ar) {
+            final NormalizedNodePayload payload, @Suspended final AsyncResponse ar) {
         final InstanceIdentifierContext iid = payload.getInstanceIdentifierContext();
         final YangInstanceIdentifier path = iid.getInstanceIdentifier();
         validInputData(iid.getSchemaNode() != null, payload);

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java
index 8ee2b20e85f114ad803968719340fa087b0e28b4..31dd69148e705915469b319f7591e0b218293dd3 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java
@@ -428,7 +428,7 @@ public class RestconfDataServiceImplTest extends AbstractJukeboxTest {
                 .when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, JUKEBOX_IID);
         doReturn(immediateTrueFluentFuture())
                 .when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, GAP_IID);
-        final PatchStatusContext status = dataService.patchData(patch, uriInfo);
+        final PatchStatusContext status = dataService.patchData(patch);
         assertTrue(status.isOk());
         assertEquals(3, status.getEditCollection().size());
         assertEquals("replace data", status.getEditCollection().get(1).getEditId());
@@ -448,7 +448,7 @@ public class RestconfDataServiceImplTest extends AbstractJukeboxTest {
                 .when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, JUKEBOX_IID);
         doReturn(immediateTrueFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, GAP_IID);
 
-        final PatchStatusContext status = dataService.patchData(patch, uriInfo);
+        final PatchStatusContext status = dataService.patchData(patch);
         assertTrue(status.isOk());
         assertEquals(3, status.getEditCollection().size());
         assertNull(status.getGlobalErrors());
@@ -468,7 +468,7 @@ public class RestconfDataServiceImplTest extends AbstractJukeboxTest {
         doReturn(immediateFalseFluentFuture())
                 .when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, GAP_IID);
         doReturn(true).when(readWrite).cancel();
-        final PatchStatusContext status = dataService.patchData(patch, uriInfo);
+        final PatchStatusContext status = dataService.patchData(patch);
 
         assertFalse(status.isOk());
         assertEquals(3, status.getEditCollection().size());