From 80006b08c7611d36a6b4363b13dc5e3d90bcad60 Mon Sep 17 00:00:00 2001 From: andre.guimaraes Date: Wed, 4 Jul 2018 09:41:52 -0300 Subject: [PATCH] Altera pacote dos handlers --- src/main/java/br/gov/ans/exceptions/BusinessException.java | 19 ------------------- src/main/java/br/gov/ans/exceptions/ErrorMessage.java | 46 ---------------------------------------------- src/main/java/br/gov/ans/exceptions/ResourceConflictException.java | 23 ----------------------- src/main/java/br/gov/ans/exceptions/ResourceNotFoundException.java | 24 ------------------------ src/main/java/br/gov/ans/exceptions/WrappedException.java | 19 ------------------- src/main/java/br/gov/ans/exceptions/handlers/AxisFaultHandler.java | 57 --------------------------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/BusinessExceptionHandler.java | 37 ------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/EJBAccessExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/EJBExceptionHandler.java | 42 ------------------------------------------ src/main/java/br/gov/ans/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java | 43 ------------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/ExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/ForbiddenExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/LoginExceptionHandler.java | 89 ----------------------------------------------------------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/NotAcceptableExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/NotAllowedExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/NotAuthorizedExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/NotFoundExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/PersistenceExceptionHandler.java | 42 ------------------------------------------ src/main/java/br/gov/ans/exceptions/handlers/ResourceConflictExceptionHandler.java | 37 ------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/ResourceNotFoundExceptionHandler.java | 37 ------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/SAXExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/UnknownHostExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/WebApplicationExceptionHandler.java | 38 -------------------------------------- src/main/java/br/gov/ans/exceptions/handlers/WrappedExceptionHandler.java | 46 ---------------------------------------------- src/main/java/br/gov/ans/filters/LogRequestFilter.java | 82 ---------------------------------------------------------------------------------- src/main/java/br/gov/ans/filters/SessionInvalidateFilter.java | 33 --------------------------------- src/main/java/br/gov/ans/integracao/sei/exceptions/BusinessException.java | 19 +++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/ErrorMessage.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceConflictException.java | 23 +++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceNotFoundException.java | 24 ++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/WrappedException.java | 19 +++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/AxisFaultHandler.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/BusinessExceptionHandler.java | 37 +++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBAccessExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBExceptionHandler.java | 42 ++++++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java | 43 +++++++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ForbiddenExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/LoginExceptionHandler.java | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAcceptableExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAllowedExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAuthorizedExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotFoundExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/PersistenceExceptionHandler.java | 42 ++++++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceConflictExceptionHandler.java | 37 +++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceNotFoundExceptionHandler.java | 37 +++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/SAXExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/UnknownHostExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WebApplicationExceptionHandler.java | 38 ++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WrappedExceptionHandler.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/filters/LogRequestFilter.java | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/filters/SessionInvalidateFilter.java | 33 +++++++++++++++++++++++++++++++++ src/main/java/br/gov/ans/integracao/sei/rest/ArquivoResource.java | 2 +- src/main/java/br/gov/ans/integracao/sei/rest/ContatoResource.java | 6 +++--- src/main/java/br/gov/ans/integracao/sei/rest/DocumentoResource.java | 6 +++--- src/main/java/br/gov/ans/integracao/sei/rest/InfoResource.java | 2 +- src/main/java/br/gov/ans/integracao/sei/rest/InfraResource.java | 4 ++-- src/main/java/br/gov/ans/integracao/sei/rest/ProcessoResource.java | 4 ++-- src/main/java/br/gov/ans/integracao/sei/rest/SiparResource.java | 6 +++--- src/main/java/br/gov/ans/integracao/sei/rest/TarefaResource.java | 2 +- src/main/java/br/gov/ans/integracao/sei/rest/UnidadeResource.java | 2 +- src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java | 2 +- src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java | 4 ++-- src/main/java/br/gov/ans/integracao/sei/utils/Util.java | 2 +- src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java | 4 ++-- src/main/webapp/WEB-INF/web.xml | 34 +++++++++++++++++----------------- 66 files changed, 1096 insertions(+), 1096 deletions(-) delete mode 100644 src/main/java/br/gov/ans/exceptions/BusinessException.java delete mode 100644 src/main/java/br/gov/ans/exceptions/ErrorMessage.java delete mode 100644 src/main/java/br/gov/ans/exceptions/ResourceConflictException.java delete mode 100644 src/main/java/br/gov/ans/exceptions/ResourceNotFoundException.java delete mode 100644 src/main/java/br/gov/ans/exceptions/WrappedException.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/AxisFaultHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/BusinessExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/EJBAccessExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/EJBExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/ExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/ForbiddenExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/LoginExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/NotAcceptableExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/NotAllowedExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/NotAuthorizedExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/NotFoundExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/PersistenceExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/ResourceConflictExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/ResourceNotFoundExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/SAXExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/UnknownHostExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/WebApplicationExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/exceptions/handlers/WrappedExceptionHandler.java delete mode 100644 src/main/java/br/gov/ans/filters/LogRequestFilter.java delete mode 100644 src/main/java/br/gov/ans/filters/SessionInvalidateFilter.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/BusinessException.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/ErrorMessage.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceConflictException.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceNotFoundException.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/WrappedException.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/AxisFaultHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/BusinessExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBAccessExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ForbiddenExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/LoginExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAcceptableExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAllowedExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAuthorizedExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotFoundExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/PersistenceExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceConflictExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceNotFoundExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/SAXExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/UnknownHostExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WebApplicationExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WrappedExceptionHandler.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/filters/LogRequestFilter.java create mode 100644 src/main/java/br/gov/ans/integracao/sei/filters/SessionInvalidateFilter.java diff --git a/src/main/java/br/gov/ans/exceptions/BusinessException.java b/src/main/java/br/gov/ans/exceptions/BusinessException.java deleted file mode 100644 index 2c847f8..0000000 --- a/src/main/java/br/gov/ans/exceptions/BusinessException.java +++ /dev/null @@ -1,19 +0,0 @@ -package br.gov.ans.exceptions; - -import javax.ejb.ApplicationException; - -@ApplicationException -public class BusinessException extends Exception{ - - private static final long serialVersionUID = 1L; - - private String message; - - public BusinessException(String message){ - this.message = message; - } - - public String getMessage() { - return message; - } -} diff --git a/src/main/java/br/gov/ans/exceptions/ErrorMessage.java b/src/main/java/br/gov/ans/exceptions/ErrorMessage.java deleted file mode 100644 index dd09943..0000000 --- a/src/main/java/br/gov/ans/exceptions/ErrorMessage.java +++ /dev/null @@ -1,46 +0,0 @@ -package br.gov.ans.exceptions; - -import javax.xml.bind.annotation.XmlRootElement; - -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; - -@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) -@JsonIgnoreProperties(ignoreUnknown = true) -@XmlRootElement -public class ErrorMessage { - private String error; - private String code; - - public ErrorMessage(){} - - public ErrorMessage(String error) { - this.error = error; - } - - public ErrorMessage(String error, String code) { - this.error = error; - this.code = code; - } - - public ErrorMessage(String error, int code) { - this.error = error; - this.code = String.valueOf(code); - } - - public String getError() { - return error; - } - - public void setError(String error){ - this.error = error; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } -} diff --git a/src/main/java/br/gov/ans/exceptions/ResourceConflictException.java b/src/main/java/br/gov/ans/exceptions/ResourceConflictException.java deleted file mode 100644 index 6f095cc..0000000 --- a/src/main/java/br/gov/ans/exceptions/ResourceConflictException.java +++ /dev/null @@ -1,23 +0,0 @@ -package br.gov.ans.exceptions; - -import javax.ejb.ApplicationException; - -@ApplicationException -public class ResourceConflictException extends Exception{ - - private static final long serialVersionUID = 1L; - - private String message; - - public ResourceConflictException(String message) { - this.message = message; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/src/main/java/br/gov/ans/exceptions/ResourceNotFoundException.java b/src/main/java/br/gov/ans/exceptions/ResourceNotFoundException.java deleted file mode 100644 index 541984c..0000000 --- a/src/main/java/br/gov/ans/exceptions/ResourceNotFoundException.java +++ /dev/null @@ -1,24 +0,0 @@ -package br.gov.ans.exceptions; - -import javax.ejb.ApplicationException; - -@ApplicationException -public class ResourceNotFoundException extends Exception { - - private static final long serialVersionUID = 1L; - - private String message; - - public ResourceNotFoundException(String message) { - this.message = message; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - -} diff --git a/src/main/java/br/gov/ans/exceptions/WrappedException.java b/src/main/java/br/gov/ans/exceptions/WrappedException.java deleted file mode 100644 index 0fd1d8c..0000000 --- a/src/main/java/br/gov/ans/exceptions/WrappedException.java +++ /dev/null @@ -1,19 +0,0 @@ -package br.gov.ans.exceptions; - -import javax.ejb.ApplicationException; - -@ApplicationException -public class WrappedException extends Exception{ - - private static final long serialVersionUID = 1L; - - private Exception ex; - - public WrappedException(Exception ex){ - this.ex = ex; - } - - public Exception getEx() { - return ex; - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/AxisFaultHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/AxisFaultHandler.java deleted file mode 100644 index b5d9a77..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/AxisFaultHandler.java +++ /dev/null @@ -1,57 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import java.net.UnknownHostException; - -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.apache.axis.AxisFault; -import org.jboss.logging.Logger; -import org.xml.sax.SAXException; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class AxisFaultHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Inject - private UnknownHostExceptionHandler unknownHostExceptionHandler; - - @Inject - private SAXExceptionHandler sAXExceptionHandler; - - @Override - public Response toResponse(AxisFault ex) { - logger.error(ex); - - logger.debug(ex, ex); - - Throwable cause = ex.getCause(); - - if(cause instanceof UnknownHostException){ - return unknownHostExceptionHandler.toResponse((UnknownHostException) cause); - } - - if(cause instanceof SAXException){ - return sAXExceptionHandler.toResponse((SAXException) cause); - } - - return Response.status(Status.INTERNAL_SERVER_ERROR) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/BusinessExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/BusinessExceptionHandler.java deleted file mode 100644 index d6c7056..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/BusinessExceptionHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.BusinessException; -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class BusinessExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - public Response toResponse(BusinessException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.BAD_REQUEST) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.BAD_REQUEST.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/EJBAccessExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/EJBAccessExceptionHandler.java deleted file mode 100644 index 267af8b..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/EJBAccessExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.ejb.EJBAccessException; -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class EJBAccessExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(EJBAccessException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.UNAUTHORIZED) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.UNAUTHORIZED.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/EJBExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/EJBExceptionHandler.java deleted file mode 100644 index bcf275c..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/EJBExceptionHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.ejb.EJBException; -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; -import br.gov.ans.utils.MessageUtils; - -@Provider -public class EJBExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Inject - private MessageUtils messages; - - public Response toResponse(EJBException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.INTERNAL_SERVER_ERROR) - .entity(new ErrorMessage(messages.getMessage("erro.inesperado"),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } - -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java deleted file mode 100644 index 8412f8c..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.ejb.EJBTransactionRolledbackException; -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; -import br.gov.ans.utils.MessageUtils; - -@Provider -public class EJBTransactionRolledbackExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Inject - private MessageUtils messages; - - @Override - public Response toResponse(EJBTransactionRolledbackException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.INTERNAL_SERVER_ERROR) - .entity(new ErrorMessage(messages.getMessage("erro.inesperado"),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } - -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/ExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/ExceptionHandler.java deleted file mode 100644 index 5a1a3ad..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/ExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class ExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(Exception ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.INTERNAL_SERVER_ERROR) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } - -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/ForbiddenExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/ForbiddenExceptionHandler.java deleted file mode 100644 index d44ada7..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/ForbiddenExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class ForbiddenExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(ForbiddenException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.FORBIDDEN) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.FORBIDDEN.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/LoginExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/LoginExceptionHandler.java deleted file mode 100644 index 4f982f9..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/LoginExceptionHandler.java +++ /dev/null @@ -1,89 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; - -import javax.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; -import javax.xml.bind.JAXB; - -import org.jboss.logging.Logger; - -import com.google.gson.Gson; - -import br.gov.ans.exceptions.ErrorMessage; - -//@WebServlet("/loginExceptionHandler") -public class LoginExceptionHandler extends HttpServlet{ - - private static final long serialVersionUID = 1L; - - @Inject - private Logger logger; - - @Override - protected void doPost(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - - String acceptType = getAcceptType(req); - - resp.setContentType(acceptType); - resp.setCharacterEncoding("utf-8"); - - CODE code = CODE.valueOf("_"+req.getParameter("code")); - - ErrorMessage error = new ErrorMessage(code.message, code.status.getStatusCode()); - - logger.error(error.getError()); - - PrintWriter out = resp.getWriter(); - - if(acceptType.equals(MediaType.APPLICATION_JSON)){ - out.write(new Gson().toJson(error)); - }else{ - StringWriter sw = new StringWriter(); - JAXB.marshal(error, sw); - - out.write(sw.toString()); - } - } - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - doPost(req, resp); - } - - @Override - protected void doPut(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - doPost(req, resp); - } - - @Override - protected void doDelete(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - doPost(req, resp); - } - - private enum CODE{ - _401(Status.UNAUTHORIZED, "Cliente não autenticado."), - _403(Status.FORBIDDEN, "Cliente não autorizado."); - - Status status; - String message; - - private CODE(Status restStatus, String message) { - this.status = restStatus; - this.message = message; - } - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/NotAcceptableExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/NotAcceptableExceptionHandler.java deleted file mode 100644 index b06ef9e..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/NotAcceptableExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.NotAcceptableException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class NotAcceptableExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(NotAcceptableException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.NOT_ACCEPTABLE) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.NOT_ACCEPTABLE.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/NotAllowedExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/NotAllowedExceptionHandler.java deleted file mode 100644 index 525ddef..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/NotAllowedExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.NotAllowedException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class NotAllowedExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(NotAllowedException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.METHOD_NOT_ALLOWED) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.METHOD_NOT_ALLOWED.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/NotAuthorizedExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/NotAuthorizedExceptionHandler.java deleted file mode 100644 index bd12f51..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/NotAuthorizedExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class NotAuthorizedExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(NotAuthorizedException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.UNAUTHORIZED) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.UNAUTHORIZED.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/NotFoundExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/NotFoundExceptionHandler.java deleted file mode 100644 index fe8359d..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/NotFoundExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class NotFoundExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(NotFoundException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.NOT_FOUND) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.NOT_FOUND.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/PersistenceExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/PersistenceExceptionHandler.java deleted file mode 100644 index 464ca66..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/PersistenceExceptionHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.persistence.PersistenceException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; -import br.gov.ans.utils.MessageUtils; - -@Provider -public class PersistenceExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Inject - private MessageUtils messages; - - public Response toResponse(PersistenceException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.INTERNAL_SERVER_ERROR) - .entity(new ErrorMessage(messages.getMessage("erro.inesperado"),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } - -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/ResourceConflictExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/ResourceConflictExceptionHandler.java deleted file mode 100644 index 306fecd..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/ResourceConflictExceptionHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; -import br.gov.ans.exceptions.ResourceConflictException; - -@Provider -public class ResourceConflictExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - public Response toResponse(ResourceConflictException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.CONFLICT) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.CONFLICT.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/ResourceNotFoundExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/ResourceNotFoundExceptionHandler.java deleted file mode 100644 index d67d88a..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/ResourceNotFoundExceptionHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; -import br.gov.ans.exceptions.ResourceNotFoundException; - -@Provider -public class ResourceNotFoundExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - public Response toResponse(ResourceNotFoundException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.NOT_FOUND) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.NOT_FOUND.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/SAXExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/SAXExceptionHandler.java deleted file mode 100644 index 756fdea..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/SAXExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; -import org.xml.sax.SAXException; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class SAXExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(SAXException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.INTERNAL_SERVER_ERROR) - .entity(new ErrorMessage("Não foi possível se conectar ao SEI.",String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/UnknownHostExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/UnknownHostExceptionHandler.java deleted file mode 100644 index 826d93a..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/UnknownHostExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import java.net.UnknownHostException; - -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class UnknownHostExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - public Response toResponse(UnknownHostException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.BAD_GATEWAY) - .entity(new ErrorMessage("Não foi possível se conectar ao SEI.",String.valueOf(Status.BAD_GATEWAY.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/WebApplicationExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/WebApplicationExceptionHandler.java deleted file mode 100644 index 156034c..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/WebApplicationExceptionHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.ErrorMessage; - -@Provider -public class WebApplicationExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(WebApplicationException ex) { - logger.error(ex); - - logger.debug(ex, ex); - - return Response.status(Status.INTERNAL_SERVER_ERROR) - .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } -} diff --git a/src/main/java/br/gov/ans/exceptions/handlers/WrappedExceptionHandler.java b/src/main/java/br/gov/ans/exceptions/handlers/WrappedExceptionHandler.java deleted file mode 100644 index 9c86acc..0000000 --- a/src/main/java/br/gov/ans/exceptions/handlers/WrappedExceptionHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -package br.gov.ans.exceptions.handlers; - -import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; - -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -import br.gov.ans.exceptions.BusinessException; -import br.gov.ans.exceptions.ErrorMessage; -import br.gov.ans.exceptions.WrappedException; - -@Provider -public class WrappedExceptionHandler implements ExceptionMapper{ - - @Inject - private Logger logger; - - @Context - private HttpHeaders headers; - - @Override - public Response toResponse(WrappedException ex) { - logger.error(ex.getEx()); - - logger.debug(ex.getEx(), ex.getEx()); - - Status status = Status.INTERNAL_SERVER_ERROR; - - if(ex.getEx() instanceof BusinessException){ - status = Status.BAD_REQUEST; - } - - return Response.status(status) - .entity(new ErrorMessage(ex.getEx().getMessage(),String.valueOf(status.getStatusCode()))) - .type(getAcceptType(headers)) - .build(); - } - -} diff --git a/src/main/java/br/gov/ans/filters/LogRequestFilter.java b/src/main/java/br/gov/ans/filters/LogRequestFilter.java deleted file mode 100644 index 2e58737..0000000 --- a/src/main/java/br/gov/ans/filters/LogRequestFilter.java +++ /dev/null @@ -1,82 +0,0 @@ -package br.gov.ans.filters; - -import java.io.IOException; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; -import org.jboss.resteasy.core.ResourceMethodInvoker; - -import br.gov.ans.integracao.sei.utils.Constantes; -import br.gov.ans.utils.LogIgnore; -import br.gov.ans.utils.LogIntegracaoUtil; -import br.gov.ans.utils.MessageUtils; - -@Provider -public class LogRequestFilter implements ContainerRequestFilter{ - - @Inject - private LogIntegracaoUtil audit; - - @Inject - private MessageUtils messages; - - @Context - private UriInfo uriInfo; - - @Context - private ResourceInfo resourceInfo; - - @Context - private HttpServletRequest request; - - @Context - private SecurityContext securityContext; - - @Inject - private Logger logger; - - @Override - public void filter(ContainerRequestContext context) throws IOException{ - request.setCharacterEncoding(Constantes.UTF8); - - if(isLoggable()){ - audit.registrarLog(getUserName(),uriInfo.getAbsolutePath().toString(), getMethodName(context)); - } - } - - public String getMethodName(ContainerRequestContext context){ - ResourceMethodInvoker methodInvoker = (ResourceMethodInvoker) context.getProperty(Constantes.RESOURCE_METHOD_INVOKER); - - return methodInvoker.getMethod().getName(); - } - - public String getUserName(){ - try{ - return securityContext.getUserPrincipal().getName(); - }catch (Exception ex) { - logger.debug("Sem informações do usuário logado: ", ex); - return messages.getMessage("sem.informacoes.usuario"); - } - } - - private boolean isLoggable(){ - if(resourceInfo.getResourceClass().isAnnotationPresent(LogIgnore.class)){ - return false; - } - - if(resourceInfo.getResourceMethod().isAnnotationPresent(LogIgnore.class)){ - return false; - } - - return true; - } -} diff --git a/src/main/java/br/gov/ans/filters/SessionInvalidateFilter.java b/src/main/java/br/gov/ans/filters/SessionInvalidateFilter.java deleted file mode 100644 index d130607..0000000 --- a/src/main/java/br/gov/ans/filters/SessionInvalidateFilter.java +++ /dev/null @@ -1,33 +0,0 @@ -package br.gov.ans.filters; - -import java.io.IOException; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; - -import org.jboss.logging.Logger; - -@Provider -public class SessionInvalidateFilter implements ContainerResponseFilter{ - - @Context - private HttpServletRequest request; - - @Inject - private Logger logger; - - @Override - public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) - throws IOException { - try{ - request.getSession().invalidate(); - }catch(Exception ex){ - logger.error(ex); - } - } -} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/BusinessException.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/BusinessException.java new file mode 100644 index 0000000..2861cd9 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/BusinessException.java @@ -0,0 +1,19 @@ +package br.gov.ans.integracao.sei.exceptions; + +import javax.ejb.ApplicationException; + +@ApplicationException +public class BusinessException extends Exception{ + + private static final long serialVersionUID = 1L; + + private String message; + + public BusinessException(String message){ + this.message = message; + } + + public String getMessage() { + return message; + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/ErrorMessage.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/ErrorMessage.java new file mode 100644 index 0000000..7462499 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/ErrorMessage.java @@ -0,0 +1,46 @@ +package br.gov.ans.integracao.sei.exceptions; + +import javax.xml.bind.annotation.XmlRootElement; + +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +@XmlRootElement +public class ErrorMessage { + private String error; + private String code; + + public ErrorMessage(){} + + public ErrorMessage(String error) { + this.error = error; + } + + public ErrorMessage(String error, String code) { + this.error = error; + this.code = code; + } + + public ErrorMessage(String error, int code) { + this.error = error; + this.code = String.valueOf(code); + } + + public String getError() { + return error; + } + + public void setError(String error){ + this.error = error; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceConflictException.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceConflictException.java new file mode 100644 index 0000000..be5c99c --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceConflictException.java @@ -0,0 +1,23 @@ +package br.gov.ans.integracao.sei.exceptions; + +import javax.ejb.ApplicationException; + +@ApplicationException +public class ResourceConflictException extends Exception{ + + private static final long serialVersionUID = 1L; + + private String message; + + public ResourceConflictException(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceNotFoundException.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceNotFoundException.java new file mode 100644 index 0000000..a6e816a --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/ResourceNotFoundException.java @@ -0,0 +1,24 @@ +package br.gov.ans.integracao.sei.exceptions; + +import javax.ejb.ApplicationException; + +@ApplicationException +public class ResourceNotFoundException extends Exception { + + private static final long serialVersionUID = 1L; + + private String message; + + public ResourceNotFoundException(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/WrappedException.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/WrappedException.java new file mode 100644 index 0000000..6476f64 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/WrappedException.java @@ -0,0 +1,19 @@ +package br.gov.ans.integracao.sei.exceptions; + +import javax.ejb.ApplicationException; + +@ApplicationException +public class WrappedException extends Exception{ + + private static final long serialVersionUID = 1L; + + private Exception ex; + + public WrappedException(Exception ex){ + this.ex = ex; + } + + public Exception getEx() { + return ex; + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/AxisFaultHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/AxisFaultHandler.java new file mode 100644 index 0000000..8e728d2 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/AxisFaultHandler.java @@ -0,0 +1,57 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import java.net.UnknownHostException; + +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.apache.axis.AxisFault; +import org.jboss.logging.Logger; +import org.xml.sax.SAXException; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class AxisFaultHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Inject + private UnknownHostExceptionHandler unknownHostExceptionHandler; + + @Inject + private SAXExceptionHandler sAXExceptionHandler; + + @Override + public Response toResponse(AxisFault ex) { + logger.error(ex); + + logger.debug(ex, ex); + + Throwable cause = ex.getCause(); + + if(cause instanceof UnknownHostException){ + return unknownHostExceptionHandler.toResponse((UnknownHostException) cause); + } + + if(cause instanceof SAXException){ + return sAXExceptionHandler.toResponse((SAXException) cause); + } + + return Response.status(Status.INTERNAL_SERVER_ERROR) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/BusinessExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/BusinessExceptionHandler.java new file mode 100644 index 0000000..9d999d2 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/BusinessExceptionHandler.java @@ -0,0 +1,37 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class BusinessExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + public Response toResponse(BusinessException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.BAD_REQUEST) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.BAD_REQUEST.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBAccessExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBAccessExceptionHandler.java new file mode 100644 index 0000000..1a1742e --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBAccessExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.ejb.EJBAccessException; +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class EJBAccessExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(EJBAccessException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.UNAUTHORIZED) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.UNAUTHORIZED.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBExceptionHandler.java new file mode 100644 index 0000000..ced25f5 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBExceptionHandler.java @@ -0,0 +1,42 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.ejb.EJBException; +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; +import br.gov.ans.utils.MessageUtils; + +@Provider +public class EJBExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Inject + private MessageUtils messages; + + public Response toResponse(EJBException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.INTERNAL_SERVER_ERROR) + .entity(new ErrorMessage(messages.getMessage("erro.inesperado"),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } + +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java new file mode 100644 index 0000000..9f0b759 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/EJBTransactionRolledbackExceptionHandler.java @@ -0,0 +1,43 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.ejb.EJBTransactionRolledbackException; +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; +import br.gov.ans.utils.MessageUtils; + +@Provider +public class EJBTransactionRolledbackExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Inject + private MessageUtils messages; + + @Override + public Response toResponse(EJBTransactionRolledbackException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.INTERNAL_SERVER_ERROR) + .entity(new ErrorMessage(messages.getMessage("erro.inesperado"),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } + +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ExceptionHandler.java new file mode 100644 index 0000000..36d5069 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class ExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(Exception ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.INTERNAL_SERVER_ERROR) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } + +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ForbiddenExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ForbiddenExceptionHandler.java new file mode 100644 index 0000000..5af0884 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ForbiddenExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.ForbiddenException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class ForbiddenExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(ForbiddenException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.FORBIDDEN) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.FORBIDDEN.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/LoginExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/LoginExceptionHandler.java new file mode 100644 index 0000000..5d7214b --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/LoginExceptionHandler.java @@ -0,0 +1,89 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; + +import javax.inject.Inject; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response.Status; +import javax.xml.bind.JAXB; + +import org.jboss.logging.Logger; + +import com.google.gson.Gson; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +//@WebServlet("/loginExceptionHandler") +public class LoginExceptionHandler extends HttpServlet{ + + private static final long serialVersionUID = 1L; + + @Inject + private Logger logger; + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + + String acceptType = getAcceptType(req); + + resp.setContentType(acceptType); + resp.setCharacterEncoding("utf-8"); + + CODE code = CODE.valueOf("_"+req.getParameter("code")); + + ErrorMessage error = new ErrorMessage(code.message, code.status.getStatusCode()); + + logger.error(error.getError()); + + PrintWriter out = resp.getWriter(); + + if(acceptType.equals(MediaType.APPLICATION_JSON)){ + out.write(new Gson().toJson(error)); + }else{ + StringWriter sw = new StringWriter(); + JAXB.marshal(error, sw); + + out.write(sw.toString()); + } + } + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + doPost(req, resp); + } + + @Override + protected void doPut(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + doPost(req, resp); + } + + @Override + protected void doDelete(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + doPost(req, resp); + } + + private enum CODE{ + _401(Status.UNAUTHORIZED, "Cliente não autenticado."), + _403(Status.FORBIDDEN, "Cliente não autorizado."); + + Status status; + String message; + + private CODE(Status restStatus, String message) { + this.status = restStatus; + this.message = message; + } + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAcceptableExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAcceptableExceptionHandler.java new file mode 100644 index 0000000..fe9c623 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAcceptableExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.NotAcceptableException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class NotAcceptableExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(NotAcceptableException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.NOT_ACCEPTABLE) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.NOT_ACCEPTABLE.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAllowedExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAllowedExceptionHandler.java new file mode 100644 index 0000000..295dc86 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAllowedExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.NotAllowedException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class NotAllowedExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(NotAllowedException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.METHOD_NOT_ALLOWED) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.METHOD_NOT_ALLOWED.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAuthorizedExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAuthorizedExceptionHandler.java new file mode 100644 index 0000000..882ebe8 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotAuthorizedExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.NotAuthorizedException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class NotAuthorizedExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(NotAuthorizedException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.UNAUTHORIZED) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.UNAUTHORIZED.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotFoundExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotFoundExceptionHandler.java new file mode 100644 index 0000000..02f2a92 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/NotFoundExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.NotFoundException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class NotFoundExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(NotFoundException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.NOT_FOUND) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.NOT_FOUND.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/PersistenceExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/PersistenceExceptionHandler.java new file mode 100644 index 0000000..668f26e --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/PersistenceExceptionHandler.java @@ -0,0 +1,42 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.persistence.PersistenceException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; +import br.gov.ans.utils.MessageUtils; + +@Provider +public class PersistenceExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Inject + private MessageUtils messages; + + public Response toResponse(PersistenceException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.INTERNAL_SERVER_ERROR) + .entity(new ErrorMessage(messages.getMessage("erro.inesperado"),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } + +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceConflictExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceConflictExceptionHandler.java new file mode 100644 index 0000000..b278d6c --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceConflictExceptionHandler.java @@ -0,0 +1,37 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; +import br.gov.ans.integracao.sei.exceptions.ResourceConflictException; + +@Provider +public class ResourceConflictExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + public Response toResponse(ResourceConflictException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.CONFLICT) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.CONFLICT.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceNotFoundExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceNotFoundExceptionHandler.java new file mode 100644 index 0000000..d3942b9 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/ResourceNotFoundExceptionHandler.java @@ -0,0 +1,37 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; +import br.gov.ans.integracao.sei.exceptions.ResourceNotFoundException; + +@Provider +public class ResourceNotFoundExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + public Response toResponse(ResourceNotFoundException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.NOT_FOUND) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.NOT_FOUND.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/SAXExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/SAXExceptionHandler.java new file mode 100644 index 0000000..3a32ba3 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/SAXExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; +import org.xml.sax.SAXException; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class SAXExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(SAXException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.INTERNAL_SERVER_ERROR) + .entity(new ErrorMessage("Não foi possível se conectar ao SEI.",String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/UnknownHostExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/UnknownHostExceptionHandler.java new file mode 100644 index 0000000..a133efd --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/UnknownHostExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import java.net.UnknownHostException; + +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class UnknownHostExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + public Response toResponse(UnknownHostException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.BAD_GATEWAY) + .entity(new ErrorMessage("Não foi possível se conectar ao SEI.",String.valueOf(Status.BAD_GATEWAY.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WebApplicationExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WebApplicationExceptionHandler.java new file mode 100644 index 0000000..ab14200 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WebApplicationExceptionHandler.java @@ -0,0 +1,38 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; + +@Provider +public class WebApplicationExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(WebApplicationException ex) { + logger.error(ex); + + logger.debug(ex, ex); + + return Response.status(Status.INTERNAL_SERVER_ERROR) + .entity(new ErrorMessage(ex.getMessage(),String.valueOf(Status.INTERNAL_SERVER_ERROR.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WrappedExceptionHandler.java b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WrappedExceptionHandler.java new file mode 100644 index 0000000..e420da2 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/exceptions/handlers/WrappedExceptionHandler.java @@ -0,0 +1,46 @@ +package br.gov.ans.integracao.sei.exceptions.handlers; + +import static br.gov.ans.utils.HttpHeadersUtil.getAcceptType; + +import javax.inject.Inject; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +import br.gov.ans.integracao.sei.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; +import br.gov.ans.integracao.sei.exceptions.WrappedException; + +@Provider +public class WrappedExceptionHandler implements ExceptionMapper{ + + @Inject + private Logger logger; + + @Context + private HttpHeaders headers; + + @Override + public Response toResponse(WrappedException ex) { + logger.error(ex.getEx()); + + logger.debug(ex.getEx(), ex.getEx()); + + Status status = Status.INTERNAL_SERVER_ERROR; + + if(ex.getEx() instanceof BusinessException){ + status = Status.BAD_REQUEST; + } + + return Response.status(status) + .entity(new ErrorMessage(ex.getEx().getMessage(),String.valueOf(status.getStatusCode()))) + .type(getAcceptType(headers)) + .build(); + } + +} diff --git a/src/main/java/br/gov/ans/integracao/sei/filters/LogRequestFilter.java b/src/main/java/br/gov/ans/integracao/sei/filters/LogRequestFilter.java new file mode 100644 index 0000000..06bbfe3 --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/filters/LogRequestFilter.java @@ -0,0 +1,82 @@ +package br.gov.ans.integracao.sei.filters; + +import java.io.IOException; + +import javax.inject.Inject; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.container.ContainerRequestFilter; +import javax.ws.rs.container.ResourceInfo; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.core.UriInfo; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; +import org.jboss.resteasy.core.ResourceMethodInvoker; + +import br.gov.ans.integracao.sei.utils.Constantes; +import br.gov.ans.utils.LogIgnore; +import br.gov.ans.utils.LogIntegracaoUtil; +import br.gov.ans.utils.MessageUtils; + +@Provider +public class LogRequestFilter implements ContainerRequestFilter{ + + @Inject + private LogIntegracaoUtil audit; + + @Inject + private MessageUtils messages; + + @Context + private UriInfo uriInfo; + + @Context + private ResourceInfo resourceInfo; + + @Context + private HttpServletRequest request; + + @Context + private SecurityContext securityContext; + + @Inject + private Logger logger; + + @Override + public void filter(ContainerRequestContext context) throws IOException{ + request.setCharacterEncoding(Constantes.UTF8); + + if(isLoggable()){ + audit.registrarLog(getUserName(),uriInfo.getAbsolutePath().toString(), getMethodName(context)); + } + } + + public String getMethodName(ContainerRequestContext context){ + ResourceMethodInvoker methodInvoker = (ResourceMethodInvoker) context.getProperty(Constantes.RESOURCE_METHOD_INVOKER); + + return methodInvoker.getMethod().getName(); + } + + public String getUserName(){ + try{ + return securityContext.getUserPrincipal().getName(); + }catch (Exception ex) { + logger.debug("Sem informações do usuário logado: ", ex); + return messages.getMessage("sem.informacoes.usuario"); + } + } + + private boolean isLoggable(){ + if(resourceInfo.getResourceClass().isAnnotationPresent(LogIgnore.class)){ + return false; + } + + if(resourceInfo.getResourceMethod().isAnnotationPresent(LogIgnore.class)){ + return false; + } + + return true; + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/filters/SessionInvalidateFilter.java b/src/main/java/br/gov/ans/integracao/sei/filters/SessionInvalidateFilter.java new file mode 100644 index 0000000..3ec3cda --- /dev/null +++ b/src/main/java/br/gov/ans/integracao/sei/filters/SessionInvalidateFilter.java @@ -0,0 +1,33 @@ +package br.gov.ans.integracao.sei.filters; + +import java.io.IOException; + +import javax.inject.Inject; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.container.ContainerResponseContext; +import javax.ws.rs.container.ContainerResponseFilter; +import javax.ws.rs.core.Context; +import javax.ws.rs.ext.Provider; + +import org.jboss.logging.Logger; + +@Provider +public class SessionInvalidateFilter implements ContainerResponseFilter{ + + @Context + private HttpServletRequest request; + + @Inject + private Logger logger; + + @Override + public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) + throws IOException { + try{ + request.getSession().invalidate(); + }catch(Exception ex){ + logger.error(ex); + } + } +} diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/ArquivoResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/ArquivoResource.java index e3b6722..ca84a4b 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/ArquivoResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/ArquivoResource.java @@ -16,8 +16,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import br.gov.ans.exceptions.BusinessException; import br.gov.ans.integracao.sei.client.SeiPortTypeProxy; +import br.gov.ans.integracao.sei.exceptions.BusinessException; import br.gov.ans.integracao.sei.modelo.Arquivo; import br.gov.ans.integracao.sei.modelo.ArquivoCriado; import br.gov.ans.integracao.sei.modelo.Operacao; diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/ContatoResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/ContatoResource.java index 43b9abd..7a0a1a2 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/ContatoResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/ContatoResource.java @@ -28,11 +28,11 @@ import javax.ws.rs.core.UriInfo; import org.apache.commons.lang3.ArrayUtils; -import br.gov.ans.exceptions.BusinessException; -import br.gov.ans.exceptions.ResourceNotFoundException; -import br.gov.ans.exceptions.WrappedException; import br.gov.ans.integracao.sei.client.Contato; import br.gov.ans.integracao.sei.client.SeiPortTypeProxy; +import br.gov.ans.integracao.sei.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.ResourceNotFoundException; +import br.gov.ans.integracao.sei.exceptions.WrappedException; import br.gov.ans.integracao.sei.modelo.Operacao; import br.gov.ans.integracao.sei.modelo.Pessoa; import br.gov.ans.integracao.sei.modelo.enums.Acao; diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/DocumentoResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/DocumentoResource.java index a5d02ff..149c246 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/DocumentoResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/DocumentoResource.java @@ -47,15 +47,15 @@ import com.github.mustachejava.Mustache; import br.gov.ans.commons.security.crypt.HashUtils; import br.gov.ans.dao.DAO; -import br.gov.ans.exceptions.BusinessException; -import br.gov.ans.exceptions.ResourceNotFoundException; -import br.gov.ans.exceptions.WrappedException; import br.gov.ans.integracao.sei.client.Documento; import br.gov.ans.integracao.sei.client.RetornoConsultaDocumento; import br.gov.ans.integracao.sei.client.RetornoInclusaoDocumento; import br.gov.ans.integracao.sei.client.SeiPortTypeProxy; import br.gov.ans.integracao.sei.dao.DocumentoDAO; import br.gov.ans.integracao.sei.dao.InclusaoDocumentoDAO; +import br.gov.ans.integracao.sei.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.ResourceNotFoundException; +import br.gov.ans.integracao.sei.exceptions.WrappedException; import br.gov.ans.integracao.sei.modelo.CancelamentoDocumento; import br.gov.ans.integracao.sei.modelo.DocumentoResumido; import br.gov.ans.integracao.sei.modelo.ExclusaoDocumento; diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/InfoResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/InfoResource.java index 2b145f4..621b0f0 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/InfoResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/InfoResource.java @@ -17,9 +17,9 @@ import javax.ws.rs.core.MediaType; import org.jboss.logging.Logger; -import br.gov.ans.exceptions.BusinessException; import br.gov.ans.integracao.sei.client.SeiPortTypeProxy; import br.gov.ans.integracao.sei.dao.LogIntegracaoSistemicaDAO; +import br.gov.ans.integracao.sei.exceptions.BusinessException; import br.gov.ans.integracao.sei.modelo.Operacao; import br.gov.ans.integracao.sei.utils.Constantes; import br.gov.ans.modelo.LogIntegracaoSistemica; diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/InfraResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/InfraResource.java index 1376b57..d7d0247 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/InfraResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/InfraResource.java @@ -15,12 +15,12 @@ import javax.ws.rs.core.MediaType; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import br.gov.ans.exceptions.BusinessException; -import br.gov.ans.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sei.client.Estado; import br.gov.ans.integracao.sei.client.Pais; import br.gov.ans.integracao.sei.client.SeiPortTypeProxy; import br.gov.ans.integracao.sei.dao.CidadeDAO; +import br.gov.ans.integracao.sei.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sei.modelo.Operacao; import br.gov.ans.integracao.sei.utils.Constantes; import br.gov.ans.utils.MessageUtils; diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/ProcessoResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/ProcessoResource.java index d090b08..9669ffa 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/ProcessoResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/ProcessoResource.java @@ -37,8 +37,6 @@ import org.apache.commons.lang3.StringUtils; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.providers.jaxb.Wrapped; -import br.gov.ans.exceptions.BusinessException; -import br.gov.ans.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sei.client.Andamento; import br.gov.ans.integracao.sei.client.AtributoAndamento; import br.gov.ans.integracao.sei.client.RetornoConsultaProcedimento; @@ -50,6 +48,8 @@ import br.gov.ans.integracao.sei.dao.DocumentoDAO; import br.gov.ans.integracao.sei.dao.ProcessoDAO; import br.gov.ans.integracao.sei.dao.SiparDAO; import br.gov.ans.integracao.sei.dao.UnidadeDAO; +import br.gov.ans.integracao.sei.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sei.modelo.DocumentoResumido; import br.gov.ans.integracao.sei.modelo.EnvioDeProcesso; import br.gov.ans.integracao.sei.modelo.Motivo; diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/SiparResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/SiparResource.java index 7e03b27..6ee020b 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/SiparResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/SiparResource.java @@ -18,10 +18,10 @@ import javax.ws.rs.core.UriInfo; import org.jboss.logging.Logger; -import br.gov.ans.exceptions.BusinessException; -import br.gov.ans.exceptions.ResourceConflictException; -import br.gov.ans.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sei.dao.SiparDAO; +import br.gov.ans.integracao.sei.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.ResourceConflictException; +import br.gov.ans.integracao.sei.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sipar.dao.ControleMigracao; import br.gov.ans.integracao.sipar.dao.ControleMigracaoId; import br.gov.ans.utils.MessageUtils; diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/TarefaResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/TarefaResource.java index 0f036c2..b668942 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/TarefaResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/TarefaResource.java @@ -9,8 +9,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import br.gov.ans.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sei.dao.TarefaDAO; +import br.gov.ans.integracao.sei.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sei.modelo.Tarefa; import br.gov.ans.utils.MessageUtils; diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/UnidadeResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/UnidadeResource.java index 208b87c..e8708e1 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/UnidadeResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/UnidadeResource.java @@ -15,9 +15,9 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.time.DateUtils; import org.jboss.logging.Logger; -import br.gov.ans.exceptions.BusinessException; import br.gov.ans.integracao.sei.client.SeiPortTypeProxy; import br.gov.ans.integracao.sei.client.Unidade; +import br.gov.ans.integracao.sei.exceptions.BusinessException; import br.gov.ans.integracao.sei.modelo.Operacao; import br.gov.ans.integracao.sei.utils.Constantes; import br.gov.ans.utils.MessageUtils; diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java b/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java index ba4f749..26876fb 100644 --- a/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java +++ b/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java @@ -11,10 +11,10 @@ import javax.inject.Inject; import org.apache.commons.lang3.StringUtils; -import br.gov.ans.exceptions.BusinessException; import br.gov.ans.integracao.sei.client.Contato; import br.gov.ans.integracao.sei.dao.CidadeDAO; import br.gov.ans.integracao.sei.dao.ContatoDAO; +import br.gov.ans.integracao.sei.exceptions.BusinessException; import br.gov.ans.integracao.sei.modelo.Cidade; import br.gov.ans.integracao.sei.modelo.Endereco; import br.gov.ans.integracao.sei.modelo.Pessoa; diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java b/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java index 4e0e55e..7e807c8 100644 --- a/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java +++ b/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java @@ -14,11 +14,11 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.FieldUtils; import org.jboss.logging.Logger; -import br.gov.ans.exceptions.BusinessException; -import br.gov.ans.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sei.client.Contato; import br.gov.ans.integracao.sei.dao.CidadeDAO; import br.gov.ans.integracao.sei.dao.ContatoDAO; +import br.gov.ans.integracao.sei.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.ResourceNotFoundException; import br.gov.ans.integracao.sei.modelo.Endereco; import br.gov.ans.integracao.sei.modelo.Pessoa; import br.gov.ans.integracao.sei.modelo.PessoaFisica; diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/Util.java b/src/main/java/br/gov/ans/integracao/sei/utils/Util.java index 816e3a3..368f234 100644 --- a/src/main/java/br/gov/ans/integracao/sei/utils/Util.java +++ b/src/main/java/br/gov/ans/integracao/sei/utils/Util.java @@ -24,7 +24,7 @@ import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.type.TypeReference; -import br.gov.ans.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.BusinessException; public class Util { diff --git a/src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java b/src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java index ee6e741..976a5c1 100644 --- a/src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java +++ b/src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java @@ -9,10 +9,10 @@ import javax.ws.rs.core.Response.Status.Family; import org.jboss.logging.Logger; -import br.gov.ans.exceptions.BusinessException; -import br.gov.ans.exceptions.ErrorMessage; import br.gov.ans.factories.qualifiers.Autenticado; import br.gov.ans.factories.qualifiers.SeiQualifiers.TemplatesBrokerParameter; +import br.gov.ans.integracao.sei.exceptions.BusinessException; +import br.gov.ans.integracao.sei.exceptions.ErrorMessage; import br.gov.ans.integracao.sei.utils.Constantes; public class ClientTemplatesBroker { diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 65b9620..4a7ee8d 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -31,7 +31,7 @@ LoginExceptionHandler - br.gov.ans.exceptions.handlers.LoginExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.LoginExceptionHandler @@ -124,66 +124,66 @@ resteasy.businessExceptionHandler - br.gov.ans.exceptions.handlers.BusinessExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.BusinessExceptionHandler resteasy.EJBTransactionRolledbackExceptionHandler - br.gov.ans.exceptions.handlers.EJBTransactionRolledbackExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.EJBTransactionRolledbackExceptionHandler resteasy.notAllowedExceptionHandler - br.gov.ans.exceptions.handlers.NotAllowedExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.NotAllowedExceptionHandler resteasy.notAcceptableExceptionHandler - br.gov.ans.exceptions.handlers.NotAcceptableExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.NotAcceptableExceptionHandler resteasy.ejbAccessExceptionHandler - br.gov.ans.exceptions.handlers.EJBAccessExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.EJBAccessExceptionHandler resteasy.notFoundExceptionHandler - br.gov.ans.exceptions.handlers.NotFoundExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.NotFoundExceptionHandler resteasy.exceptionHandler - br.gov.ans.exceptions.handlers.ExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.ExceptionHandler resteasy.notAuthorizedExceptionHandler - br.gov.ans.exceptions.handlers.NotAuthorizedExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.NotAuthorizedExceptionHandler resteasy.forbiddenException - br.gov.ans.exceptions.handlers.ForbiddenException + br.gov.ans.integracao.sei.exceptions.handlers.ForbiddenException resteasy.webApplicationException - br.gov.ans.exceptions.handlers.WebApplicationException + br.gov.ans.integracao.sei.exceptions.handlers.WebApplicationException resteasy.wrappedExceptionHandler - br.gov.ans.exceptions.handlers.WrappedExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.WrappedExceptionHandler resteasy.resourceNotFoundExceptionHandler - br.gov.ans.exceptions.handlers.ResourceNotFoundExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.ResourceNotFoundExceptionHandler resteasy.unknownHostExceptionHandler - br.gov.ans.exceptions.handlers.UnknownHostExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.UnknownHostExceptionHandler resteasy.axisFaultHandler - br.gov.ans.exceptions.handlers.AxisFaultHandler + br.gov.ans.integracao.sei.exceptions.handlers.AxisFaultHandler resteasy.sAXExceptionHandler - br.gov.ans.exceptions.handlers.SAXExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.SAXExceptionHandler resteasy.persistenceExceptionHandler - br.gov.ans.exceptions.handlers.PersistenceExceptionHandler + br.gov.ans.integracao.sei.exceptions.handlers.PersistenceExceptionHandler \ No newline at end of file -- libgit2 0.21.2