diff --git a/integration-tests/src/test/java/org/zowe/apiml/integration/zaas/PassTicketTest.java b/integration-tests/src/test/java/org/zowe/apiml/integration/zaas/PassTicketTest.java index b659693ebd..ce511751d3 100644 --- a/integration-tests/src/test/java/org/zowe/apiml/integration/zaas/PassTicketTest.java +++ b/integration-tests/src/test/java/org/zowe/apiml/integration/zaas/PassTicketTest.java @@ -230,6 +230,20 @@ void givenLongApplicationName() { //@formatter:on } + @Test + void givenNoContentType() { + //@formatter:off + given() + .body(new TicketRequest(APPLICATION_NAME).toString().getBytes()) + .cookie(COOKIE, jwt) + .noContentType() + .when() + .post(ZAAS_TICKET_URI) + .then() + .statusCode(is(SC_BAD_REQUEST)); + //@formatter:on + } + @Test void givenInvalidContentType() { //@formatter:off diff --git a/zaas-service/src/main/java/org/zowe/apiml/zaas/zaas/ZaasExceptionHandler.java b/zaas-service/src/main/java/org/zowe/apiml/zaas/zaas/ZaasExceptionHandler.java index 095735164d..ad95b33897 100644 --- a/zaas-service/src/main/java/org/zowe/apiml/zaas/zaas/ZaasExceptionHandler.java +++ b/zaas-service/src/main/java/org/zowe/apiml/zaas/zaas/ZaasExceptionHandler.java @@ -211,6 +211,16 @@ public ResponseEntity handleInternalException(Exception exceptio .body(messageView); } + @ExceptionHandler(IllegalArgumentException.class) + public ResponseEntity handleInternalException(IllegalArgumentException exception) { + log.debug("Client sent illegal arguments", exception); + ApiMessageView messageView = messageService.createMessage("org.zowe.apiml.common.badRequest").mapToView(); + return ResponseEntity + .status(HttpStatus.BAD_REQUEST) + .contentType(MediaType.APPLICATION_JSON) + .body(messageView); + } + @ExceptionHandler(HttpMediaTypeNotSupportedException.class) public ResponseEntity handleUnsupportedMediaException(HttpMediaTypeNotSupportedException exception) { log.debug("Requested media type is not supported", exception);