Melhoria no tratamente de exceções

Cleverson Sacramento
1 parent 3d44961e
Showing 12 changed files with 54 additions and 54 deletions Show diff stats
archetype/html-rest/src/main/resources/archetype-resources/src/main/java/rest/BookmarkREST.java
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-edit.js
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/login.js
archetype/html-rest/src/main/resources/archetype-resources/src/test/java/rest/BookmarkRESTTest.java
impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/ForbiddenException.java
impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/NotFoundException.java
impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConstraintViolationExceptionMapper.java
impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/HTTPExceptionMapper.java
impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/HttpViolationExceptionMapper.java
impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java
impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/BasicAuthFilter.java
impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/TokenAuthFilter.java
@@ -49,7 +49,7 @@ public class BookmarkREST {
 	@GET
 	@Path("{id}")
 	@Produces("application/json")
-	public Bookmark load(@PathParam("id") Long id) {
+	public Bookmark load(@PathParam("id") Long id) throws Exception {
 		Bookmark result = bc.load(id);
 		if (result == null) {
@@ -65,7 +65,7 @@ public class BookmarkREST {
 	@ValidatePayload
 	@Produces("application/json")
 	@Consumes("application/json")
-	public Response insert(Bookmark entity, @Context UriInfo uriInfo) {
+	public Response insert(Bookmark entity, @Context UriInfo uriInfo) throws Exception {
 		checkId(entity);
 		String id = bc.insert(entity).getId().toString();
@@ -81,7 +81,7 @@ public class BookmarkREST {
 	@ValidatePayload
 	@Produces("application/json")
 	@Consumes("application/json")
-	public void update(@PathParam("id") Long id, Bookmark entity) {
+	public void update(@PathParam("id") Long id, Bookmark entity) throws Exception {
 		checkId(entity);
 		load(id);
@@ -93,7 +93,7 @@ public class BookmarkREST {
 	@LoggedIn
 	@Path("{id}")
 	@Transactional
-	public void delete(@PathParam("id") Long id) {
+	public void delete(@PathParam("id") Long id) throws Exception {
 		load(id);
 		bc.delete(id);
 	}
@@ -101,11 +101,11 @@ public class BookmarkREST {
 	@DELETE
 	@LoggedIn
 	@Transactional
-	public void delete(List<Long> ids) {
+	public void delete(List<Long> ids) throws Exception {
 		bc.delete(ids);
 	}
-	private void checkId(Bookmark entity) {
+	private void checkId(Bookmark entity) throws Exception {
 		if (entity.getId() != null) {
 			throw new BadRequestException();
 		}
@@ -68,7 +68,7 @@ function saveOk(data) {
 function saveFailed(request) {
 	switch (request.status) {
-		case 412:
+		case 422:
 			$($("form input").get().reverse()).each(function() {
 				var id = $(this).attr('id');
 				var message = null;
@@ -3,14 +3,14 @@ $(function() {
 	$("form").submit(function(event) {
 		event.preventDefault();
-		
+
 		$("[id$='-message']").hide();
-		
+
 		var form = {
 			'username' : $("#username").val().trim(),
 			'password' : $("#password").val().trim()
 		};
-		
+
 		AuthProxy.login(form).done(loginOk).fail(loginFail);
 	});
 });
@@ -32,7 +32,7 @@ function loginFail(request) {
 			$("#global-message").html("Usuário ou senha inválidos.").show();
 			break;
-		case 412:
+		case 422:
 			$($("form input").get().reverse()).each(function() {
 				var id = $(this).attr('id');
 				var message = null;
@@ -54,4 +54,4 @@ function loginFail(request) {
 			});
 			break;
 	}
-}
 \ No newline at end of file
+}
@@ -35,7 +35,8 @@ import org.junit.Before;
 import org.junit.Test;
 import ${package}.entity.Bookmark;
-import br.gov.frameworkdemoiselle.PreconditionFailedException;
+import br.gov.frameworkdemoiselle.HttpViolationException;
+import br.gov.frameworkdemoiselle.UnprocessableEntityException;
 public class BookmarkRESTTest {
@@ -169,8 +170,8 @@ public class BookmarkRESTTest {
 		HttpPost request;
 		CloseableHttpResponse response;
 		Bookmark bookmark;
-		Set<PreconditionFailedException.Violation> violations;
-		PreconditionFailedException expected;
+		Set<UnprocessableEntityException.Violation> violations;
+		HttpViolationException expected;
 		bookmark = new Bookmark();
 		bookmark.setDescription("Google");
@@ -191,9 +192,9 @@ public class BookmarkRESTTest {
 		response.close();
 		assertEquals(SC_PRECONDITION_FAILED, response.getStatusLine().getStatusCode());
 		violations = mapper.readValue(response.getEntity().getContent(),
-				new TypeReference<Set<PreconditionFailedException.Violation>>() {
+				new TypeReference<Set<UnprocessableEntityException.Violation>>() {
 				});
-		expected = new PreconditionFailedException();
+		expected = new UnprocessableEntityException();
 		expected.addViolation("description", "não pode ser nulo");
 		expected.addViolation("link", "não pode ser nulo");
 		assertEquals(expected.getViolations(), violations);
@@ -209,9 +210,9 @@ public class BookmarkRESTTest {
 		response.close();
 		assertEquals(SC_PRECONDITION_FAILED, response.getStatusLine().getStatusCode());
 		violations = mapper.readValue(response.getEntity().getContent(),
-				new TypeReference<Set<PreconditionFailedException.Violation>>() {
+				new TypeReference<Set<UnprocessableEntityException.Violation>>() {
 				});
-		expected = new PreconditionFailedException().addViolation("link", "formato inválido");
+		expected = new UnprocessableEntityException().addViolation("link", "formato inválido");
 		assertEquals(expected.getViolations(), violations);
 		bookmark = new Bookmark();
@@ -266,8 +267,8 @@ public class BookmarkRESTTest {
 		response.close();
 		Long id = parseEntity(response.getEntity(), Long.class);
 		Bookmark bookmark;
-		Set<PreconditionFailedException.Violation> violations;
-		PreconditionFailedException expected;
+		Set<UnprocessableEntityException.Violation> violations;
+		HttpViolationException expected;
 		bookmark = new Bookmark();
 		bookmark.setDescription("Google");
@@ -288,9 +289,9 @@ public class BookmarkRESTTest {
 		response.close();
 		assertEquals(SC_PRECONDITION_FAILED, response.getStatusLine().getStatusCode());
 		violations = mapper.readValue(response.getEntity().getContent(),
-				new TypeReference<Set<PreconditionFailedException.Violation>>() {
+				new TypeReference<Set<UnprocessableEntityException.Violation>>() {
 				});
-		expected = new PreconditionFailedException();
+		expected = new UnprocessableEntityException();
 		expected.addViolation("description", "não pode ser nulo");
 		expected.addViolation("link", "não pode ser nulo");
 		assertEquals(expected.getViolations(), violations);
@@ -306,9 +307,9 @@ public class BookmarkRESTTest {
 		response.close();
 		assertEquals(SC_PRECONDITION_FAILED, response.getStatusLine().getStatusCode());
 		violations = mapper.readValue(response.getEntity().getContent(),
-				new TypeReference<Set<PreconditionFailedException.Violation>>() {
+				new TypeReference<Set<UnprocessableEntityException.Violation>>() {
 				});
-		expected = new PreconditionFailedException().addViolation("link", "formato inválido");
+		expected = new UnprocessableEntityException().addViolation("link", "formato inválido");
 		assertEquals(expected.getViolations(), violations);
 		bookmark = new Bookmark();
@@ -2,9 +2,7 @@ package br.gov.frameworkdemoiselle;
 import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
-import javax.xml.ws.http.HTTPException;
-
-public class ForbiddenException extends HTTPException {
+public class ForbiddenException extends HttpViolationException {
 	private static final long serialVersionUID = 1L;
@@ -2,9 +2,7 @@ package br.gov.frameworkdemoiselle;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
-import javax.xml.ws.http.HTTPException;
-
-public class NotFoundException extends HTTPException {
+public class NotFoundException extends HttpViolationException {
 	private static final long serialVersionUID = 1L;
 package br.gov.frameworkdemoiselle.internal.implementation;
-import static javax.ws.rs.core.Response.Status.PRECONDITION_FAILED;
-
 import java.util.Iterator;
 import javax.validation.ConstraintViolation;
@@ -24,6 +22,7 @@ public class ConstraintViolationExceptionMapper implements ExceptionMapper&lt;Const
 			failed.addViolation(violation.getPropertyPath().toString(), violation.getMessage());
 		}
-		return Response.status(PRECONDITION_FAILED).entity(failed.getViolations()).build();
+		int status = new UnprocessableEntityException().getStatusCode();
+		return Response.status(status).entity(failed.getViolations()).build();
 	}
 }
@@ -1,15 +0,0 @@
-package br.gov.frameworkdemoiselle.internal.implementation;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-import javax.xml.ws.http.HTTPException;
-
-@Provider
-public class HTTPExceptionMapper implements ExceptionMapper<HTTPException> {
-
-	@Override
-	public Response toResponse(HTTPException exception) {
-		return Response.status(exception.getStatusCode()).build();
-	}
-}
 package br.gov.frameworkdemoiselle.internal.implementation;
+import java.util.Set;
+
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 import br.gov.frameworkdemoiselle.HttpViolationException;
+import br.gov.frameworkdemoiselle.HttpViolationException.Violation;
 @Provider
 public class HttpViolationExceptionMapper implements ExceptionMapper<HttpViolationException> {
 	@Override
 	public Response toResponse(HttpViolationException exception) {
-		return Response.status(exception.getStatusCode()).entity(exception.getViolations()).build();
+		Set<Violation> violations = exception.getViolations();
+		violations = violations.isEmpty() ? null : violations;
+
+		return Response.status(exception.getStatusCode()).entity(violations).build();
 	}
 }
@@ -51,9 +51,6 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import br.gov.frameworkdemoiselle.security.AuthenticationException;
-import br.gov.frameworkdemoiselle.security.InvalidCredentialsException;
-import br.gov.frameworkdemoiselle.security.SecurityContext;
 import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.Strings;
@@ -70,7 +67,11 @@ public abstract class AbstractHTTPAuthorizationFilter implements Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
 			ServletException {
-		if (request instanceof HttpServletRequest && isSupported(getAuthHeader((HttpServletRequest) request))) {
+		
+		RESTSecurityConfig config = Beans.getReference(RESTSecurityConfig.class);
+		
+		if (request instanceof HttpServletRequest && isActive(config)
+				&& isSupported(getAuthHeader((HttpServletRequest) request))) {
 			try {
 				performLogin((HttpServletRequest) request);
 				chain.doFilter((HttpServletRequest) request, (HttpServletResponse) response);
@@ -92,6 +93,8 @@ public abstract class AbstractHTTPAuthorizationFilter implements Filter {
 	protected abstract boolean isSupported(String authHeader);
+	protected abstract boolean isActive(RESTSecurityConfig config);
+
 	protected abstract void prepareForLogin();
 	private void performLogin(HttpServletRequest request) {
@@ -52,6 +52,11 @@ public class BasicAuthFilter extends AbstractHTTPAuthorizationFilter {
 	}
 	@Override
+	protected boolean isActive(RESTSecurityConfig config) {
+		return config.isBasicFilterActive();
+	}
+
+	@Override
 	protected void prepareForLogin() {
 		String[] basicCredentials = getCredentials(credentials);
@@ -49,6 +49,11 @@ public class TokenAuthFilter extends AbstractHTTPAuthorizationFilter {
 	}
 	@Override
+	protected boolean isActive(RESTSecurityConfig config) {
+		return config.isTokenFilterActive();
+	}
+
+	@Override
 	protected void prepareForLogin() {
 		Beans.getReference(Token.class).setValue(token);
 	}
	@@ -49,7 +49,7 @@ public class BookmarkREST {		@@ -49,7 +49,7 @@ public class BookmarkREST {
49	@GET	49	@GET
50	@Path("{id}")	50	@Path("{id}")
51	@Produces("application/json")	51	@Produces("application/json")
52	- public Bookmark load(@PathParam("id") Long id) {	52	+ public Bookmark load(@PathParam("id") Long id) throws Exception {
53	Bookmark result = bc.load(id);	53	Bookmark result = bc.load(id);
54		54
55	if (result == null) {	55	if (result == null) {
	@@ -65,7 +65,7 @@ public class BookmarkREST {		@@ -65,7 +65,7 @@ public class BookmarkREST {
65	@ValidatePayload	65	@ValidatePayload
66	@Produces("application/json")	66	@Produces("application/json")
67	@Consumes("application/json")	67	@Consumes("application/json")
68	- public Response insert(Bookmark entity, @Context UriInfo uriInfo) {	68	+ public Response insert(Bookmark entity, @Context UriInfo uriInfo) throws Exception {
69	checkId(entity);	69	checkId(entity);
70		70
71	String id = bc.insert(entity).getId().toString();	71	String id = bc.insert(entity).getId().toString();
	@@ -81,7 +81,7 @@ public class BookmarkREST {		@@ -81,7 +81,7 @@ public class BookmarkREST {
81	@ValidatePayload	81	@ValidatePayload
82	@Produces("application/json")	82	@Produces("application/json")
83	@Consumes("application/json")	83	@Consumes("application/json")
84	- public void update(@PathParam("id") Long id, Bookmark entity) {	84	+ public void update(@PathParam("id") Long id, Bookmark entity) throws Exception {
85	checkId(entity);	85	checkId(entity);
86	load(id);	86	load(id);
87		87
	@@ -93,7 +93,7 @@ public class BookmarkREST {		@@ -93,7 +93,7 @@ public class BookmarkREST {
93	@LoggedIn	93	@LoggedIn
94	@Path("{id}")	94	@Path("{id}")
95	@Transactional	95	@Transactional
96	- public void delete(@PathParam("id") Long id) {	96	+ public void delete(@PathParam("id") Long id) throws Exception {
97	load(id);	97	load(id);
98	bc.delete(id);	98	bc.delete(id);
99	}	99	}
	@@ -101,11 +101,11 @@ public class BookmarkREST {		@@ -101,11 +101,11 @@ public class BookmarkREST {
101	@DELETE	101	@DELETE
102	@LoggedIn	102	@LoggedIn
103	@Transactional	103	@Transactional
104	- public void delete(List<Long> ids) {	104	+ public void delete(List<Long> ids) throws Exception {
105	bc.delete(ids);	105	bc.delete(ids);
106	}	106	}
107		107
108	- private void checkId(Bookmark entity) {	108	+ private void checkId(Bookmark entity) throws Exception {
109	if (entity.getId() != null) {	109	if (entity.getId() != null) {
110	throw new BadRequestException();	110	throw new BadRequestException();
111	}	111	}
	@@ -68,7 +68,7 @@ function saveOk(data) {		@@ -68,7 +68,7 @@ function saveOk(data) {
68		68
69	function saveFailed(request) {	69	function saveFailed(request) {
70	switch (request.status) {	70	switch (request.status) {
71	- case 412:	71	+ case 422:
72	$($("form input").get().reverse()).each(function() {	72	$($("form input").get().reverse()).each(function() {
73	var id = $(this).attr('id');	73	var id = $(this).attr('id');
74	var message = null;	74	var message = null;
	@@ -2,9 +2,7 @@ package br.gov.frameworkdemoiselle;		@@ -2,9 +2,7 @@ package br.gov.frameworkdemoiselle;
2		2
3	import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;	3	import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
4		4
5	-import javax.xml.ws.http.HTTPException;
6	-
7	-public class ForbiddenException extends HTTPException {	5	+public class ForbiddenException extends HttpViolationException {
8		6
9	private static final long serialVersionUID = 1L;	7	private static final long serialVersionUID = 1L;
10		8
	@@ -1,15 +0,0 @@	@@ -1,15 +0,0 @@
1	-package br.gov.frameworkdemoiselle.internal.implementation;
2	-
3	-import javax.ws.rs.core.Response;
4	-import javax.ws.rs.ext.ExceptionMapper;
5	-import javax.ws.rs.ext.Provider;
6	-import javax.xml.ws.http.HTTPException;
7	-
8	-@Provider
9	-public class HTTPExceptionMapper implements ExceptionMapper<HTTPException> {
10	-
11	- @Override
12	- public Response toResponse(HTTPException exception) {
13	- return Response.status(exception.getStatusCode()).build();
14	- }
15	-}