openstack/monasca-events-api
Code Issues Proposed changes

application/json in only valid patch Content-Type

Browse Source 
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
This commit is contained in:
Craig Bryant
2015-02-20 10:01:14 -07:00
parent 5237ff23f5
commit ae72004b8a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/main/java/monasca/api/resource/AlarmDefinitionResource.java
View File

@@ -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,

2
java/src/main/java/monasca/api/resource/AlarmResource.java
View File

@@ -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<String, Object> fields)