Explore FreeForm validation v2

engine/src/main/java/org/hibernate/validator/HibernateValidatorConfiguration.java

@@ -18,6 +18,7 @@
 import javax.validation.valueextraction.ValueExtractor;
 
 import org.hibernate.validator.cfg.ConstraintMapping;
+import org.hibernate.validator.cfg.propertyholder.PropertyHolderConstraintMapping;
 import org.hibernate.validator.constraints.ParameterScriptAssert;
 import org.hibernate.validator.constraints.ScriptAssert;
 import org.hibernate.validator.spi.properties.GetterPropertySelectionStrategy;
@@ -64,8 +65,8 @@ public interface HibernateValidatorConfiguration extends Configuration<Hibernate
 	String ALLOW_PARALLEL_METHODS_DEFINE_PARAMETER_CONSTRAINTS = "hibernate.validator.allow_parallel_method_parameter_constraint";
 
 	/**
-	 * @deprecated planned for removal. Use hibernate.validator.constraint_mapping_contributors instead.
 	 * @since 5.2
+	 * @deprecated planned for removal. Use hibernate.validator.constraint_mapping_contributors instead.
 	 */
 	@Deprecated
 	String CONSTRAINT_MAPPING_CONTRIBUTOR = "hibernate.validator.constraint_mapping_contributor";
@@ -334,4 +335,10 @@ public interface HibernateValidatorConfiguration extends Configuration<Hibernate
 	 */
 	@Incubating
 	HibernateValidatorConfiguration getterPropertySelectionStrategy(GetterPropertySelectionStrategy getterPropertySelectionStrategy);
+
+	@Incubating
+	HibernateValidatorConfiguration addPropertyHolderMapping(PropertyHolderConstraintMapping mapping);
+
+	@Incubating
+	PropertyHolderConstraintMapping createPropertyHolderConstraintMapping();
 }

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/Cascadable.java

