matrei commented on code in PR #14953: URL: https://github.com/apache/grails-core/pull/14953#discussion_r2316144974
########## grails-domain-class/src/main/groovy/org/grails/plugins/domain/GrailsDomainClassAutoConfiguration.groovy: ########## @@ -0,0 +1,87 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.grails.plugins.domain + +import grails.core.GrailsApplication +import grails.validation.ConstraintsEvaluator +import groovy.transform.CompileStatic +import org.grails.datastore.gorm.validation.constraints.factory.ConstraintFactory +import org.grails.datastore.mapping.model.MappingContext +import org.grails.plugins.domain.support.ConstraintEvaluatorAdapter +import org.grails.plugins.domain.support.DefaultConstraintEvaluatorFactoryBean +import org.grails.plugins.domain.support.DefaultMappingContextFactoryBean +import org.grails.plugins.domain.support.ValidatorRegistryFactoryBean +import org.grails.plugins.i18n.I18nAutoConfiguration +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Qualifier +import org.springframework.boot.autoconfigure.AutoConfiguration +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication +import org.springframework.context.ApplicationContext +import org.springframework.context.MessageSource +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Lazy + +@CompileStatic +// TODO: datasource plugin is supposed to always load after this (currently will because this is a configuration) +@AutoConfiguration(after = [I18nAutoConfiguration]) +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) +class GrailsDomainClassAutoConfiguration { + + @Autowired + GrailsApplication grailsApplication + + @Autowired + ApplicationContext applicationContext + + @Autowired + List<MessageSource> messageSources + + @Lazy + @Bean('grailsDomainClassMappingContext') + DefaultMappingContextFactoryBean grailsDomainClassMappingContext( + List<ConstraintFactory> constraintFactories + ) { + def bean = new DefaultMappingContextFactoryBean(grailsApplication, messageSources) + bean.constraintFactories = constraintFactories ?: [] + bean + } + + @Lazy + @Bean + DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) { + + new DefaultConstraintEvaluatorFactoryBean(messageSources, grailsDomainClassMappingContext, grailsApplication) + } Review Comment: ```suggestion DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator(@Qualifier('grailsDomainClassMappingContext') MappingContext mappingContext) { new DefaultConstraintEvaluatorFactoryBean(messageSources, mappingContext, grailsApplication) } ``` ########## grails-domain-class/src/main/groovy/org/grails/plugins/domain/GrailsDomainClassAutoConfiguration.groovy: ########## @@ -0,0 +1,87 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.grails.plugins.domain + +import grails.core.GrailsApplication +import grails.validation.ConstraintsEvaluator +import groovy.transform.CompileStatic +import org.grails.datastore.gorm.validation.constraints.factory.ConstraintFactory +import org.grails.datastore.mapping.model.MappingContext +import org.grails.plugins.domain.support.ConstraintEvaluatorAdapter +import org.grails.plugins.domain.support.DefaultConstraintEvaluatorFactoryBean +import org.grails.plugins.domain.support.DefaultMappingContextFactoryBean +import org.grails.plugins.domain.support.ValidatorRegistryFactoryBean +import org.grails.plugins.i18n.I18nAutoConfiguration +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Qualifier +import org.springframework.boot.autoconfigure.AutoConfiguration +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication +import org.springframework.context.ApplicationContext +import org.springframework.context.MessageSource +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Lazy + +@CompileStatic +// TODO: datasource plugin is supposed to always load after this (currently will because this is a configuration) +@AutoConfiguration(after = [I18nAutoConfiguration]) +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) +class GrailsDomainClassAutoConfiguration { + + @Autowired + GrailsApplication grailsApplication + + @Autowired + ApplicationContext applicationContext + + @Autowired + List<MessageSource> messageSources + + @Lazy + @Bean('grailsDomainClassMappingContext') + DefaultMappingContextFactoryBean grailsDomainClassMappingContext( + List<ConstraintFactory> constraintFactories + ) { + def bean = new DefaultMappingContextFactoryBean(grailsApplication, messageSources) + bean.constraintFactories = constraintFactories ?: [] + bean + } + + @Lazy + @Bean + DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) { + + new DefaultConstraintEvaluatorFactoryBean(messageSources, grailsDomainClassMappingContext, grailsApplication) + } + + @Lazy + @Bean(name = ConstraintsEvaluator.BEAN_NAME) + ConstraintEvaluatorAdapter constraintsEvaluator(DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator) { + def bean = new ConstraintEvaluatorAdapter(validateableConstraintsEvaluator.getObject()) + bean + } Review Comment: ```suggestion ConstraintEvaluatorAdapter constraintsEvaluator(DefaultConstraintEvaluatorFactoryBean factory) { new ConstraintEvaluatorAdapter(factory.object) } ``` ########## grails-domain-class/src/main/groovy/org/grails/plugins/domain/GrailsDomainClassAutoConfiguration.groovy: ########## @@ -0,0 +1,87 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.grails.plugins.domain + +import grails.core.GrailsApplication +import grails.validation.ConstraintsEvaluator +import groovy.transform.CompileStatic +import org.grails.datastore.gorm.validation.constraints.factory.ConstraintFactory +import org.grails.datastore.mapping.model.MappingContext +import org.grails.plugins.domain.support.ConstraintEvaluatorAdapter +import org.grails.plugins.domain.support.DefaultConstraintEvaluatorFactoryBean +import org.grails.plugins.domain.support.DefaultMappingContextFactoryBean +import org.grails.plugins.domain.support.ValidatorRegistryFactoryBean +import org.grails.plugins.i18n.I18nAutoConfiguration +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Qualifier +import org.springframework.boot.autoconfigure.AutoConfiguration +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication +import org.springframework.context.ApplicationContext +import org.springframework.context.MessageSource +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Lazy + +@CompileStatic +// TODO: datasource plugin is supposed to always load after this (currently will because this is a configuration) +@AutoConfiguration(after = [I18nAutoConfiguration]) +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) +class GrailsDomainClassAutoConfiguration { + + @Autowired + GrailsApplication grailsApplication + + @Autowired + ApplicationContext applicationContext + + @Autowired + List<MessageSource> messageSources + + @Lazy + @Bean('grailsDomainClassMappingContext') + DefaultMappingContextFactoryBean grailsDomainClassMappingContext( + List<ConstraintFactory> constraintFactories + ) { + def bean = new DefaultMappingContextFactoryBean(grailsApplication, messageSources) + bean.constraintFactories = constraintFactories ?: [] + bean + } Review Comment: ```suggestion @Bean(name = 'grailsDomainClassMappingContext') DefaultMappingContextFactoryBean grailsDomainClassMappingContext(List<ConstraintFactory> factories) { new DefaultMappingContextFactoryBean(grailsApplication, messageSources).tap { constraintFactories = factories ?: [] } } ``` ########## grails-domain-class/src/main/groovy/org/grails/plugins/domain/GrailsDomainClassAutoConfiguration.groovy: ########## @@ -0,0 +1,87 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.grails.plugins.domain + +import grails.core.GrailsApplication +import grails.validation.ConstraintsEvaluator +import groovy.transform.CompileStatic +import org.grails.datastore.gorm.validation.constraints.factory.ConstraintFactory +import org.grails.datastore.mapping.model.MappingContext +import org.grails.plugins.domain.support.ConstraintEvaluatorAdapter +import org.grails.plugins.domain.support.DefaultConstraintEvaluatorFactoryBean +import org.grails.plugins.domain.support.DefaultMappingContextFactoryBean +import org.grails.plugins.domain.support.ValidatorRegistryFactoryBean +import org.grails.plugins.i18n.I18nAutoConfiguration +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Qualifier +import org.springframework.boot.autoconfigure.AutoConfiguration +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication +import org.springframework.context.ApplicationContext +import org.springframework.context.MessageSource +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Lazy + +@CompileStatic +// TODO: datasource plugin is supposed to always load after this (currently will because this is a configuration) +@AutoConfiguration(after = [I18nAutoConfiguration]) +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) +class GrailsDomainClassAutoConfiguration { + + @Autowired + GrailsApplication grailsApplication + + @Autowired + ApplicationContext applicationContext + + @Autowired + List<MessageSource> messageSources + + @Lazy + @Bean('grailsDomainClassMappingContext') + DefaultMappingContextFactoryBean grailsDomainClassMappingContext( + List<ConstraintFactory> constraintFactories + ) { + def bean = new DefaultMappingContextFactoryBean(grailsApplication, messageSources) + bean.constraintFactories = constraintFactories ?: [] + bean + } + + @Lazy + @Bean + DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) { + + new DefaultConstraintEvaluatorFactoryBean(messageSources, grailsDomainClassMappingContext, grailsApplication) + } + + @Lazy + @Bean(name = ConstraintsEvaluator.BEAN_NAME) + ConstraintEvaluatorAdapter constraintsEvaluator(DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator) { + def bean = new ConstraintEvaluatorAdapter(validateableConstraintsEvaluator.getObject()) + bean + } + + @Lazy + @Bean + ValidatorRegistryFactoryBean gormValidatorRegistry(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) { + def bean = new ValidatorRegistryFactoryBean() + bean.mappingContext = grailsDomainClassMappingContext + bean + } Review Comment: ```suggestion ValidatorRegistryFactoryBean gormValidatorRegistry(@Qualifier('grailsDomainClassMappingContext') MappingContext mappingContext) { new ValidatorRegistryFactoryBean().tap { it.mappingContext = mappingContext } } ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
