update response and tests

Author: tsolakoua

src/main/java/com/amadeus/Response.java

@@ -60,15 +60,14 @@ protected Response(Request request) {
   // Tries to parse the raw response from the request.
   protected void parse(HTTPClient client) {
     parseStatusCode();
-    parseData(client);
+    if (this.statusCode != 204) {
+      parseData(client);
+    }
   }
 
   // Detects of any exceptions have occured and throws the appropriate exceptions.
   protected void detectError(HTTPClient client) throws ResponseException {
     ResponseException exception = null;
-    if (statusCode == 204) {
-      return;
-    }
     if (statusCode >= 500) {
       exception = new ServerException(this);
     } else if (statusCode == 404) {
@@ -77,6 +76,8 @@ protected void detectError(HTTPClient client) throws ResponseException {
       exception = new AuthenticationException(this);
     } else if (statusCode >= 400) {
       exception = new ClientException(this);
+    } else if (statusCode == 204) {
+      return;
     } else if (!parsed) {
       exception = new ParserException(this);
     }
@@ -99,9 +100,6 @@ private void parseStatusCode() {
 
   // Tries to parse the data
   private void parseData(HTTPClient client) {
-    if (this.statusCode == 204) {
-      return;
-    }
     this.parsed = false;
     this.body = readBody();
     this.result = parseJson(client);

src/test/java/com/amadeus/ResponseTest.java

@@ -107,6 +107,22 @@ public class ResponseTest {
     assertNull(response.getData());
   }
 
+  @Test public void testNoContent() throws IOException {
+    when(connection.getResponseCode()).thenReturn(204);
+    when(connection.getHeaderField("Content-Type")).thenReturn(
+            "application/json");
+    when(connection.getInputStream()).thenReturn(
+            new ByteArrayInputStream("".getBytes()));
+
+    response.parse(client);
+
+    assertEquals(response.getStatusCode(), 204);
+    assertEquals(response.getBody(), null);
+    assertFalse(response.isParsed());
+    assertNull(response.getResult());
+    assertNull(response.getData());
+  }
+
   @Test public void testEmptyConnection() throws IOException {
     InputStream stream = mock(ByteArrayInputStream.class);
     when(connection.getResponseCode()).thenThrow(new IOException());
@@ -212,6 +228,16 @@ public void detectParserException() throws ResponseException, IOException {
     response.detectError(client);
   }
 
+  @Test public void detectNoExceptionNoContent() throws ResponseException, IOException {
+    when(connection.getResponseCode()).thenReturn(204);
+    when(connection.getHeaderField("Content-Type")).thenReturn(
+            "application/json");
+    when(connection.getInputStream()).thenReturn(
+            new ByteArrayInputStream("{}".getBytes()));
+    response.parse(client);
+    response.detectError(client);
+  }
+
   @Test public void testToString() {
     assertTrue(response.toString().startsWith("Response("));
   }