Akiban Server

Merge lp:~nwilliams/akiban-server/no-content-type-delete into lp:~akiban-technologies/akiban-server/trunk

  1. no-content-type-delete
  2. Merge into trunk
Proposed by Nathan Williams
Status: Merged
Approved by: Thomas Jones-Low
Approved revision: 2612
Merged at revision: 2611
Proposed branch: lp:~nwilliams/akiban-server/no-content-type-delete
Merge into: lp:~akiban-technologies/akiban-server/trunk
Diff against target: 49 lines (+3/-6)
4 files modified
src/main/java/com/akiban/rest/RestResponseBuilder.java (+2/-2)
src/main/java/com/akiban/rest/resources/BuilderResource.java (+0/-1)
src/main/java/com/akiban/rest/resources/EntityResource.java (+0/-1)
src/test/resources/com/akiban/rest/caoi/delete-c1.expected_header (+1/-2)
To merge this branch: bzr merge lp:~nwilliams/akiban-server/no-content-type-delete
Reviewer Review Type Date Requested Status
Thomas Jones-Low Approve
Review via email: mp+156993@code.launchpad.net

Description of the change

Make sure entity DELETE has no Content-Type.

One was slipping through due to the @Produces annotation on the resource. Remove that. Also remove it on the builder when NO_CONTENT is present, just in case.

To post a comment you must log in.
lp:~nwilliams/akiban-server/no-content-type-delete updated
2612. By Nathan Williams

Remove from Builder as well

Revision history for this message
Thomas Jones-Low (tjoneslo) wrote :

As discussed, very simple

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/main/java/com/akiban/rest/RestResponseBuilder.java'
2--- src/main/java/com/akiban/rest/RestResponseBuilder.java 2013-04-02 10:23:43 +0000
3+++ src/main/java/com/akiban/rest/RestResponseBuilder.java 2013-04-03 23:05:27 +0000
4@@ -101,9 +101,9 @@
5 Response.ResponseBuilder builder;
6
7 if (this.status == Response.Status.NO_CONTENT.getStatusCode()) {
8- builder = Response.status(status);
9+ builder = Response.status(status).type((MediaType)null);
10 } else {
11- builder = Response.status(status).entity(createStreamingOutput());
12+ builder = Response.status(status).entity(createStreamingOutput());
13 }
14 if(isJsonp) {
15 builder.type(ResourceHelper.APPLICATION_JAVASCRIPT_TYPE);
16
17=== modified file 'src/main/java/com/akiban/rest/resources/BuilderResource.java'
18--- src/main/java/com/akiban/rest/resources/BuilderResource.java 2013-04-02 07:47:58 +0000
19+++ src/main/java/com/akiban/rest/resources/BuilderResource.java 2013-04-03 23:05:27 +0000
20@@ -145,7 +145,6 @@
21
22 @DELETE
23 @Path("/entity/{entity}/" + IDENTIFIERS_MULTI)
24- @Produces(MEDIATYPE_JSON_JAVASCRIPT)
25 public Response delete(@Context HttpServletRequest request,
26 @PathParam("entity") String entityName,
27 @Context final UriInfo uri) {
28
29=== modified file 'src/main/java/com/akiban/rest/resources/EntityResource.java'
30--- src/main/java/com/akiban/rest/resources/EntityResource.java 2013-04-02 07:47:58 +0000
31+++ src/main/java/com/akiban/rest/resources/EntityResource.java 2013-04-03 23:05:27 +0000
32@@ -176,7 +176,6 @@
33
34 @DELETE
35 @Path("/" + IDENTIFIERS_MULTI)
36- @Produces(MEDIATYPE_JSON_JAVASCRIPT)
37 public Response deleteEntity(@Context HttpServletRequest request,
38 @PathParam("entity") String entity,
39 @Context final UriInfo uri) {
40
41=== modified file 'src/test/resources/com/akiban/rest/caoi/delete-c1.expected_header'
42--- src/test/resources/com/akiban/rest/caoi/delete-c1.expected_header 2013-04-02 10:37:39 +0000
43+++ src/test/resources/com/akiban/rest/caoi/delete-c1.expected_header 2013-04-03 23:05:27 +0000
44@@ -1,2 +1,1 @@
45-responseCode: 204
46-Content-Type: application/json
47\ No newline at end of file
48+responseCode: 204
49\ No newline at end of file

Subscribers

People subscribed via source and target branches