14017 - styling - feedback

Author: jdaugherty

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

@@ -19,16 +19,7 @@
 
 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
@@ -37,6 +28,15 @@ import org.springframework.context.ApplicationContext
 import org.springframework.context.MessageSource
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Lazy
+import grails.core.GrailsApplication
+import grails.validation.ConstraintsEvaluator
+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
 
 @CompileStatic
 // TODO: datasource plugin is supposed to always load after this (currently will because this is a configuration)
@@ -54,34 +54,30 @@ class GrailsDomainClassAutoConfiguration {
     List<MessageSource> messageSources
 
     @Lazy
-    @Bean('grailsDomainClassMappingContext')
-    DefaultMappingContextFactoryBean grailsDomainClassMappingContext(
-            List<ConstraintFactory> constraintFactories
-    ) {
-        def bean = new DefaultMappingContextFactoryBean(grailsApplication, messageSources)
-        bean.constraintFactories = constraintFactories ?: []
-        bean
+    @Bean(name = 'grailsDomainClassMappingContext')
+    DefaultMappingContextFactoryBean grailsDomainClassMappingContext(List<ConstraintFactory> factories) {
+        new DefaultMappingContextFactoryBean(grailsApplication, messageSources).tap {
+            constraintFactories = factories ?: []
+        }
     }
 
     @Lazy
     @Bean
-    DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) {
-
-        new DefaultConstraintEvaluatorFactoryBean(messageSources, grailsDomainClassMappingContext, grailsApplication)
+    DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator(@Qualifier('grailsDomainClassMappingContext') MappingContext mappingContext) {
+        new DefaultConstraintEvaluatorFactoryBean(messageSources, mappingContext, grailsApplication)
     }
 
     @Lazy
     @Bean(name = ConstraintsEvaluator.BEAN_NAME)
     ConstraintEvaluatorAdapter constraintsEvaluator(DefaultConstraintEvaluatorFactoryBean validateableConstraintsEvaluator) {
-        def bean = new ConstraintEvaluatorAdapter(validateableConstraintsEvaluator.getObject())
-        bean
+        new ConstraintEvaluatorAdapter(validateableConstraintsEvaluator.object)
     }
 
     @Lazy
     @Bean
-    ValidatorRegistryFactoryBean gormValidatorRegistry(@Qualifier('grailsDomainClassMappingContext') MappingContext grailsDomainClassMappingContext) {
-        def bean = new ValidatorRegistryFactoryBean()
-        bean.mappingContext = grailsDomainClassMappingContext
-        bean
+    ValidatorRegistryFactoryBean gormValidatorRegistry(@Qualifier('grailsDomainClassMappingContext') MappingContext mappingContext) {
+        new ValidatorRegistryFactoryBean().tap {
+            it.mappingContext = mappingContext
+        }
     }
 }

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

@@ -19,12 +19,12 @@
 
 package org.grails.plugins.web
 
-import org.grails.web.servlet.view.GroovyPageViewResolver
 import org.springframework.beans.BeansException
 import org.springframework.beans.factory.support.BeanDefinitionRegistry
 import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor
 import org.springframework.beans.factory.support.GenericBeanDefinition
 import org.springframework.core.Ordered
+import org.grails.web.servlet.view.GroovyPageViewResolver
 
 /**
  * Registers a jspViewResolver bean definition if one does not already exist.
@@ -39,10 +39,11 @@ class GroovyPagesPostProcessor implements BeanDefinitionRegistryPostProcessor, O
     @Override
     void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
         if (!registry.containsBeanDefinition(JSP_VIEW_RESOLVER_BEAN_NAME)) {
-            GenericBeanDefinition beanDefinition = new GenericBeanDefinition()
-            beanDefinition.beanClass = GroovyPageViewResolver
-            beanDefinition.parentName = 'abstractViewResolver'
-            beanDefinition.lazyInit = true
+            GenericBeanDefinition beanDefinition = new GenericBeanDefinition().tap {
+                beanClass = GroovyPageViewResolver
+                parentName = 'abstractViewResolver'
+                lazyInit = true
+            }
             registry.registerBeanDefinition(JSP_VIEW_RESOLVER_BEAN_NAME, beanDefinition)
         }
     }