Use standard validation exception

Author: pith

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Version 2.2.0 (2016-01-28)
 
-* [new] An ExceptionMapper for ValidationException is provided by default.
+* [new] An `ExceptionMapper` for `ConstraintViolationException` is provided by default.
+* [new] The `ValidatorFactory` is now injectable.
+* [brk] The `ValidationService` is deprecated.
+* [brk] The `org.seedstack.validation.ValidationException` is replaced by the standard `ConstraintViolationException`.
 

src/it/java/org/seedstack/validation/internal/FieldValidationKoIT.java

@@ -11,15 +11,15 @@
 import org.junit.runner.RunWith;
 import org.seedstack.seed.it.Expect;
 import org.seedstack.seed.it.SeedITRunner;
-import org.seedstack.validation.ValidationException;
 import org.seedstack.validation.internal.pojo.FieldValidationKO;
 
 import javax.inject.Inject;
+import javax.validation.ConstraintViolationException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SeedITRunner.class)
-@Expect(value = ValidationException.class, step = Expect.TestingStep.INSTANTIATION)
+@Expect(value = ConstraintViolationException.class, step = Expect.TestingStep.INSTANTIATION)
 public class FieldValidationKoIT {
 
     @Inject

src/it/java/org/seedstack/validation/internal/InjectionsIT.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.validation.internal;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.seedstack.seed.it.SeedITRunner;
+
+import javax.inject.Inject;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+
+@RunWith(SeedITRunner.class)
+public class InjectionsIT {
+
+    @Inject
+    private ValidatorFactory validatorFactory;
+
+    @Inject
+    private Validator validator;
+
+    @Test
+    public void isValidatorFactoryInjectable() {
+        Assertions.assertThat(validatorFactory).isNotNull();
+    }
+
+    @Test
+    public void isValidatorInjectable() {
+        Assertions.assertThat(validator).isNotNull();
+    }
+}

src/it/java/org/seedstack/validation/internal/ValidationPluginIT.java

@@ -7,14 +7,14 @@
  */
 package org.seedstack.validation.internal;
 
-import org.seedstack.validation.ValidationException;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.seedstack.seed.it.SeedITRunner;
 import org.seedstack.validation.internal.pojo.*;
 
 import javax.inject.Inject;
+import javax.validation.ConstraintViolationException;
 
 @RunWith(SeedITRunner.class)
 public class ValidationPluginIT {
@@ -44,7 +44,7 @@ public void param_not_null_validations_ok() {
         serviceParam.validateNotNullParam("");
     }
 
-    @Test(expected = ValidationException.class)
+    @Test(expected = ConstraintViolationException.class)
     public void param_not_null_validations_are_well_intercepted() {
         serviceParam.validateNotNullParam(null);
     }
@@ -55,7 +55,7 @@ public void param_valid_validations_ok() {
     }
 
 
-    @Test(expected = ValidationException.class)
+    @Test(expected = ConstraintViolationException.class)
     public void param_valid_validations_are_well_intercepted() {
         serviceParam.validateValidParam(new Pojo(Pojo.State.INVALID));
     }
@@ -65,7 +65,7 @@ public void not_null_return_validations_ok() {
         serviceReturnType.validateNotNullReturn("");
     }
 
-    @Test(expected = ValidationException.class)
+    @Test(expected = ConstraintViolationException.class)
     public void not_null_return_validations_are_well_intercepted() {
         serviceReturnType.validateNotNullReturn(null);
     }
@@ -75,7 +75,7 @@ public void valid_return_validations_ok() {
         serviceReturnType.validateValidReturn(Pojo.State.VALID);
     }
 
-    @Test(expected = ValidationException.class)
+    @Test(expected = ConstraintViolationException.class)
     public void valid_return_validations_are_well_intercepted() {
         serviceReturnType.validateValidReturn(Pojo.State.INVALID);
     }

src/it/java/org/seedstack/validation/internal/ValidationServiceIT.java

@@ -11,16 +11,13 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.seedstack.seed.it.SeedITRunner;
-import org.seedstack.validation.ValidationException;
-import org.seedstack.validation.ValidationService;
 import org.seedstack.validation.internal.pojo.Bean;
 import org.seedstack.validation.internal.pojo.MyImpl;
 import org.seedstack.validation.internal.pojo.Pojo;
 import org.seedstack.validation.internal.pojo.PojoWithDeepValidation;
 
 import javax.inject.Inject;
-import javax.validation.ConstraintViolation;
-import java.util.Set;
+import javax.validation.ConstraintViolationException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -39,18 +36,12 @@ public void validationServiceIsInjected() {
     public void throwsExceptionOnInvalidPojo() {
         try {
             validationService.staticallyHandle(new Pojo(Pojo.State.INVALID));
-            Assertions.failBecauseExceptionWasNotThrown(ValidationException.class);
-        } catch (ValidationException validationException) {
-            expectViolations(validationException, 3);
+            Assertions.failBecauseExceptionWasNotThrown(ConstraintViolationException.class);
+        } catch (ConstraintViolationException exception) {
+            assertThat(exception.getConstraintViolations()).hasSize(3);
         }
     }
 
-    private void expectViolations(ValidationException validationException, int expected) {
-        Set<ConstraintViolation<?>> constraintViolations = validationException
-                .get(ValidationService.JAVAX_VALIDATION_CONSTRAINT_VIOLATIONS);
-        assertThat(constraintViolations).hasSize(expected);
-    }
-
     @Test
     public void doNothingOnValidPojo() {
         validationService.staticallyHandle(new Pojo(Pojo.State.VALID));
@@ -60,19 +51,19 @@ public void doNothingOnValidPojo() {
     public void throwsExceptionOnDeepValidation() {
         try {
             validationService.staticallyHandle(new PojoWithDeepValidation());
-            Assertions.failBecauseExceptionWasNotThrown(ValidationException.class);
-        } catch (ValidationException validationException) {
-            expectViolations(validationException, 4);
+            Assertions.failBecauseExceptionWasNotThrown(ConstraintViolationException.class);
+        } catch (ConstraintViolationException exception) {
+            assertThat(exception.getConstraintViolations()).hasSize(4);
         }
     }
 
     @Test
     public void validationShouldWorkOnInterface() {
         try {
             validationService.staticallyHandle(new MyImpl());
-            Assertions.failBecauseExceptionWasNotThrown(ValidationException.class);
-        } catch (ValidationException validationException) {
-            expectViolations(validationException, 1);
+            Assertions.failBecauseExceptionWasNotThrown(ConstraintViolationException.class);
+        } catch (ConstraintViolationException exception) {
+            assertThat(exception.getConstraintViolations()).hasSize(1);
         }
     }
 
@@ -82,9 +73,9 @@ public void validationShouldWorkOnGetter() {
             Bean candidate = new Bean();
             candidate.setHour(25);
             validationService.staticallyHandle(candidate);
-            Assertions.failBecauseExceptionWasNotThrown(ValidationException.class);
-        } catch (ValidationException validationException) {
-            expectViolations(validationException, 1);
+            Assertions.failBecauseExceptionWasNotThrown(ConstraintViolationException.class);
+        } catch (ConstraintViolationException exception) {
+            assertThat(exception.getConstraintViolations()).hasSize(1);
         }
     }
 }

src/main/java/org/seedstack/validation/ValidationException.java

@@ -15,11 +15,13 @@
  * Exception class for validation errors.
  *
  * @author [email protected]
+ * @deprecated This exception is no longer used and will be removed in the next version.
+ * Use the standard {@link javax.validation.ConstraintViolationException} instead.
  */
+@Deprecated
 public class ValidationException extends SeedException {
-    private static final long serialVersionUID = 1L;
 
-	public ValidationException(ErrorCode errorCode) {
-		super(errorCode);
-	}
+    public ValidationException(ErrorCode errorCode) {
+        super(errorCode);
+    }
 }

src/main/java/org/seedstack/validation/ValidationService.java

@@ -15,7 +15,10 @@
  * Interface for validation service.
  *
  * @author [email protected]
+ * @deprecated ValidationService will be removed in the next version. Use {@link javax.validation.Validator} instead.
+ * It can be directly injected or retrieved through the {@link javax.validation.ValidatorFactory}.
  */
+@Deprecated
 public interface ValidationService {
 
     String JAVAX_VALIDATION_CONSTRAINT_VIOLATIONS = "Set<javax.validation.ConstraintViolation>";

…nternal/ValidationMethodInterceptor.java …nternal/MethodValidationInterceptor.javasrc/main/java/org/seedstack/validation/internal/ValidationMethodInterceptor.java renamed to src/main/java/org/seedstack/validation/internal/MethodValidationInterceptor.java src/main/java/org/seedstack/validation/internal/ValidationMethodInterceptor.java renamed to src/main/java/org/seedstack/validation/internal/MethodValidationInterceptor.java

@@ -9,12 +9,11 @@
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.seedstack.validation.ValidationService;
 
-class ValidationMethodInterceptor implements MethodInterceptor {
+class MethodValidationInterceptor implements MethodInterceptor {
     private final ValidationService validationService;
 
-    ValidationMethodInterceptor(ValidationService validationService) {
+    MethodValidationInterceptor(ValidationService validationService) {
         this.validationService = validationService;
     }
 

src/main/java/org/seedstack/validation/internal/StaticValidationProvisionListener.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.validation.internal;
+
+import com.google.inject.spi.ProvisionListener;
+
+/**
+ * Validates provisioned instances eligible for static validation.
+ */
+class StaticValidationProvisionListener implements ProvisionListener {
+
+    private ValidationService validationService;
+
+    public StaticValidationProvisionListener(ValidationService validationService) {
+        this.validationService = validationService;
+    }
+
+    @Override
+    public <A> void onProvision(ProvisionInvocation<A> provision) {
+        A injectee = provision.provision();
+        validationService.staticallyHandle(injectee);
+    }
+}

src/main/java/org/seedstack/validation/internal/ValidationErrorCode.java

@@ -10,6 +10,5 @@
 import org.seedstack.seed.ErrorCode;
 
 enum ValidationErrorCode implements ErrorCode {
-    VALIDATION_ISSUE,
     DYNAMIC_VALIDATION_IS_NOT_SUPPORTED
 }