Merge pull request #64 from caelum/wrapping_exceptions

Unwrapping exceptions for JSP files too

vraptor-core/src/main/java/br/com/caelum/vraptor4/VRaptor.java

@@ -41,7 +41,7 @@
 import br.com.caelum.vraptor4.http.EncodingHandler;
 import br.com.caelum.vraptor4.http.VRaptorRequest;
 import br.com.caelum.vraptor4.http.VRaptorResponse;
-import br.com.caelum.vraptor4.interceptor.ControllerInvocationException;
+import br.com.caelum.vraptor4.interceptor.ApplicationLogicException;
 import br.com.caelum.vraptor4.ioc.Container;
 import br.com.caelum.vraptor4.ioc.ContainerProvider;
 
@@ -110,10 +110,10 @@ public Object insideRequest(Container container) {
 
 			try {
 				provider.provideForRequest(request, execution);
-			} catch (ControllerInvocationException e) {
+			} catch (ApplicationLogicException e) {
 				// it is a business logic exception, we dont need to show
 				// all interceptors stack trace
-				throw new ServletException("Your controller threw an exception", e.getCause());
+				throw new ServletException(e.getMessage(), e.getCause());
 			}
 
 			logger.debug("VRaptor ended the request");

vraptor-core/src/main/java/br/com/caelum/vraptor4/interceptor/ApplicationLogicException.java

@@ -0,0 +1,24 @@
+package br.com.caelum.vraptor4.interceptor;
+
+import br.com.caelum.vraptor4.InterceptionException;
+
+/**
+ * When a controller or JSP throws an exception, we use this one to wrap it, so
+ * we can unwrap after it leaves the interceptor stack
+ *
+ */
+@SuppressWarnings("serial")
+public class ApplicationLogicException extends InterceptionException {
+
+	public ApplicationLogicException(String msg) {
+		super(msg);
+	}
+
+	public ApplicationLogicException(String msg, Throwable e) {
+		super(msg, e);
+	}
+
+	public ApplicationLogicException(Throwable e) {
+		super(e);
+	}
+}

vraptor-core/src/main/java/br/com/caelum/vraptor4/interceptor/ExecuteMethodInterceptor.java

@@ -101,7 +101,7 @@ public void intercept(InterceptorStack stack, ControllerMethod method, Object co
 				// fine... already parsed
 				log.trace("swallowing {}", cause);
 			} else {
-				throw new ControllerInvocationException("exception raised, check root cause for details: " + cause, cause);
+				throw new ApplicationLogicException("your controller raised an exception", cause);
 			}
 		}
 	}

vraptor-core/src/main/java/br/com/caelum/vraptor4/interceptor/StepInvoker.java

@@ -49,7 +49,7 @@ private Object invokeMethod(Object interceptor, Method stepMethod,
 			return returnObject;
 		} catch (MirrorException e) {
 			// we dont wanna wrap it if it is a simple controller business logic exception
-			Throwables.propagateIfInstanceOf(e.getCause(), ControllerInvocationException.class);
+			Throwables.propagateIfInstanceOf(e.getCause(), ApplicationLogicException.class);
 			throw new InterceptionException(e.getCause());
 		}
 	}

vraptor-core/src/main/java/br/com/caelum/vraptor4/view/DefaultPageResult.java

@@ -30,6 +30,7 @@
 import br.com.caelum.vraptor4.core.MethodInfo;
 import br.com.caelum.vraptor4.http.MutableRequest;
 import br.com.caelum.vraptor4.http.MutableResponse;
+import br.com.caelum.vraptor4.interceptor.ApplicationLogicException;
 import br.com.caelum.vraptor4.proxy.MethodInvocation;
 import br.com.caelum.vraptor4.proxy.Proxifier;
 import br.com.caelum.vraptor4.proxy.ProxyInvocationException;
@@ -62,12 +63,12 @@ public DefaultPageResult(MutableRequest req, MutableResponse res, MethodInfo req
 	}
 
 	public void defaultView() {
+		String to = resolver.pathFor(requestInfo.getControllerMethod());
+		logger.debug("forwarding to {}", to);			
 		try {
-			String to = resolver.pathFor(requestInfo.getControllerMethod());
-			logger.debug("forwarding to {}", to);			
 			request.getRequestDispatcher(to).forward(request.getOriginalRequest(), response.getOriginalResponse());
 		} catch (ServletException e) {
-			throw new ResultException(e);
+			throw new ApplicationLogicException(to + " raised an exception", e);
 		} catch (IOException e) {
 			throw new ResultException(e);
 		}

vraptor-core/src/test/java/br/com/caelum/vraptor4/view/DefaultPageResultTest.java

@@ -40,6 +40,7 @@
 import br.com.caelum.vraptor4.core.MethodInfo;
 import br.com.caelum.vraptor4.http.MutableRequest;
 import br.com.caelum.vraptor4.http.MutableResponse;
+import br.com.caelum.vraptor4.interceptor.ApplicationLogicException;
 import br.com.caelum.vraptor4.proxy.JavassistProxifier;
 import br.com.caelum.vraptor4.proxy.ObjenesisInstanceCreator;
 import br.com.caelum.vraptor4.proxy.Proxifier;
@@ -136,7 +137,7 @@ public void shouldAllowCustomPathResolverWhileForwardingView() throws ServletExc
     	verify(dispatcher, only()).forward(request, response);
     }
 
-	@Test(expected=ResultException.class)
+	@Test(expected=ApplicationLogicException.class)
     public void shouldThrowResultExceptionIfServletExceptionOccursWhileForwardingView() throws Exception {
     	when(request.getRequestDispatcher(anyString())).thenReturn(dispatcher);
     	doThrow(new ServletException()).when(dispatcher).forward(request, response);