Merge pull request #38 from rchodava/add-conflict-responses

Added conflict response.
rchodava · May 18, 2016 · 0a4a59a · 0a4a59a
2 parents d2df308 + fdeba2e
commit 0a4a59a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/core/src/main/java/org/chodavarapu/datamill/http/ResponseBuilder.java b/core/src/main/java/org/chodavarapu/datamill/http/ResponseBuilder.java
@@ -25,4 +25,5 @@ public interface ResponseBuilder {
     Response unauthorized(String content);
     Response forbidden();
     Response forbidden(String content);
+    Response conflict(String content);
 }
diff --git a/core/src/main/java/org/chodavarapu/datamill/http/impl/ResponseBuilderImpl.java b/core/src/main/java/org/chodavarapu/datamill/http/impl/ResponseBuilderImpl.java
@@ -148,4 +148,9 @@ public Response forbidden() {
     public Response forbidden(String content) {
         return new ResponseImpl(Status.FORBIDDEN, headers, new ValueEntity(new StringValue(content)));
     }
+
+    @Override
+    public Response conflict(String content) {
+        return new ResponseImpl(Status.CONFLICT, headers, new ValueEntity(new StringValue(content)));
+    }
 }
diff --git a/core/src/test/java/org/chodavarapu/datamill/http/impl/ResponseBuilderTest.java b/core/src/test/java/org/chodavarapu/datamill/http/impl/ResponseBuilderTest.java
@@ -36,6 +36,8 @@ public void responseCodes() {
         assertEquals(Status.FORBIDDEN, builder.forbidden().status());
         assertEquals(Status.FORBIDDEN, builder.forbidden("Content").status());
         assertEquals("Content", builder.forbidden("Content").entity().asString().toBlocking().last());
+        assertEquals(Status.CONFLICT, builder.conflict("Content").status());
+        assertEquals("Content", builder.conflict("Content").entity().asString().toBlocking().last());
     }
 
     @Test