From 126e4b4da345a14006998703147f4744c535a0df Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Tue, 1 Dec 2020 18:23:57 -0500 Subject: [PATCH] use alias for http 422 --- .../main/java/org/cobbzilla/wizard/client/ApiClientBase.java | 2 +- .../java/org/cobbzilla/wizard/client/script/ApiRunner.java | 2 +- .../main/java/org/cobbzilla/wizard/main/ScriptMainBase.java | 2 +- .../cobbzilla/wizardtest/resources/AbstractResourceIT.java | 2 +- .../AbstractConstraintViolationExceptionMapper.java | 2 +- .../exceptionmappers/MultiViolationExceptionMapper.java | 2 +- .../exceptionmappers/SimpleViolationExceptionMapper.java | 2 +- .../java/org/cobbzilla/wizard/resources/ResourceUtil.java | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/client/ApiClientBase.java b/wizard-common/src/main/java/org/cobbzilla/wizard/client/ApiClientBase.java index ad2d1de..673d71f 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/client/ApiClientBase.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/client/ApiClientBase.java @@ -200,7 +200,7 @@ public class ApiClientBase implements Cloneable, Closeable { return new NotFoundException(request, response); case FORBIDDEN: return new ForbiddenException(request, response); - case UNPROCESSABLE_ENTITY: + case INVALID: return new ValidationException(request, response); default: return new ApiException(request, response); } diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java b/wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java index deadae4..b2caa13 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java @@ -304,7 +304,7 @@ public class ApiRunner { responseEntity = empty(restResponse.json) || response.isRaw() ? null : json(restResponse.json, JsonNode.class); Object responseObject = responseEntity; - if (response.getStatus() == HttpStatusCodes.UNPROCESSABLE_ENTITY) { + if (response.getStatus() == HttpStatusCodes.INVALID) { if (responseEntity != null) { responseObject = new ValidationErrors( Arrays.asList(fromJsonOrDie(responseEntity, ConstraintViolationBean[].class))); diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/main/ScriptMainBase.java b/wizard-common/src/main/java/org/cobbzilla/wizard/main/ScriptMainBase.java index 6a9bb98..1fd79da 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/main/ScriptMainBase.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/main/ScriptMainBase.java @@ -352,7 +352,7 @@ public abstract class ScriptMainBase @Override public void unexpectedResponse(ApiScript script, RestResponse restResponse) { final String msg; switch (restResponse.status) { - case HttpStatusCodes.UNPROCESSABLE_ENTITY: + case HttpStatusCodes.INVALID: msg = "Invalid: "+restResponse.json; break; case HttpStatusCodes.NOT_FOUND: diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java index dc85a8d..a625859 100644 --- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java +++ b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java @@ -355,7 +355,7 @@ public abstract class AbstractResourceIT { - protected Response buildResponse(E e) { return status(HttpStatusCodes.UNPROCESSABLE_ENTITY, exception2json(e)); } + protected Response buildResponse(E e) { return status(HttpStatusCodes.INVALID, exception2json(e)); } protected List exception2json(E e) { return Collections.singletonList(mapGenericExceptionToConstraintViolationBean(e)); diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/MultiViolationExceptionMapper.java b/wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/MultiViolationExceptionMapper.java index bb7b7e7..9edb2eb 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/MultiViolationExceptionMapper.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/MultiViolationExceptionMapper.java @@ -13,7 +13,7 @@ import static org.cobbzilla.wizard.resources.ResourceUtil.status; public class MultiViolationExceptionMapper implements ExceptionMapper { @Override public Response toResponse(MultiViolationException e) { - return status(HttpStatusCodes.UNPROCESSABLE_ENTITY, e.getViolations()); + return status(HttpStatusCodes.INVALID, e.getViolations()); } } diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/SimpleViolationExceptionMapper.java b/wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/SimpleViolationExceptionMapper.java index 68e3e01..5c2a142 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/SimpleViolationExceptionMapper.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/SimpleViolationExceptionMapper.java @@ -17,7 +17,7 @@ public class SimpleViolationExceptionMapper implements ExceptionMapper getEntity(SimpleViolationException e) { diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/resources/ResourceUtil.java b/wizard-server/src/main/java/org/cobbzilla/wizard/resources/ResourceUtil.java index 7d4c3bc..487dc5a 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/resources/ResourceUtil.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/resources/ResourceUtil.java @@ -145,8 +145,8 @@ public class ResourceUtil { public static Response unauthorized() { return status(UNAUTHORIZED); } public static ResourceHttpException unauthorizedEx() { return new ResourceHttpException(UNAUTHORIZED); } - public static Response invalid() { return status(UNPROCESSABLE_ENTITY); } - public static Response invalid(List violations) { return status(UNPROCESSABLE_ENTITY, violations); } + public static Response invalid() { return status(INVALID); } + public static Response invalid(List violations) { return status(INVALID, violations); } public static Response invalid(ConstraintViolationBean violation) { final List violations = new ArrayList<>();