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/10/05 09:42:00 UTC
[1/2] syncope git commit: [SYNCOPE-949] Remove management of
javax.ws.rs.NotFoundException
Repository: syncope
Updated Branches:
refs/heads/2_0_X ab1cf72e9 -> 6e6deae5f
refs/heads/master 770f57d23 -> a6ad0608d
[SYNCOPE-949] Remove management of javax.ws.rs.NotFoundException
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6e6deae5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6e6deae5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6e6deae5
Branch: refs/heads/2_0_X
Commit: 6e6deae5f7c66e03cd94f985ee87c3b9a50f03c1
Parents: ab1cf72
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Wed Oct 5 11:41:35 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Wed Oct 5 11:41:35 2016 +0200
----------------------------------------------------------------------
.../rest/cxf/RestServiceExceptionMapper.java | 71 +++++++++-----------
1 file changed, 31 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/6e6deae5/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 eb584df..39aad09 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
@@ -112,40 +112,39 @@ public class RestServiceExceptionMapper implements ExceptionMapper<Exception>, R
builder = builder(ClientExceptionType.DataIntegrityViolation, getJPAMessage(ex));
} else if (ex instanceof ConnectorException) {
builder = builder(ClientExceptionType.ConnectorException, ExceptionUtils.getRootCauseMessage(ex));
+ } else if (ex instanceof NotFoundException) {
+ builder = builder(ClientExceptionType.NotFound, ExceptionUtils.getRootCauseMessage(ex));
} else {
- builder = processNotFoundExceptions(ex);
+ builder = processInvalidEntityExceptions(ex);
if (builder == null) {
- builder = processInvalidEntityExceptions(ex);
- if (builder == null) {
- builder = processBadRequestExceptions(ex);
- }
- // process JAX-RS validation errors
- if (builder == null && ex instanceof ValidationException) {
- builder = builder(validationEM.toResponse((ValidationException) ex)).
- header(RESTHeaders.ERROR_CODE, ClientExceptionType.RESTValidation.name()).
- header(RESTHeaders.ERROR_INFO, ClientExceptionType.RESTValidation.getInfoHeaderValue(
- ExceptionUtils.getRootCauseMessage(ex)));
-
- ErrorTO error = new ErrorTO();
- error.setStatus(ClientExceptionType.RESTValidation.getResponseStatus().getStatusCode());
- error.setType(ClientExceptionType.RESTValidation);
- error.getElements().add(ExceptionUtils.getRootCauseMessage(ex));
-
- builder.entity(error);
- }
- // ...or just report as InternalServerError
- if (builder == null) {
- builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR).
- header(RESTHeaders.ERROR_INFO, ClientExceptionType.Unknown.getInfoHeaderValue(
- ExceptionUtils.getRootCauseMessage(ex)));
-
- ErrorTO error = new ErrorTO();
- error.setStatus(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode());
- error.setType(ClientExceptionType.Unknown);
- error.getElements().add(ExceptionUtils.getRootCauseMessage(ex));
-
- builder.entity(error);
- }
+ builder = processBadRequestExceptions(ex);
+ }
+ // process JAX-RS validation errors
+ if (builder == null && ex instanceof ValidationException) {
+ builder = builder(validationEM.toResponse((ValidationException) ex)).
+ header(RESTHeaders.ERROR_CODE, ClientExceptionType.RESTValidation.name()).
+ header(RESTHeaders.ERROR_INFO, ClientExceptionType.RESTValidation.getInfoHeaderValue(
+ ExceptionUtils.getRootCauseMessage(ex)));
+
+ ErrorTO error = new ErrorTO();
+ error.setStatus(ClientExceptionType.RESTValidation.getResponseStatus().getStatusCode());
+ error.setType(ClientExceptionType.RESTValidation);
+ error.getElements().add(ExceptionUtils.getRootCauseMessage(ex));
+
+ builder.entity(error);
+ }
+ // ...or just report as InternalServerError
+ if (builder == null) {
+ builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR).
+ header(RESTHeaders.ERROR_INFO, ClientExceptionType.Unknown.getInfoHeaderValue(
+ ExceptionUtils.getRootCauseMessage(ex)));
+
+ ErrorTO error = new ErrorTO();
+ error.setStatus(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode());
+ error.setType(ClientExceptionType.Unknown);
+ error.getElements().add(ExceptionUtils.getRootCauseMessage(ex));
+
+ builder.entity(error);
}
}
@@ -200,14 +199,6 @@ public class RestServiceExceptionMapper implements ExceptionMapper<Exception>, R
return builder.entity(errors);
}
- private ResponseBuilder processNotFoundExceptions(final Exception ex) {
- if (ex instanceof javax.ws.rs.NotFoundException || ex instanceof NotFoundException) {
- return builder(ClientExceptionType.NotFound, ExceptionUtils.getRootCauseMessage(ex));
- }
-
- return null;
- }
-
private ResponseBuilder processInvalidEntityExceptions(final Exception ex) {
InvalidEntityException iee = null;
[2/2] syncope git commit: [SYNCOPE-949] Remove management of
javax.ws.rs.NotFoundException
Posted by il...@apache.org.
[SYNCOPE-949] Remove management of javax.ws.rs.NotFoundException
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a6ad0608
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a6ad0608
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a6ad0608
Branch: refs/heads/master
Commit: a6ad0608dd72e917ade89f0cfb3138850f3c844c
Parents: 770f57d
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Wed Oct 5 11:41:35 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Wed Oct 5 11:41:48 2016 +0200
----------------------------------------------------------------------
.../rest/cxf/RestServiceExceptionMapper.java | 71 +++++++++-----------
1 file changed, 31 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a6ad0608/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 eb584df..39aad09 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
@@ -112,40 +112,39 @@ public class RestServiceExceptionMapper implements ExceptionMapper<Exception>, R
builder = builder(ClientExceptionType.DataIntegrityViolation, getJPAMessage(ex));
} else if (ex instanceof ConnectorException) {
builder = builder(ClientExceptionType.ConnectorException, ExceptionUtils.getRootCauseMessage(ex));
+ } else if (ex instanceof NotFoundException) {
+ builder = builder(ClientExceptionType.NotFound, ExceptionUtils.getRootCauseMessage(ex));
} else {
- builder = processNotFoundExceptions(ex);
+ builder = processInvalidEntityExceptions(ex);
if (builder == null) {
- builder = processInvalidEntityExceptions(ex);
- if (builder == null) {
- builder = processBadRequestExceptions(ex);
- }
- // process JAX-RS validation errors
- if (builder == null && ex instanceof ValidationException) {
- builder = builder(validationEM.toResponse((ValidationException) ex)).
- header(RESTHeaders.ERROR_CODE, ClientExceptionType.RESTValidation.name()).
- header(RESTHeaders.ERROR_INFO, ClientExceptionType.RESTValidation.getInfoHeaderValue(
- ExceptionUtils.getRootCauseMessage(ex)));
-
- ErrorTO error = new ErrorTO();
- error.setStatus(ClientExceptionType.RESTValidation.getResponseStatus().getStatusCode());
- error.setType(ClientExceptionType.RESTValidation);
- error.getElements().add(ExceptionUtils.getRootCauseMessage(ex));
-
- builder.entity(error);
- }
- // ...or just report as InternalServerError
- if (builder == null) {
- builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR).
- header(RESTHeaders.ERROR_INFO, ClientExceptionType.Unknown.getInfoHeaderValue(
- ExceptionUtils.getRootCauseMessage(ex)));
-
- ErrorTO error = new ErrorTO();
- error.setStatus(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode());
- error.setType(ClientExceptionType.Unknown);
- error.getElements().add(ExceptionUtils.getRootCauseMessage(ex));
-
- builder.entity(error);
- }
+ builder = processBadRequestExceptions(ex);
+ }
+ // process JAX-RS validation errors
+ if (builder == null && ex instanceof ValidationException) {
+ builder = builder(validationEM.toResponse((ValidationException) ex)).
+ header(RESTHeaders.ERROR_CODE, ClientExceptionType.RESTValidation.name()).
+ header(RESTHeaders.ERROR_INFO, ClientExceptionType.RESTValidation.getInfoHeaderValue(
+ ExceptionUtils.getRootCauseMessage(ex)));
+
+ ErrorTO error = new ErrorTO();
+ error.setStatus(ClientExceptionType.RESTValidation.getResponseStatus().getStatusCode());
+ error.setType(ClientExceptionType.RESTValidation);
+ error.getElements().add(ExceptionUtils.getRootCauseMessage(ex));
+
+ builder.entity(error);
+ }
+ // ...or just report as InternalServerError
+ if (builder == null) {
+ builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR).
+ header(RESTHeaders.ERROR_INFO, ClientExceptionType.Unknown.getInfoHeaderValue(
+ ExceptionUtils.getRootCauseMessage(ex)));
+
+ ErrorTO error = new ErrorTO();
+ error.setStatus(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode());
+ error.setType(ClientExceptionType.Unknown);
+ error.getElements().add(ExceptionUtils.getRootCauseMessage(ex));
+
+ builder.entity(error);
}
}
@@ -200,14 +199,6 @@ public class RestServiceExceptionMapper implements ExceptionMapper<Exception>, R
return builder.entity(errors);
}
- private ResponseBuilder processNotFoundExceptions(final Exception ex) {
- if (ex instanceof javax.ws.rs.NotFoundException || ex instanceof NotFoundException) {
- return builder(ClientExceptionType.NotFound, ExceptionUtils.getRootCauseMessage(ex));
- }
-
- return null;
- }
-
private ResponseBuilder processInvalidEntityExceptions(final Exception ex) {
InvalidEntityException iee = null;