Add ErrorType#CONFLICT (#44)

closes #43

Author: Robert Fink

errors/src/main/java/com/palantir/remoting/api/errors/ErrorType.java

@@ -39,6 +39,7 @@ public enum Code {
         PERMISSION_DENIED(403),
         INVALID_ARGUMENT(400),
         NOT_FOUND(404),
+        CONFLICT(409),
         FAILED_PRECONDITION(500),
         INTERNAL(500),
         CUSTOM_CLIENT(400),
@@ -56,6 +57,7 @@ public enum Code {
     public static final ErrorType INVALID_ARGUMENT =
             createInternal(Code.INVALID_ARGUMENT, "Default:InvalidArgument");
     public static final ErrorType NOT_FOUND = createInternal(Code.NOT_FOUND, "Default:NotFound");
+    public static final ErrorType CONFLICT = createInternal(Code.CONFLICT, "Default:Conflict");
     public static final ErrorType FAILED_PRECONDITION =
             createInternal(Code.FAILED_PRECONDITION, "Default:FailedPrecondition");
     public static final ErrorType INTERNAL = createInternal(Code.INTERNAL, "Default:Internal");

errors/src/test/java/com/palantir/remoting/api/errors/ErrorTypeTest.java

@@ -64,6 +64,7 @@ public void testDefaultErrorTypeHttpErrorCodes() throws Exception {
         assertThat(ErrorType.PERMISSION_DENIED.httpErrorCode()).isEqualTo(403);
         assertThat(ErrorType.INVALID_ARGUMENT.httpErrorCode()).isEqualTo(400);
         assertThat(ErrorType.NOT_FOUND.httpErrorCode()).isEqualTo(404);
+        assertThat(ErrorType.CONFLICT.httpErrorCode()).isEqualTo(409);
         assertThat(ErrorType.FAILED_PRECONDITION.httpErrorCode()).isEqualTo(500);
         assertThat(ErrorType.INTERNAL.httpErrorCode()).isEqualTo(500);
     }