From ae72004b8a9f2a25692aaa676fdaf3ce021deaef Mon Sep 17 00:00:00 2001 From: Craig Bryant Date: Fri, 20 Feb 2015 10:01:14 -0700 Subject: [PATCH] application/json in only valid patch Content-Type application/json-patch+json is no longer ia valid patch Content-Type. The CLI has been updated to no longer send this Content-Type Change-Id: I6b064cb46336b3eeaf62bed3196163f1db3b03fa --- .../main/java/monasca/api/resource/AlarmDefinitionResource.java | 2 +- java/src/main/java/monasca/api/resource/AlarmResource.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/src/main/java/monasca/api/resource/AlarmDefinitionResource.java b/java/src/main/java/monasca/api/resource/AlarmDefinitionResource.java index 9a1d616..3d1126d 100644 --- a/java/src/main/java/monasca/api/resource/AlarmDefinitionResource.java +++ b/java/src/main/java/monasca/api/resource/AlarmDefinitionResource.java @@ -125,7 +125,7 @@ public class AlarmDefinitionResource { @PATCH @Timed @Path("/{alarm_definition_id}") - @Consumes({"application/json-patch+json", MediaType.APPLICATION_JSON}) + @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) @SuppressWarnings("unchecked") public AlarmDefinition patch(@Context UriInfo uriInfo, diff --git a/java/src/main/java/monasca/api/resource/AlarmResource.java b/java/src/main/java/monasca/api/resource/AlarmResource.java index 39b947b..1bbfb79 100644 --- a/java/src/main/java/monasca/api/resource/AlarmResource.java +++ b/java/src/main/java/monasca/api/resource/AlarmResource.java @@ -148,7 +148,7 @@ public class AlarmResource { @PATCH @Timed @Path("/{alarm_id}") - @Consumes({"application/json-patch+json", MediaType.APPLICATION_JSON}) + @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public Alarm patch(@Context UriInfo uriInfo, @HeaderParam("X-Tenant-Id") String tenantId, @PathParam("alarm_id") String alarmId, @NotEmpty Map fields)