Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions engine/src/main/java/org/hibernate/validator/internal/engine/AbstractConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 38 additions & 0 deletions .../java/org/hibernate/validator/test/spi/nodenameprovider/PropertyNodeNameProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
}
}
Loading