HV-2034 Remove deprecated hibernate.validator.constraint_mapping_contributor

Author: marko-bekhta

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

@@ -76,13 +76,6 @@ public interface BaseHibernateValidatorConfiguration<S extends BaseHibernateVali
 	 */
 	String ALLOW_PARALLEL_METHODS_DEFINE_PARAMETER_CONSTRAINTS = "hibernate.validator.allow_parallel_method_parameter_constraint";
 
-	/**
-	 * @since 5.2
-	 * @deprecated planned for removal. Use hibernate.validator.constraint_mapping_contributors instead.
-	 */
-	@Deprecated
-	String CONSTRAINT_MAPPING_CONTRIBUTOR = "hibernate.validator.constraint_mapping_contributor";
-
 	/**
 	 * Property for configuring constraint mapping contributors, allowing to set up one or more constraint mappings for
 	 * the default validator factory. Accepts a String with the comma separated fully-qualified class names of one or more

engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryConfigurationHelper.java

@@ -112,35 +112,19 @@ static boolean checkPropertiesForBoolean(Map<String, String> properties, String
 	 * Returns a list with {@link ConstraintMappingContributor}s configured via the
 	 * {@link HibernateValidatorConfiguration#CONSTRAINT_MAPPING_CONTRIBUTORS} property.
 	 *
-	 * Also takes into account the deprecated {@link HibernateValidatorConfiguration#CONSTRAINT_MAPPING_CONTRIBUTOR}
-	 * property.
-	 *
 	 * @param properties the properties used to bootstrap the factory
 	 *
 	 * @return a list with property-configured {@link ConstraintMappingContributor}s; May be empty but never {@code null}
 	 */
 	static List<ConstraintMappingContributor> determinePropertyConfiguredConstraintMappingContributors(
 			Map<String, String> properties, ClassLoader externalClassLoader) {
-		@SuppressWarnings("deprecation")
-		String deprecatedPropertyValue = properties.get( HibernateValidatorConfiguration.CONSTRAINT_MAPPING_CONTRIBUTOR );
 		String propertyValue = properties.get( HibernateValidatorConfiguration.CONSTRAINT_MAPPING_CONTRIBUTORS );
 
-		if ( StringHelper.isNullOrEmptyString( deprecatedPropertyValue ) && StringHelper.isNullOrEmptyString( propertyValue ) ) {
+		if ( StringHelper.isNullOrEmptyString( propertyValue ) ) {
 			return Collections.emptyList();
 		}
 
-		StringBuilder assembledPropertyValue = new StringBuilder();
-		if ( !StringHelper.isNullOrEmptyString( deprecatedPropertyValue ) ) {
-			assembledPropertyValue.append( deprecatedPropertyValue );
-		}
-		if ( !StringHelper.isNullOrEmptyString( propertyValue ) ) {
-			if ( assembledPropertyValue.length() > 0 ) {
-				assembledPropertyValue.append( "," );
-			}
-			assembledPropertyValue.append( propertyValue );
-		}
-
-		String[] contributorNames = assembledPropertyValue.toString().split( "," );
+		String[] contributorNames = propertyValue.split( "," );
 		List<ConstraintMappingContributor> contributors = newArrayList( contributorNames.length );
 
 		for ( String contributorName : contributorNames ) {

engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingContributorConfiguredInValidationXmlTest.java

@@ -57,29 +57,6 @@ public void run() {
 		} );
 	}
 
-	@Test
-	@TestForIssue(jiraKey = "HV-1545")
-	public void shouldApplyConstraintMappingsFromContributorsConfiguredInValidationXmlWithDeprecatedProperty() {
-		runWithCustomValidationXml( "deprecated-constraint-mapping-contributor-validation.xml", new Runnable() {
-
-			@Override
-			public void run() {
-				Validator validator = ValidatorUtil.getValidator();
-
-				Set<? extends ConstraintViolation<?>> violations = validator.validate( new Marathon() );
-				assertThat( violations ).containsOnlyViolations(
-						violationOf( NotNull.class ).withProperty( "name" ),
-						violationOf( Min.class ).withProperty( "numberOfHelpers" )
-				);
-
-				violations = validator.validate( new Runner() );
-				assertThat( violations ).containsOnlyViolations(
-						violationOf( AssertTrue.class ).withProperty( "paidEntryFee" )
-				);
-			}
-		} );
-	}
-
 	private void runWithCustomValidationXml(String validationXmlName, Runnable runnable) {
 		new ValidationXmlTestHelper( ConstraintMappingContributorConfiguredInValidationXmlTest.class ).runWithCustomValidationXml( validationXmlName, runnable );
 	}