Skip to content

Commit 6507fc8

Browse files
jdaughertyjdaugherty
committed
14017 - styling - feedback
1 parent 73410db commit 6507fc8

File tree

3 files changed

+46
-45
lines changed

3 files changed

+46
-45
lines changed

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

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,8 @@
1919

2020
package org.grails.plugins.domain
2121

22-
import grails.core.GrailsApplication
23-
import grails.validation.ConstraintsEvaluator
2422
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
23+
3224
import org.springframework.beans.factory.annotation.Autowired
3325
import org.springframework.beans.factory.annotation.Qualifier
3426
import org.springframework.boot.autoconfigure.AutoConfiguration
@@ -38,6 +30,16 @@ import org.springframework.context.MessageSource
3830
import org.springframework.context.annotation.Bean
3931
import org.springframework.context.annotation.Lazy
4032

33+
import grails.core.GrailsApplication
34+
import grails.validation.ConstraintsEvaluator
35+
import org.grails.datastore.gorm.validation.constraints.factory.ConstraintFactory
36+
import org.grails.datastore.mapping.model.MappingContext
37+
import org.grails.plugins.domain.support.ConstraintEvaluatorAdapter
38+
import org.grails.plugins.domain.support.DefaultConstraintEvaluatorFactoryBean
39+
import org.grails.plugins.domain.support.DefaultMappingContextFactoryBean
40+
import org.grails.plugins.domain.support.ValidatorRegistryFactoryBean
41+
import org.grails.plugins.i18n.I18nAutoConfiguration
42+
4143
@CompileStatic
4244
// TODO: datasource plugin is supposed to always load after this (currently will because this is a configuration)
4345
@AutoConfiguration(after = [I18nAutoConfiguration])
@@ -54,34 +56,30 @@ class GrailsDomainClassAutoConfiguration {
5456
List<MessageSource> messageSources
5557

5658
@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
59+
@Bean(name = 'grailsDomainClassMappingContext')
60+
DefaultMappingContextFactoryBean grailsDomainClassMappingContext(List<ConstraintFactory> factories) {
61+
new DefaultMappingContextFactoryBean(grailsApplication, messageSources).tap {
62+
constraintFactories = factories ?: []
63+
}
6464
}
6565

6666
@Lazy
6767
@Bean
68-
DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) {
69-
70-
new DefaultConstraintEvaluatorFactoryBean(messageSources, grailsDomainClassMappingContext, grailsApplication)
68+
DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator(@Qualifier('grailsDomainClassMappingContext') MappingContext mappingContext) {
69+
new DefaultConstraintEvaluatorFactoryBean(messageSources, mappingContext, grailsApplication)
7170
}
7271

7372
@Lazy
7473
@Bean(name = ConstraintsEvaluator.BEAN_NAME)
7574
ConstraintEvaluatorAdapter constraintsEvaluator(DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator) {
76-
def bean = new ConstraintEvaluatorAdapter(validateableConstraintsEvaluator.getObject())
77-
bean
75+
new ConstraintEvaluatorAdapter(validateableConstraintsEvaluator.object)
7876
}
7977

8078
@Lazy
8179
@Bean
82-
ValidatorRegistryFactoryBean gormValidatorRegistry(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) {
83-
def bean = new ValidatorRegistryFactoryBean()
84-
bean.mappingContext = grailsDomainClassMappingContext
85-
bean
80+
ValidatorRegistryFactoryBean gormValidatorRegistry(@Qualifier('grailsDomainClassMappingContext') MappingContext mappingContext) {
81+
new ValidatorRegistryFactoryBean().tap {
82+
it.mappingContext = mappingContext
83+
}
8684
}
8785
}

‎grails-gsp/plugin/src/main/groovy/org/grails/plugins/web/GroovyPagesPostProcessor.groovy

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919

2020
package org.grails.plugins.web
2121

22-
import org.grails.web.servlet.view.GroovyPageViewResolver
2322
import org.springframework.beans.BeansException
2423
import org.springframework.beans.factory.support.BeanDefinitionRegistry
2524
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor
2625
import org.springframework.beans.factory.support.GenericBeanDefinition
2726
import org.springframework.core.Ordered
2827

28+
import org.grails.web.servlet.view.GroovyPageViewResolver
29+
2930
/**
3031
* Registers a jspViewResolver bean definition if one does not already exist.
3132
*/
@@ -39,10 +40,11 @@ class GroovyPagesPostProcessor implements BeanDefinitionRegistryPostProcessor, O
3940
@Override
4041
void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
4142
if (!registry.containsBeanDefinition(JSP_VIEW_RESOLVER_BEAN_NAME)) {
42-
GenericBeanDefinition beanDefinition = new GenericBeanDefinition()
43-
beanDefinition.beanClass = GroovyPageViewResolver
44-
beanDefinition.parentName = 'abstractViewResolver'
45-
beanDefinition.lazyInit = true
43+
GenericBeanDefinition beanDefinition = new GenericBeanDefinition().tap {
44+
beanClass = GroovyPageViewResolver
45+
parentName = 'abstractViewResolver'
46+
lazyInit = true
47+
}
4648
registry.registerBeanDefinition(JSP_VIEW_RESOLVER_BEAN_NAME, beanDefinition)
4749
}
4850
}

