You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/09/22 14:13:14 UTC
[2/2] syncope git commit: [SYNCOPE-949] Remove management of
WebApplicationException and BadRequestException
[SYNCOPE-949] Remove management of WebApplicationException and BadRequestException
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a9aafe2d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a9aafe2d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a9aafe2d
Branch: refs/heads/master
Commit: a9aafe2dcb3d66465253e87b1676488a67defe4a
Parents: c433968
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Thu Sep 22 16:12:47 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Thu Sep 22 16:13:01 2016 +0200
----------------------------------------------------------------------
.../rest/cxf/RestServiceExceptionMapper.java | 21 +-------------------
1 file changed, 1 insertion(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a9aafe2d/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/RestServiceExceptionMapper.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/RestServiceExceptionMapper.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/RestServiceExceptionMapper.java
index d6fa891..eb584df 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/RestServiceExceptionMapper.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/RestServiceExceptionMapper.java
@@ -28,8 +28,6 @@ import javax.persistence.EntityExistsException;
import javax.persistence.PersistenceException;
import javax.persistence.RollbackException;
import javax.validation.ValidationException;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
@@ -99,15 +97,6 @@ public class RestServiceExceptionMapper implements ExceptionMapper<Exception>, R
builder = sce.isComposite()
? getSyncopeClientCompositeExceptionResponse(sce.asComposite())
: getSyncopeClientExceptionResponse(sce);
- } else if (ex instanceof WebApplicationException) {
- Response response = ((WebApplicationException) ex).getResponse();
-
- ErrorTO error = new ErrorTO();
- error.setStatus(response.getStatus());
- error.setType(ClientExceptionType.Unknown);
- error.getElements().add(ExceptionUtils.getRootCauseMessage(ex));
-
- builder = builder(response).entity(error);
} else if (ex instanceof AccessDeniedException) {
builder = Response.status(Response.Status.UNAUTHORIZED).
header(RESTHeaders.ERROR_CODE, Response.Status.UNAUTHORIZED.getReasonPhrase()).
@@ -260,8 +249,6 @@ public class RestServiceExceptionMapper implements ExceptionMapper<Exception>, R
}
private ResponseBuilder processBadRequestExceptions(final Exception ex) {
- ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
-
// This exception might be raised by Activiti (if enabled)
Class<?> ibatisPersistenceException = null;
try {
@@ -270,13 +257,7 @@ public class RestServiceExceptionMapper implements ExceptionMapper<Exception>, R
// ignore
}
- if (ex instanceof BadRequestException) {
- if (((BadRequestException) ex).getResponse() == null) {
- return builder;
- } else {
- return builder(((BadRequestException) ex).getResponse());
- }
- } else if (ex instanceof WorkflowException) {
+ if (ex instanceof WorkflowException) {
return builder(ClientExceptionType.Workflow, ExceptionUtils.getRootCauseMessage(ex));
} else if (ex instanceof PersistenceException) {
return builder(ClientExceptionType.GenericPersistence, ExceptionUtils.getRootCauseMessage(ex));