NotAllowedExceptionMapper wrongly ported to JAX-RS 1.1

Previous version of RestEasy has not Status#NOT_ALLOWED constant. But NotAllowedExceptionMapper should not use the BAD_REQUEST status. Also, I had left some error text comparisons.
hawkular · Aug 12, 2015 · 75548fa · 75548fa
1 parent 44b0ca3
commit 75548fa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.../src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ExceptionMapperUtils.java b/.../src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ExceptionMapperUtils.java
@@ -18,6 +18,7 @@
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
 
 import org.hawkular.metrics.api.jaxrs.ApiError;
@@ -31,15 +32,26 @@
  */
 public class ExceptionMapperUtils {
     private static final Logger LOG = LoggerFactory.getLogger(ExceptionMapperUtils.class);
-    private ExceptionMapperUtils(){
 
+    public static Response buildResponse(Throwable exception, int statusCode) {
+        ResponseBuilder responseBuilder = Response.status(statusCode);
+        return buildErrorResponse(exception, responseBuilder);
     }
 
-    public static Response buildResponse(Throwable exception, Status status){
+    public static Response buildResponse(Throwable exception, Status status) {
+        ResponseBuilder responseBuilder = Response.status(status);
+        return buildErrorResponse(exception, responseBuilder);
+    }
+
+    private static Response buildErrorResponse(Throwable exception, ResponseBuilder responseBuilder) {
         LOG.trace("RestEasy exception,", exception);
-        return Response.status(status)
+        return responseBuilder
                 .entity(new ApiError(Throwables.getRootCause(exception).getMessage()))
                 .type(MediaType.APPLICATION_JSON_TYPE)
                 .build();
     }
+
+    private ExceptionMapperUtils() {
+        // Utility class
+    }
 }
diff --git a/...main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/NotAllowedExceptionMapper.java b/...main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/NotAllowedExceptionMapper.java
@@ -35,7 +35,7 @@ public class NotAllowedExceptionMapper implements ExceptionMapper<MethodNotAllow
 
     @Override
     public Response toResponse(MethodNotAllowedException exception) {
-        return ExceptionMapperUtils.buildResponse(exception, Response.Status.BAD_REQUEST);
+        return ExceptionMapperUtils.buildResponse(exception, 405);
     }
 
 }
diff --git a/rest-tests/src/test/java/org/hawkular/metrics/test/ErrorsITest.java b/rest-tests/src/test/java/org/hawkular/metrics/test/ErrorsITest.java
@@ -47,8 +47,6 @@ public void testNotAllowedException() {
                 .header(TENANT_HEADER_NAME, "test")
                 .post(null);
         assertEquals(405, response.getStatus());
-        ApiErrorJson apiErrorJson = response.readEntity(ApiErrorJson.class);
-        assertEquals("No resource method found for POST, return 405 with Allow header", apiErrorJson.getErrorMsg());
     }
 
     @Test
@@ -71,8 +69,6 @@ public void testNumberFormatException() {
                 .header(TENANT_HEADER_NAME, "test")
                 .get();
         assertEquals(400, response.getStatus());
-        ApiErrorJson apiErrorJson = response.readEntity(ApiErrorJson.class);
-        assertEquals("For input string: \"999999999999999999999999\"", apiErrorJson.getErrorMsg());
     }
 
     @Test