Juan Hernandez has uploaded a new change for review. Change subject: restapi: Return additional info for 400 messages ......................................................................
restapi: Return additional info for 400 messages This was already done for JAXB exceptions, but is missing for RESTEasy JAXB marshall exceptions. Change-Id: I31a7a5f487c662cbcba3734153e9fcb120ba330d Bug-Url: https://bugzilla.redhat.com/867794 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> (cherry picked from commit 25dacd5f2f7d2e13f687f24b663a408cf62c6bcb) --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbExceptionMapper.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbMarshallExceptionMapper.java 2 files changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/26787/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbExceptionMapper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbExceptionMapper.java index d41bd20..6a21e01 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbExceptionMapper.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbExceptionMapper.java @@ -4,8 +4,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.Response.Status; +import javax.ws.rs.core.UriInfo; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; import javax.xml.bind.JAXBException; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbMarshallExceptionMapper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbMarshallExceptionMapper.java index c853be4..d5c2840 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbMarshallExceptionMapper.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/JaxbMarshallExceptionMapper.java @@ -1,9 +1,5 @@ package org.ovirt.engine.api.restapi.resource.validation; -import org.jboss.resteasy.annotations.interception.ServerInterceptor; -import org.jboss.resteasy.plugins.providers.jaxb.JAXBMarshalException; -import org.ovirt.engine.api.model.Fault; - import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Application; import javax.ws.rs.core.Context; @@ -13,6 +9,9 @@ import javax.ws.rs.core.UriInfo; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; + +import org.jboss.resteasy.annotations.interception.ServerInterceptor; +import org.jboss.resteasy.plugins.providers.jaxb.JAXBMarshalException; @Provider @ServerInterceptor @@ -28,14 +27,11 @@ @Override public Response toResponse(JAXBMarshalException ex) { try { - Fault fault = new Fault(); - fault.setReason("Bad Request"); - fault.setDetail(ex.getCause().getMessage()); return Response.status(Status.BAD_REQUEST) - .entity(fault) - .build(); + .entity(new UsageFinder().getUsageMessage(application, uriInfo, request)) + .build(); } catch (Exception e) { - throw new WebApplicationException(e, Response.status(Status.INTERNAL_SERVER_ERROR).build()); + throw new WebApplicationException(e, Response.status(Response.Status.INTERNAL_SERVER_ERROR).build()); } } } -- To view, visit http://gerrit.ovirt.org/26787 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31a7a5f487c662cbcba3734153e9fcb120ba330d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
