[1/2] syncope git commit: [SYNCOPE-949] Remove management of WebApplicationException and BadRequestException

2016-09-22 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/2_0_X c0124145b -> ea4786ba4
  refs/heads/master c4339686a -> a9aafe2dc


[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/ea4786ba
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ea4786ba
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ea4786ba

Branch: refs/heads/2_0_X
Commit: ea4786ba49d14c5ca98769ab7628f095b4e67e7c
Parents: c012414
Author: Francesco Chicchiriccò 
Authored: Thu Sep 22 16:12:47 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Sep 22 16:12:47 2016 +0200

--
 .../rest/cxf/RestServiceExceptionMapper.java| 21 +---
 1 file changed, 1 insertion(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/ea4786ba/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, 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, 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, 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));

[2/2] syncope git commit: [SYNCOPE-949] Remove management of WebApplicationException and BadRequestException

2016-09-22 Thread ilgrosso 
[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ò 
Authored: Thu Sep 22 16:12:47 2016 +0200
Committer: Francesco Chicchiriccò 
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, 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, 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, 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));

syncope git commit: [SYNCOPE-949] Remove management of WebApplicationException and BadRequestException

2016-09-22 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/1_2_X 057f01135 -> c7f2eb273


[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/c7f2eb27
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c7f2eb27
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c7f2eb27

Branch: refs/heads/1_2_X
Commit: c7f2eb273d8a7ead7e99aeccb4449140f723a43c
Parents: 057f011
Author: Francesco Chicchiriccò 
Authored: Thu Sep 22 15:38:51 2016 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Sep 22 15:38:51 2016 +0200

--
 .../rest/utils/RestServiceExceptionMapper.java  | 41 ++--
 1 file changed, 12 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/c7f2eb27/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
--
diff --git 
a/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
 
b/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
index 92c2034..d6e7559 100644
--- 
a/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
+++ 
b/core/src/main/java/org/apache/syncope/core/rest/utils/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;
@@ -76,13 +74,15 @@ public class RestServiceExceptionMapper implements 
ExceptionMapper, R
 @Autowired
 private Environment env;
 
-private static final Map exceptionCodeMap;
+private static final Map EXCEPTION_CODE_MAP = new 
HashMap() {
 
-static {
-exceptionCodeMap = new HashMap();
-exceptionCodeMap.put("23000", "UniqueConstraintViolation");
-exceptionCodeMap.put("23505", "UniqueConstraintViolation");
-}
+private static final long serialVersionUID = -7688359318035249200L;
+
+{
+put("23000", "UniqueConstraintViolation");
+put("23505", "UniqueConstraintViolation");
+}
+};
 
 @Override
 public Response toResponse(final Exception ex) {
@@ -95,15 +95,6 @@ public class RestServiceExceptionMapper implements 
ExceptionMapper, 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(getExMessage(ex));
-
-builder = JAXRSUtils.fromResponse(response).entity(error);
 } else if (ex instanceof AccessDeniedException) {
 builder = Response.status(Response.Status.UNAUTHORIZED).
 header(HttpHeaders.WWW_AUTHENTICATE, 
BASIC_REALM_UNAUTHORIZED);
@@ -224,8 +215,8 @@ public class RestServiceExceptionMapper implements 
ExceptionMapper, R
 if (iee != null) {
 ClientExceptionType exType =
 iee.getEntityClassSimpleName().endsWith("Policy")
-? ClientExceptionType.InvalidPolicy
-: ClientExceptionType.valueOf("Invalid" + 
iee.getEntityClassSimpleName());
+? ClientExceptionType.InvalidPolicy
+: ClientExceptionType.valueOf("Invalid" + 
iee.getEntityClassSimpleName());
 
 ResponseBuilder builder = 
Response.status(Response.Status.BAD_REQUEST);
 builder.header(RESTHeaders.ERROR_CODE, exType.getHeaderValue());
@@ -249,15 +240,7 @@ public class RestServiceExceptionMapper implements 
ExceptionMapper, R
 }
 
 private ResponseBuilder processBadRequestExceptions(final Exception ex) {
-ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
-
-if (ex instanceof BadRequestException) {
-if (((BadRequestException) ex).getResponse() == null) {
-return builder;
-} else {
-return JAXRSUtils.fromResponse(((BadRequestException) 
ex).getResponse());
-}
-} else if (ex instanceof WorkflowException) {
+if (ex ins