Deprecate @Patch

JAX-RS 2.1+ contains a @PATCH annotation, there is no point of brewing
our own.

JIRA: NETCONF-1140
Change-Id: Id27e8936bf50fa90ed5e240ffb9adb08679a28be
Signed-off-by: Robert Varga <[email protected]>

diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/patch/Patch.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/patch/Patch.java
index 6f4abeef83b94d1382ef7655bd0bcd34ca5d5d48..d44eb75727ccf01b406d5208ae57a1d266ec1b8e 100644 (file)
--- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/patch/Patch.java
+++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/patch/Patch.java
@@ -17,7 +17,9 @@ import javax.ws.rs.HttpMethod;
 
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
-@HttpMethod("PATCH")
+@HttpMethod(HttpMethod.PATCH)
 @Documented
+@Deprecated(since = "5.0.8", forRemoval = true)
 public @interface Patch {
+    // Empty on purpose
 }
\ No newline at end of file

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 1fa85022a8b9e2aa02dc8ea96dda97e510a47c7e..8b8fd4a8807885f852ad18ad774225a192a2ceb8 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
@@ -32,6 +32,7 @@ import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.Encoded;
 import javax.ws.rs.GET;
+import javax.ws.rs.PATCH;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
@@ -56,7 +57,6 @@ import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
 import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
-import org.opendaylight.restconf.common.patch.Patch;
 import org.opendaylight.restconf.common.patch.PatchContext;
 import org.opendaylight.restconf.common.patch.PatchStatusContext;
 import org.opendaylight.restconf.nb.rfc8040.MediaTypes;
@@ -432,7 +432,7 @@ public final class RestconfDataServiceImpl {
      * @param uriInfo URI info
      * @return {@link PatchStatusContext}
      */
-    @Patch
+    @PATCH
     @Path("/data/{identifier:.+}")
     @Consumes({
         MediaTypes.APPLICATION_YANG_PATCH_JSON,
@@ -456,7 +456,7 @@ public final class RestconfDataServiceImpl {
      *            URI info
      * @return {@link PatchStatusContext}
      */
-    @Patch
+    @PATCH
     @Path("/data")
     @Consumes({
         MediaTypes.APPLICATION_YANG_PATCH_JSON,
@@ -481,7 +481,7 @@ public final class RestconfDataServiceImpl {
      * @param payload data node for put to config DS
      * @param ar {@link AsyncResponse} which needs to be completed
      */
-    @Patch
+    @PATCH
     @Path("/data/{identifier:.+}")
     @Consumes({
         MediaTypes.APPLICATION_YANG_DATA_JSON,