‎grails-micronaut/src/main/groovy/org/apache/grails/micronaut/GrailsMicronautGrailsPlugin.groovy

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,26 @@
1919

2020
package org.apache.grails.micronaut
2121

22-
import grails.plugins.GrailsPlugin
23-
import grails.plugins.GrailsPluginManager
24-
import grails.plugins.Plugin
22+
import groovy.transform.CompileStatic
2523
import groovy.util.logging.Slf4j
2624
import io.micronaut.context.ConfigurableApplicationContext
2725
import io.micronaut.context.env.AbstractPropertySourceLoader
28-
import io.micronaut.context.env.Environment
2926
import io.micronaut.context.env.PropertySource
27+
import grails.plugins.GrailsPlugin
28+
import grails.plugins.GrailsPluginManager
29+
import grails.plugins.Plugin
3030

3131
@Slf4j
32+
@CompileStatic
3233
class GrailsMicronautGrailsPlugin extends Plugin {
3334

3435
def grailsVersion = '7.0.0-SNAPSHOT > *'
3536
def title = 'Grails Micronaut Plugin'
3637

3738
@Override
3839
void doWithApplicationContext() {
39-
String[] beanNames = applicationContext.getBeanNamesForType(GrailsPluginManager)
40-
GrailsPluginManager pluginManagerFromContext = beanNames.length ?
40+
def beanNames = applicationContext.getBeanNamesForType(GrailsPluginManager)
41+
def pluginManagerFromContext = beanNames.length ?
4142
applicationContext.getBean(GrailsPluginManager) :
4243
null
4344

@@ -50,23 +51,23 @@ class GrailsMicronautGrailsPlugin extends Plugin {
5051
throw new IllegalStateException('A Micronaut Application Context should exist prior to the loading of the Grails Micronaut plugin.')
5152
}
5253

53-
ConfigurableApplicationContext micronautContext = applicationContext.getBean('micronautApplicationContext', ConfigurableApplicationContext)
54-
Environment micronautEnv = micronautContext.environment
54+
def micronautContext = applicationContext.getBean('micronautApplicationContext', ConfigurableApplicationContext)
55+
def micronautEnv = micronautContext.environment
5556

5657
log.debug('Loading configurations from the plugins to the parent Micronaut context')
57-
GrailsPlugin[] plugins = pluginManager.allPlugins
58-
GrailsPlugin[] pluginsFromContext = pluginManagerFromContext ? pluginManagerFromContext.allPlugins : new GrailsPlugin[]{}
58+
59+
def plugins = pluginManager.allPlugins
60+
def pluginsFromContext = pluginManagerFromContext ? pluginManagerFromContext.allPlugins : new GrailsPlugin[0]
5961
int priority = AbstractPropertySourceLoader.DEFAULT_POSITION
60-
[plugins, pluginsFromContext].each { GrailsPlugin[] pluginsToProcess ->
62+
[plugins, pluginsFromContext].each { pluginsToProcess ->
6163
Arrays.stream(pluginsToProcess)
62-
.filter({ GrailsPlugin plugin -> plugin.propertySource != null })
63-
.forEach({ GrailsPlugin plugin ->
64+
.filter { plugin -> plugin.propertySource != null }
65+
.forEach { plugin ->
6466
log.debug('Loading configurations from {} plugin to the parent Micronaut context', plugin.name)
6567
// If invoking the source as `.source`, the NavigableMapPropertySource will return null, while invoking the getter, it will return the correct value
6668
micronautEnv.addPropertySource(PropertySource.of("grails.plugins.$plugin.name", (Map) plugin.propertySource.getSource(), --priority))
67-
})
69+
}
6870
}
6971
micronautEnv.refresh()
70-
// applicationContext.setParent(parentApplicationContext)
7172
}
7273
}

0 commit comments

Comments
 (0)