Skip to content

Commit 51db407

Browse files
jdaughertyjdaugherty
committed
14017 - fix - move domain class to auto configuration to fix dependency load orders
1 parent f64899b commit 51db407

File tree

6 files changed

+118
-27
lines changed

6 files changed

+118
-27
lines changed

‎grails-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersAutoConfiguration.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,16 @@
4444

4545
import grails.config.Settings;
4646
import grails.core.GrailsApplication;
47+
import org.grails.plugins.domain.GrailsDomainClassAutoConfiguration;
4748
import org.grails.web.config.http.GrailsFilters;
4849
import org.grails.web.filters.HiddenHttpMethodFilter;
4950
import org.grails.web.servlet.mvc.GrailsDispatcherServlet;
5051
import org.grails.web.servlet.mvc.GrailsWebRequestFilter;
5152

52-
@AutoConfiguration(before = { HttpEncodingAutoConfiguration.class, WebMvcAutoConfiguration.class })
53+
@AutoConfiguration(
54+
before = {HttpEncodingAutoConfiguration.class, WebMvcAutoConfiguration.class},
55+
after = {GrailsDomainClassAutoConfiguration.class}
56+
)
5357
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
5458
public class ControllersAutoConfiguration {
5559

‎grails-domain-class/build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ dependencies {
3535
api project(':grails-validation')
3636
api 'org.apache.groovy:groovy'
3737

38+
compileOnly project(':grails-i18n')
39+
runtimeOnly project(':grails-i18n')
40+
3841
// Datastore APIs
3942
api project(':grails-datamapping-validation')
4043
api(project(':grails-datamapping-core')) {

‎grails-domain-class/src/main/groovy/org/grails/plugins/domain/DomainClassGrailsPlugin.groovy‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,8 @@
1818
*/
1919
package org.grails.plugins.domain
2020

21-
import grails.core.GrailsApplication
2221
import grails.plugins.Plugin
2322
import grails.util.GrailsUtil
24-
import grails.validation.ConstraintsEvaluator
25-
import org.grails.plugins.domain.support.ConstraintEvaluatorAdapter
26-
import org.grails.plugins.domain.support.DefaultConstraintEvaluatorFactoryBean
27-
import org.grails.plugins.domain.support.DefaultMappingContextFactoryBean
28-
import org.grails.plugins.domain.support.ValidatorRegistryFactoryBean
2923

3024
/**
3125
* Configures the domain classes in the spring context.
@@ -41,22 +35,4 @@ class DomainClassGrailsPlugin extends Plugin {
4135
def version = GrailsUtil.getGrailsVersion()
4236
def dependsOn = [i18n: version]
4337
def loadAfter = ['controllers', 'dataSource']
44-
45-
Closure doWithSpring() {
46-
{ ->
47-
GrailsApplication application = grailsApplication
48-
validateableConstraintsEvaluator(DefaultConstraintEvaluatorFactoryBean) { bean ->
49-
bean.lazyInit = true
50-
}
51-
"${ConstraintsEvaluator.BEAN_NAME}"(ConstraintEvaluatorAdapter, ref('validateableConstraintsEvaluator')) { bean ->
52-
bean.lazyInit = true
53-
}
54-
grailsDomainClassMappingContext(DefaultMappingContextFactoryBean, application, applicationContext) { bean ->
55-
bean.lazyInit = true
56-
}
57-
gormValidatorRegistry(ValidatorRegistryFactoryBean) { bean ->
58-
bean.lazyInit = true
59-
}
60-
}
61-
}
6238
}

‎grails-domain-class/src/main/groovy/org/grails/plugins/domain/GrailsDomainClassAutoConfiguration.groovy‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* https://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.grails.plugins.domain
21+
22+
import grails.core.GrailsApplication
23+
import grails.validation.ConstraintsEvaluator
24+
import groovy.transform.CompileStatic
25+
import org.grails.datastore.gorm.validation.constraints.factory.ConstraintFactory
26+
import org.grails.datastore.mapping.model.MappingContext
27+
import org.grails.plugins.domain.support.ConstraintEvaluatorAdapter
28+
import org.grails.plugins.domain.support.DefaultConstraintEvaluatorFactoryBean
29+
import org.grails.plugins.domain.support.DefaultMappingContextFactoryBean
30+
import org.grails.plugins.domain.support.ValidatorRegistryFactoryBean
31+
import org.grails.plugins.i18n.I18nAutoConfiguration
32+
import org.springframework.beans.factory.annotation.Autowired
33+
import org.springframework.beans.factory.annotation.Qualifier
34+
import org.springframework.boot.autoconfigure.AutoConfiguration
35+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication
36+
import org.springframework.context.ApplicationContext
37+
import org.springframework.context.MessageSource
38+
import org.springframework.context.annotation.Bean
39+
import org.springframework.context.annotation.Lazy
40+
41+
@CompileStatic
42+
// TODO: datasource plugin is supposed to always load after this (currently will because this is a configuration)
43+
@AutoConfiguration(after = [I18nAutoConfiguration])
44+
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
45+
class GrailsDomainClassAutoConfiguration {
46+
47+
@Autowired
48+
GrailsApplication grailsApplication
49+
50+
@Autowired
51+
ApplicationContext applicationContext
52+
53+
@Autowired
54+
List<MessageSource> messageSources
55+
56+
@Lazy
57+
@Bean('grailsDomainClassMappingContext')
58+
DefaultMappingContextFactoryBean grailsDomainClassMappingContext(
59+
List<ConstraintFactory> constraintFactories
60+
) {
61+
def bean = new DefaultMappingContextFactoryBean(grailsApplication, messageSources)
62+
bean.constraintFactories = constraintFactories ?: []
63+
bean
64+
}
65+
66+
@Lazy
67+
@Bean
68+
DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) {
69+
70+
new DefaultConstraintEvaluatorFactoryBean(messageSources, grailsDomainClassMappingContext, grailsApplication)
71+
}
72+
73+
@Lazy
74+
@Bean(name = ConstraintsEvaluator.BEAN_NAME)
75+
ConstraintEvaluatorAdapter constraintsEvaluator(DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator) {
76+
def bean = new ConstraintEvaluatorAdapter(validateableConstraintsEvaluator.getObject())
77+
bean
78+
}
79+
80+
@Lazy
81+
@Bean
82+
ValidatorRegistryFactoryBean gormValidatorRegistry(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) {
83+
def bean = new ValidatorRegistryFactoryBean()
84+
bean.mappingContext = grailsDomainClassMappingContext
85+
bean
86+
}
87+
}

‎grails-domain-class/src/main/groovy/org/grails/plugins/domain/support/DefaultMappingContextFactoryBean.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import org.springframework.core.env.PropertyResolver
3030

3131
import grails.core.GrailsApplication
3232
import grails.core.GrailsClass
33+
import grails.util.GrailsMessageSourceUtils
3334
import org.grails.core.artefact.DomainClassArtefactHandler
3435
import org.grails.datastore.gorm.validation.constraints.factory.ConstraintFactory
3536
import org.grails.datastore.gorm.validation.constraints.registry.DefaultValidatorRegistry
@@ -53,9 +54,9 @@ class DefaultMappingContextFactoryBean implements FactoryBean<MappingContext>, I
5354
protected final ApplicationContext applicationContext
5455
private MappingContext mappingContext
5556

56-
DefaultMappingContextFactoryBean(GrailsApplication grailsApplication, MessageSource messageSource) {
57+
DefaultMappingContextFactoryBean(GrailsApplication grailsApplication, List<MessageSource> messageSources) {
5758
this.configuration = grailsApplication.config
58-
this.messageSource = messageSource
59+
this.messageSource = GrailsMessageSourceUtils.findPreferredMessageSource(messageSources)
5960
this.grailsApplication = grailsApplication
6061
if (messageSource instanceof ApplicationContext) {
6162
this.applicationContext = (ApplicationContext) messageSource

‎grails-domain-class/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
org.grails.plugins.domain.GrailsDomainClassAutoConfiguration

0 commit comments

Comments
 (0)