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

Jump to bottom

Fix initialization of ValidatedService.validatorFactory #1784

Merged
merged 3 commits into from
Feb 2, 2024
Merged

Fix initialization of ValidatedService.validatorFactory #1784

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6929f2
Fix trait `ValidatedService` (broken `validatorFactory` initialization)
guillermocalvo Jan 31, 2024
66b479d
Annotate instance field initialization with `@CompileDynamic`
guillermocalvo Jan 31, 2024
9cff3db
Drop `@CompileDynamic`; rename instance field to avoid name collision
guillermocalvo Feb 1, 2024
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
8 changes: 4 additions & 4 deletions ...c/main/groovy/org/grails/datastore/gorm/validation/javax/services/ValidatedService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ trait ValidatedService<T> extends Service<T> {
/**
* The validator factory
*/
private ValidatorFactory validatorFactory
private ValidatorFactory validatorFactoryInstance

private Map<Method, ExecutableValidator> executableValidatorMap = new LinkedHashMap<Method, ExecutableValidator>().withDefault {
validatorFactory.getValidator().forExecutables()
Expand All @@ -43,7 +43,7 @@ trait ValidatedService<T> extends Service<T> {
* @return The validator factory for this service
*/
ValidatorFactory getValidatorFactory() {
if(validatorFactory == null) {
if(validatorFactoryInstance == null) {

Configuration configuration
if(datastore != null) {
Expand All @@ -60,9 +60,9 @@ trait ValidatedService<T> extends Service<T> {
if(parameterNameProvider != null) {
configuration = configuration.parameterNameProvider(parameterNameProvider)
}
validatorFactory = configuration.buildValidatorFactory()
validatorFactoryInstance = configuration.buildValidatorFactory()
}
return validatorFactory
return validatorFactoryInstance
}

/**
Expand Down
Loading