BVAL-703 Reallow null values in ConstraintViolationException second c…

…onstructor
jakartaee · Dec 19, 2017 · b2c11c9 · b2c11c9
1 parent 077ca48
commit b2c11c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/javax/validation/ConstraintViolationException.java b/src/main/java/javax/validation/ConstraintViolationException.java
@@ -15,6 +15,7 @@
  *
  * @author Emmanuel Bernard
  * @author Gunnar Morling
+ * @author Guillaume Smet
  */
 public class ConstraintViolationException extends ValidationException {
 
@@ -24,7 +25,7 @@ public class ConstraintViolationException extends ValidationException {
 	 * Creates a constraint violation report.
 	 *
 	 * @param message error message
-	 * @param constraintViolations {@code Set} of {@link ConstraintViolation}
+	 * @param constraintViolations a {@code Set} of {@link ConstraintViolation}s or null
 	 */
 	public ConstraintViolationException(String message,
 										Set<? extends ConstraintViolation<?>> constraintViolations) {
@@ -41,16 +42,19 @@ public ConstraintViolationException(String message,
 	/**
 	 * Creates a constraint violation report.
 	 *
-	 * @param constraintViolations {@code Set} of {@link ConstraintViolation}
+	 * @param constraintViolations a {@code Set} of {@link ConstraintViolation}s or null
 	 */
 	public ConstraintViolationException(Set<? extends ConstraintViolation<?>> constraintViolations) {
-		this( toString( constraintViolations ), constraintViolations );
+		this(
+				constraintViolations != null ? toString( constraintViolations ) : null,
+				constraintViolations
+		);
 	}
 
 	/**
-	 * Set of constraint violations reported during a validation.
+	 * Returns the set of constraint violations reported during a validation.
 	 *
-	 * @return {@code Set} of {@link ConstraintViolation}
+	 * @return the {@code Set} of {@link ConstraintViolation}s or null
 	 */
 	public Set<ConstraintViolation<?>> getConstraintViolations() {
 		return constraintViolations;

diff --git a/src/test/java/javax/validation/ConstraintViolationExceptionTest.java b/src/test/java/javax/validation/ConstraintViolationExceptionTest.java
@@ -57,6 +57,11 @@ public void testCreationOfConstraintViolationExceptionWithoutViolations() {
 
 		assertNull( constraintViolationException.getConstraintViolations() );
 		assertNull( constraintViolationException.getMessage() );
+
+		constraintViolationException = new ConstraintViolationException( null );
+
+		assertNull( constraintViolationException.getConstraintViolations() );
+		assertNull( constraintViolationException.getMessage() );
 	}
 
 	/**