HV-2074 Use a custom property node name provider (if available) in the programmatic mapping

Author: marko-bekhta

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

@@ -384,15 +384,10 @@ public MethodValidationConfiguration getMethodValidationConfiguration() {
 
 	@Override
 	public final DefaultConstraintMapping createConstraintMapping() {
-		GetterPropertySelectionStrategy getterPropertySelectionStrategyToUse = null;
-		if ( getterPropertySelectionStrategy == null ) {
-			getterPropertySelectionStrategyToUse = new DefaultGetterPropertySelectionStrategy();
-		}
-		else {
-			getterPropertySelectionStrategyToUse = getterPropertySelectionStrategy;
-		}
-
-		return new DefaultConstraintMapping( new JavaBeanHelper( getterPropertySelectionStrategyToUse, defaultPropertyNodeNameProvider ) );
+		return new DefaultConstraintMapping( new JavaBeanHelper(
+				getterPropertySelectionStrategy == null ? new DefaultGetterPropertySelectionStrategy() : getterPropertySelectionStrategy,
+				validationBootstrapParameters.getPropertyNodeNameProvider() == null ? defaultPropertyNodeNameProvider : validationBootstrapParameters.getPropertyNodeNameProvider()
+		) );
 	}
 
 	@Override

engine/src/test/java/org/hibernate/validator/test/spi/nodenameprovider/PropertyNodeNameProviderTest.java

@@ -4,6 +4,8 @@
  */
 package org.hibernate.validator.test.spi.nodenameprovider;
 
+import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertThat;
+import static org.hibernate.validator.testutil.ConstraintViolationAssert.violationOf;
 import static org.testng.Assert.assertEquals;
 
 import java.lang.annotation.ElementType;
@@ -23,6 +25,9 @@
 import jakarta.validation.constraints.Size;
 
 import org.hibernate.validator.HibernateValidator;
+import org.hibernate.validator.HibernateValidatorConfiguration;
+import org.hibernate.validator.cfg.ConstraintMapping;
+import org.hibernate.validator.cfg.defs.SizeDef;
 import org.hibernate.validator.testutil.TestForIssue;
 
 import org.testng.annotations.BeforeMethod;
@@ -177,6 +182,30 @@ public void hibernateValidatorFallsBackToDefaultPropertyNodeNameProvider() {
 		assertEquals( violation.getPropertyPath().toString(), "brand.name" );
 	}
 
+	@Test
+	public void constraintsDefinedProgrammatically() {
+		HibernateValidatorConfiguration configuration = Validation.byProvider( HibernateValidator.class )
+				.configure()
+				.propertyNodeNameProvider( new AnnotationPropertyNodeNameProvider( PropertyName.class ) );
+		ConstraintMapping constraintMapping = configuration.createConstraintMapping();
+
+		constraintMapping
+				.type( ProgrammaticCar.class )
+				.field( "brand" )
+				.constraint( new SizeDef().min( 5 ).max( 50 ) );
+
+		ValidatorFactory validatorFactory = configuration
+				.addMapping( constraintMapping )
+				.buildValidatorFactory();
+
+		Validator val = validatorFactory.getValidator();
+
+		assertThat( val.validate( new ProgrammaticCar( INVALID_BRAND_NAME ) ) )
+				.containsOnlyViolations( violationOf( Size.class )
+						.withProperty( "car_brand" ) );
+
+	}
+
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target({ ElementType.FIELD, ElementType.METHOD })
 	public @interface PropertyName {
@@ -237,4 +266,13 @@ public Airplane(Engine engine) {
 			this.engine = engine;
 		}
 	}
+
+	private static class ProgrammaticCar {
+		@PropertyName("car_brand")
+		public final String brand;
+
+		ProgrammaticCar(String brand) {
+			this.brand = brand;
+		}
+	}
 }