removing wrap and throwing ValidationFailedException instead

caelum · Feb 21, 2015 · c41f284 · c41f284
1 parent dd953c4
commit c41f284
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/observer/ExecuteMethodExceptionHandler.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/observer/ExecuteMethodExceptionHandler.java
@@ -1,16 +1,15 @@
 package br.com.caelum.vraptor.observer;
 
-import br.com.caelum.vraptor.InterceptionException;
+import static org.slf4j.LoggerFactory.getLogger;
+
+import org.slf4j.Logger;
+
 import br.com.caelum.vraptor.core.ReflectionProviderException;
 import br.com.caelum.vraptor.interceptor.ApplicationLogicException;
 import br.com.caelum.vraptor.validator.ValidationException;
 
-import org.slf4j.Logger;
-
 import com.google.common.base.Throwables;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 /**
  * Handles exceptions thrown by a controller method
  *
@@ -20,10 +19,6 @@ public class ExecuteMethodExceptionHandler {
 	private final static Logger log = getLogger(ExecuteMethodExceptionHandler.class);
 
 	public void handle(Exception exception) {
-		if (exception instanceof IllegalArgumentException
-				|| exception instanceof IllegalStateException) {
-			throw new InterceptionException(exception);
-		}
 		if (exception instanceof ReflectionProviderException) {
 			throwIfNotValidationException(exception, exception.getCause());
 		}

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java
@@ -105,7 +105,7 @@ public void assertAbsenceOfErrors() {
 		if (hasUnhandledErrors()) {
 			log.debug("Some validation errors occured: {}", getErrors());
 
-			throw new IllegalStateException(
+			throw new ValidationFailedException(
 				"There are validation errors and you forgot to specify where to go. Please add in your method "
 				+ "something like:\n"
 				+ "validator.onErrorUse(page()).of(AnyController.class).anyMethod();\n"