Skip to content
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

Support programmatically registered constraints on Hibernate entities #200

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Support programmatically registered constraints on Hibernate entities #200

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
10 changes: 10 additions & 0 deletions ...ava/net/croz/nrich/validation/starter/configuration/NrichValidationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@
import net.croz.nrich.validation.constraint.mapping.DefaultConstraintValidatorRegistrar;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer;
import org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer;
import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.AbstractResourceBasedMessageSource;

import jakarta.validation.Validator;
import java.util.List;

@Configuration(proxyBeanMethods = false)
Expand Down Expand Up @@ -66,4 +69,11 @@ ConstraintValidatorRegistrar constraintMappingRegistrar(@Value("${nrich.validati
ValidationConfigurationCustomizer validationConfigurationCustomizer(ConstraintValidatorRegistrar constraintValidatorRegistrar) {
return constraintValidatorRegistrar::registerConstraintValidators;
}

@ConditionalOnBean(Validator.class)
@ConditionalOnProperty(name = "nrich.validation.register-constraint-validators", havingValue = "true", matchIfMissing = true)
@Bean
HibernatePropertiesCustomizer validationHibernatePropertiesCustomizer(Validator validator) {
return hibernateProperties -> hibernateProperties.put("jakarta.persistence.validation.factory", validator);
}
}
15 changes: 11 additions & 4 deletions ...net/croz/nrich/validation/starter/configuration/NrichValidationAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
import net.croz.nrich.validation.api.mapping.ConstraintValidatorRegistrar;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer;
import org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.MessageSource;
import org.springframework.context.support.AbstractResourceBasedMessageSource;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
Expand All @@ -37,11 +39,16 @@ class NrichValidationAutoConfigurationTest {
void shouldConfigureDefaultConfiguration() {
// expect
contextRunner.run(context -> {
assertThat(context).hasSingleBean(NrichValidationAutoConfiguration.ValidationMessageSourceRegistrar.class);
assertThat(context).hasSingleBean(NrichValidationAutoConfiguration.ValidationMessageSourceRegistrar.class);
assertThat(context).hasSingleBean(ConstraintValidatorRegistrar.class);
assertThat(context).hasSingleBean(ValidationConfigurationCustomizer.class);
}
);
assertThat(context).hasSingleBean(ValidationConfigurationCustomizer.class);
});
}

@Test
void shouldRegisterValidationPropertiesCustomizer() {
// expect
contextRunner.withBean(LocalValidatorFactoryBean.class).run(context -> assertThat(context).hasSingleBean(HibernatePropertiesCustomizer.class));
}

@Test
Expand Down
Loading