@@ -0,0 +1,33 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Facet of a constraint mapping creational context which allows to mark the underlying
+ * element as to be validated in a cascaded way.
+ *
+ * @author Gunnar Morling
+ * @author Kevin Pollet &lt;kevin.pollet@serli.com&gt; (C) 2011 SERLI
+ */
+public interface Cascadable<C extends Cascadable<C>> {
+
+	/**
+	 * Marks the current element (property, parameter etc.) as cascadable.
+	 *
+	 * @return The current creational context following the method chaining pattern.
+	 */
+	C valid(String mapping);
+
+	/**
+	 * Adds a group conversion for this cascadable element. Several conversions may be configured for one element.
+	 *
+	 * @param from the source group of the conversion to be configured
+	 *
+	 * @return a creational context allow to set the target group of the conversion
+	 */
+	GroupConversionTargetContext<C> convertGroup(Class<?> from);
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/CascadableContainerElementConstraintMappingContext.java

@@ -0,0 +1,14 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * @author Marko Bekhta
+ */
+public interface CascadableContainerElementConstraintMappingContext extends ContainerElementConstraintMappingContext,
+		Cascadable<CascadableContainerElementConstraintMappingContext> {
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/CascadablePropertyConstraintMappingContext.java

@@ -0,0 +1,22 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Constraint mapping creational context representing a property of a property holder. Allows
+ * to place constraints on the property, mark the property as cascadable and to
+ * navigate to other constraint targets.
+ *
+ * @author Gunnar Morling
+ * @author Kevin Pollet &lt;kevin.pollet@serli.com&gt; (C) 2011 SERLI
+ * @author Marko Bekhta
+ */
+public interface CascadablePropertyConstraintMappingContext extends Constrainable<CascadablePropertyConstraintMappingContext>,
+		PropertyHolderTarget,
+		PropertyTarget,
+		Cascadable<CascadablePropertyConstraintMappingContext> {
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/Constrainable.java

@@ -0,0 +1,27 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+import org.hibernate.validator.cfg.ConstraintDef;
+
+/**
+ * Facet of a property holder constraint mapping creational context which allows to place
+ * constraints on the underlying element.
+ *
+ * @author Gunnar Morling
+ * @author Kevin Pollet &lt;kevin.pollet@serli.com&gt; (C) 2011 SERLI
+ */
+public interface Constrainable<C extends Constrainable<C>> {
+	/**
+	 * Adds a new constraint.
+	 *
+	 * @param definition The constraint to add.
+	 *
+	 * @return The current creational context following the method chaining pattern.
+	 */
+	C constraint(ConstraintDef<?, ?> definition);
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/ContainerElementConstraintMappingContext.java

@@ -0,0 +1,21 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Constraint mapping creational context representing a type argument of a property, parameter or method return value
+ * with a generic (return) type. Allows to place constraints on that type argument, mark it as cascadable and to
+ * navigate to other constraint targets.
+ *
+ * @author Gunnar Morling
+ * @since 6.0
+ */
+public interface ContainerElementConstraintMappingContext extends Constrainable<ContainerElementConstraintMappingContext>,
+		PropertyTarget,
+		PropertyHolderTarget,
+		ContainerElementTarget {
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/ContainerElementTarget.java

@@ -0,0 +1,27 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+import org.hibernate.validator.Incubating;
+
+/**
+ * Facet of a constraint mapping creational context which allows to select a type argument or the component type of the
+ * (return) type of the current property as target for the next operations.
+ *
+ * @author Marko Bekhta
+ */
+@Incubating
+public interface ContainerElementTarget {
+
+	ContainerElementConstraintMappingContext containerElementType(Class<?> type);
+
+	ContainerElementConstraintMappingContext containerElementType(Class<?> type, int index, int... nestedIndexes);
+
+	CascadableContainerElementConstraintMappingContext containerElementType(String mapping);
+
+	CascadableContainerElementConstraintMappingContext containerElementType(String mapping, int index, int... nestedIndexes);
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/GroupConversionTargetContext.java

@@ -0,0 +1,25 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Creational context which allows to set the target group of a group conversion configured via
+ * {@link Cascadable#convertGroup(Class)}.
+ *
+ * @author Gunnar Morling
+ */
+public interface GroupConversionTargetContext<C> {
+
+	/**
+	 * Sets the target group of the conversion to be configured.
+	 *
+	 * @param to the target group of the conversion
+	 *
+	 * @return The current creational context following the method chaining pattern.
+	 */
+	C to(Class<?> to);
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/PropertyConstraintMappingContext.java

@@ -0,0 +1,22 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Constraint mapping creational context representing a property of a property holder. Allows
+ * to place constraints on the property, mark the property as cascadable and to
+ * navigate to other constraint targets.
+ *
+ * @author Gunnar Morling
+ * @author Kevin Pollet &lt;kevin.pollet@serli.com&gt; (C) 2011 SERLI
+ * @author Marko Bekhta
+ */
+public interface PropertyConstraintMappingContext extends Constrainable<PropertyConstraintMappingContext>,
+		PropertyTarget,
+		PropertyHolderTarget,
+		ContainerElementTarget {
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/PropertyHolderConstraintMapping.java

@@ -0,0 +1,28 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Represents a property holder constraint mapping configured via the programmatic API.
+ *
+ * @author Marko Bekhta
+ */
+public interface PropertyHolderConstraintMapping {
+
+	/**
+	 * Starts defining constraints for the specified unique mapping name. Each mapping name may only be used
+	 * once within all property holder constraint mappings used for configuring one validator factory.
+	 *
+	 * @param propertyHolderMappingName The mapping name for which to define constraints. All constraints
+	 * 		defined after calling this method are added to the bean of the type {@code beanClass} until the
+	 * 		next call of {@link this#type(String)}.
+	 *
+	 * @return Instance allowing for defining constraints for the specified property holder mapping name.
+	 */
+	TypeConstraintMappingContext type(String propertyHolderMappingName);
+
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/PropertyHolderConstraintMappingContext.java

@@ -0,0 +1,23 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Constraint mapping creational context representing a property of a property holder. Allows
+ * to place constraints on the property, mark the property as cascadable and to
+ * navigate to other constraint targets.
+ *
+ * @author Gunnar Morling
+ * @author Kevin Pollet &lt;kevin.pollet@serli.com&gt; (C) 2011 SERLI
+ * @author Marko Bekhta
+ */
+public interface PropertyHolderConstraintMappingContext extends Constrainable<PropertyHolderConstraintMappingContext>,
+		PropertyHolderTarget,
+		PropertyTarget,
+		Cascadable<PropertyHolderConstraintMappingContext> {
+
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/PropertyHolderTarget.java

@@ -0,0 +1,33 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Facet of a property holder constraint mapping creational context which allows to specify the
+ * property to which the next operations should be apply.
+ *
+ * @author Marko Bekhta
+ */
+public interface PropertyHolderTarget {
+
+	/**
+	 * Defines a property, that is a property holder itself, to which the next operations shall apply.
+	 * <p>
+	 * Until this method is called constraints apply on property holder level. After calling this method constraints
+	 * apply on the specified property with the given property type.
+	 * </p>
+	 * <p>
+	 * A given property may only be configured once.
+	 * </p>
+	 *
+	 * @param property The property holder on which to apply the following constraints.
+	 *
+	 * @return A creational context representing the selected property.
+	 */
+	PropertyHolderConstraintMappingContext propertyHolder(String property);
+
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/PropertyTarget.java

@@ -0,0 +1,34 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Facet of a property holder constraint mapping creational context which allows to specify the
+ * property to which the next operations should be apply.
+ *
+ * @author Marko Bekhta
+ */
+public interface PropertyTarget {
+
+	/**
+	 * Defines a property to which the next operations shall apply.
+	 * <p>
+	 * Until this method is called constraints apply on property holder level. After calling this method constraints
+	 * apply on the specified property with the given property type.
+	 * </p>
+	 * <p>
+	 * A given property may only be configured once.
+	 * </p>
+	 *
+	 * @param property The property on which to apply the following constraints.
+	 * @param propertyType The type of the specified property.
+	 *
+	 * @return A creational context representing the selected property.
+	 */
+	PropertyConstraintMappingContext property(String property, Class<?> propertyType);
+
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/TypeConstraintMappingContext.java

@@ -0,0 +1,27 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.cfg.propertyholder;
+
+/**
+ * Constraint mapping creational context representing a type. Allows place
+ * class-level constraints on that type, define its default group sequence (and provider)
+ * and to navigate to other constraint targets.
+ *
+ * @author Kevin Pollet &lt;kevin.pollet@serli.com&gt; (C) 2011 SERLI
+ * @author Gunnar Morling
+ */
+public interface TypeConstraintMappingContext extends PropertyTarget, PropertyHolderTarget {
+
+	/**
+	 * Defines the default group sequence for current type.
+	 *
+	 * @param defaultGroupSequence the default group sequence.
+	 *
+	 * @return The current creational context following the method chaining pattern.
+	 */
+	TypeConstraintMappingContext defaultGroupSequence(Class<?>... defaultGroupSequence);
+}

engine/src/main/java/org/hibernate/validator/cfg/propertyholder/package-info.java

@@ -0,0 +1,13 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+
+/**
+ * <p>Contains facet and creational context interfaces forming the API for programmatic constraint
+ * definition for property holders validation.</p>
+ * <p>This package is part of the public Hibernate Validator API.</p>
+ */
+package org.hibernate.validator.cfg.propertyholder;