upgraded codenarc and fixed violations

build.gradle

@@ -193,7 +193,7 @@ subprojects { Project subproject ->
     }
 
     codenarc {
-        toolVersion = '1.2.1'
+        toolVersion = '2.1.0'
     }
 
     config {

examples/micronaut-grails-domain-library/grails-app/domain/com/agorapulse/micronaut/grails/domain/Manager.groovy

@@ -31,6 +31,7 @@ import io.micronaut.core.annotation.Introspected
     'GrailsDomainHasEquals',
     'GrailsDomainHasToString',
     'FieldTypeRequired',
+    'NoDef',
 ])
 class Manager {
 

examples/micronaut-grails-domain-library/micronaut-grails-domain-library.gradle

@@ -49,7 +49,7 @@ dependencies {
 
     testCompile project(':micronaut-grails-jpa-generator')
 
-    testCompile 'com.agorapulse.testing:fixt:0.2.1.1'
+    testCompile 'com.agorapulse.testing:fixt:0.2.3'
 
     testCompile 'io.micronaut:micronaut-inject-groovy'
     testCompile 'org.mariadb.jdbc:mariadb-java-client:2.7.3'

examples/micronaut-grails-domain-library/src/test/groovy/com/agorapulse/micronaut/grails/domain/MicronautGeneratorSpec.groovy

@@ -20,6 +20,7 @@ package com.agorapulse.micronaut.grails.domain
 // tag::body[]
 import com.agorapulse.micronaut.grails.jpa.generator.MicronautJpaGenerator
 import com.agorapulse.testing.fixt.Fixt
+import groovy.transform.CompileDynamic
 import io.micronaut.context.ApplicationContext
 import org.grails.datastore.gorm.validation.constraints.eval.DefaultConstraintEvaluator
 import org.grails.orm.hibernate.HibernateDatastore
@@ -29,6 +30,7 @@ import spock.lang.Specification
 /**
  * Example specification generating JPA entities from GORM entities.
  */
+@CompileDynamic
 class MicronautGeneratorSpec extends Specification {
 
     Fixt fixt = Fixt.create(MicronautGeneratorSpec)

examples/micronaut-grails-example/micronaut-grails-example.gradle

@@ -112,7 +112,7 @@ dependencies {
     testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
     testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
 
-    testCompile 'com.agorapulse.testing:fixt:0.2.1.1'
+    testCompile 'com.agorapulse.testing:fixt:0.2.3'
 }
 
 bootRun {

gradle.properties

@@ -34,6 +34,7 @@ dockerApiVersion = 3.2.12
 groovyClosureSupportVersion = 0.6.3
 kordampVersion=0.46.0
 nexusPluginVersion=1.0.0
+grailsTestingSupportVersion=2.1.2
 
 # this should be aligned to Micronaut version
 # required for AWS CBOR marshalling

subprojects/micronaut-grails-integration-test/micronaut-grails-integration-test.gradle

@@ -23,6 +23,6 @@ config {
 
 dependencies {
     api project(':micronaut-grails')
-    api 'org.grails:grails-testing-support:2.1.2'
+    api "org.grails:grails-testing-support:$grailsTestingSupportVersion"
     implementation 'org.opentest4j:opentest4j:1.2.0'
 }

subprojects/micronaut-grails-integration-test/src/main/groovy/com/agorapulse/micronaut/grails/test/MicronautGrailsIntegrationTestMixinTransformation.groovy

@@ -188,7 +188,7 @@ class MicronautGrailsIntegrationTestMixinTransformation implements ASTTransforma
 
         if (servletApi != null) {
 
-            if( GrailsASTUtils.findAnnotation(classNode, SpringBootTest) == null) {
+            if (GrailsASTUtils.findAnnotation(classNode, SpringBootTest) == null) {
                 AnnotationNode webIntegrationTestAnnotation = GrailsASTUtils.addAnnotationOrGetExisting(classNode, SpringBootTest)
                 webIntegrationTestAnnotation.addMember("webEnvironment", propX(classX(SpringBootTest.WebEnvironment), "RANDOM_PORT"))
                 if(classNode.getProperty("serverPort") == null) {
@@ -198,7 +198,7 @@ class MicronautGrailsIntegrationTestMixinTransformation implements ASTTransforma
                     valueAnnotation.setMember("value", new ConstantExpression('${local.server.port}'))
                     serverPortField.addAnnotation(valueAnnotation)
 
-                    classNode.addProperty(new PropertyNode(serverPortField, Modifier.PUBLIC, null, null ))
+                    classNode.addProperty(new PropertyNode(serverPortField, Modifier.PUBLIC, null, null))
                 }
             }
         } else {
@@ -256,4 +256,5 @@ class MicronautGrailsIntegrationTestMixinTransformation implements ASTTransforma
             classNode.addMethod(method)
         }
     }
+
 }

subprojects/micronaut-grails-jpa-generator/src/main/groovy/com/agorapulse/micronaut/grails/jpa/generator/MicronautJdbcGenerator.groovy

@@ -48,4 +48,5 @@ class MicronautJdbcGenerator extends MicronautDataGenerator {
         }
         """.stripIndent().trim()
     }
+
 }

subprojects/micronaut-grails-jpa-generator/src/main/groovy/com/agorapulse/micronaut/grails/jpa/generator/MicronautJpaGenerator.groovy

@@ -56,4 +56,5 @@ class MicronautJpaGenerator extends MicronautDataGenerator {
         }
         """.stripIndent().trim()
     }
+
 }

subprojects/micronaut-grails-web-boot/src/main/groovy/org/grails/compiler/boot/micronaut/BootInitializerClassInjector.groovy

@@ -85,11 +85,11 @@ class BootInitializerClassInjector extends GlobalClassInjectorAdapter {
     @Override
     void performInjectionInternal(SourceUnit source, ClassNode classNode) {
         // if this is a plugin source, then exit
-        if( classNode.getAnnotations(PLUGIN_SOURCE_ANNOTATION) ) {
+        if (classNode.getAnnotations(PLUGIN_SOURCE_ANNOTATION)) {
             return
         }
         // don't generate for plugins
-        if( classNode.getNodeMetaData('isPlugin') ) return
+        if (classNode.getNodeMetaData('isPlugin')) return
 
 
         if(GrailsASTUtils.isAssignableFrom(GRAILS_CONFIGURATION_CLASS_NODE, classNode) && !GrailsASTUtils.isSubclassOfOrImplementsInterface(classNode, GrailsPluginApplication.name)) {
@@ -100,7 +100,7 @@ class BootInitializerClassInjector extends GlobalClassInjectorAdapter {
                     def mainMethodBody = mn.code
                     if(mainMethodBody instanceof BlockStatement) {
                         BlockStatement bs = (BlockStatement)mainMethodBody
-                        if( !bs.statements.isEmpty() ) {
+                        if (!bs.statements.isEmpty()) {
 
                             def methodCallExpression = new MethodCallExpression(
                                 new ClassExpression(ClassHelper.make(System)),
@@ -124,8 +124,8 @@ class BootInitializerClassInjector extends GlobalClassInjectorAdapter {
                     def parameter = new Parameter(springApplicationBuilder, "application")
                     def methodBody = new BlockStatement()
 
-                    methodBody.addStatement( new ExpressionStatement( new MethodCallExpression( new VariableExpression(parameter), "sources", new ClassExpression(classNode))))
-                    loaderClassNode.addMethod( new MethodNode("configure", Modifier.PROTECTED, springApplicationBuilder, [parameter] as Parameter[], [] as ClassNode[], methodBody))
+                    methodBody.addStatement(new ExpressionStatement(new MethodCallExpression(new VariableExpression(parameter), 'sources', new ClassExpression(classNode))))
+                    loaderClassNode.addMethod(new MethodNode("configure", Modifier.PROTECTED, springApplicationBuilder, [parameter] as Parameter[], [] as ClassNode[], methodBody))
                     source.getAST().addClass(
                         loaderClassNode
                     )
@@ -135,4 +135,5 @@ class BootInitializerClassInjector extends GlobalClassInjectorAdapter {
             }
         }
     }
+
 }

subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessorSpec.groovy

@@ -17,6 +17,7 @@
  */
 package com.agorapulse.micronaut.grails
 
+import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import io.micronaut.context.annotation.Factory
 import io.micronaut.context.annotation.Primary
@@ -43,6 +44,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME
 /**
  * Tests for micronaut Spring bean processor.
  */
+@CompileDynamic
 @ContextConfiguration(classes = [GrailsConfig, MicronautGrailsConfiguration])
 @TestPropertySource('classpath:com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessorSpec.properties')
 class GrailsMicronautBeanProcessorSpec extends Specification {
@@ -98,6 +100,7 @@ class GrailsMicronautBeanProcessorSpec extends Specification {
             !translatingEnvironment.containsProperty('redis.host')
             !translatingEnvironment.getProperty('redis.host', String).present
     }
+
 }
 
 // tag::configuration[]
@@ -107,7 +110,7 @@ class GrailsConfig {
 
     @Bean
     MicronautBeanImporter myImporter() {                                                // <2>
-        MicronautBeanImporter.create()
+        return MicronautBeanImporter.create()
             .addByType(Widget)                                                          // <3>
             .addByType('someInterface', SomeInterface)                                  // <4>
             .addByStereotype('custom', SomeCustomScope)                                 // <5>
@@ -124,20 +127,30 @@ class GrailsConfig {
 }
 // end::configuration[]
 
-interface SomeInterface { }
+@CompileStatic
+interface SomeInterface {
+
+}
 
 @Singleton
-class SomeImplementation implements SomeInterface { }
+@CompileStatic
+class SomeImplementation implements SomeInterface {
 
+}
+
+@CompileStatic
 class SomeNamed {
+
     final String name
 
     SomeNamed(String name) {
         this.name = name
     }
+
 }
 
 @Factory
+@CompileStatic
 class SomeNamedFactory {
 
     @io.micronaut.context.annotation.Bean
@@ -158,20 +171,32 @@ class SomeNamedFactory {
 
 @Primary
 @Singleton
-class Widget { }
+@CompileStatic
+class Widget {
+
+}
 
 @Singleton
+@CompileStatic
 @Requires(notEnv = 'test')
-class TestWidget extends Widget { }
+class TestWidget extends Widget {
+
+}
 
-interface Minion { }
+interface Minion {
+
+}
 
 @Documented
 @Retention(RUNTIME)
 @Scope
+@CompileStatic
 @io.micronaut.context.annotation.Bean
-@interface SomeCustomScope { }
+@interface SomeCustomScope {
+
+}
 
+@CompileStatic
 @SomeCustomScope
 class CustomBean {
 
@@ -188,15 +213,25 @@ class CustomBean {
         this.redisPort = redisPort
         this.redisTimeout = redisTimeout
     }
+
 }
 
 @Singleton
+@CompileStatic
 @Named('gadget')
-class SomeGadget { }
+class SomeGadget {
+
+}
 
 @Singleton
+@CompileStatic
 @Named('other')
-class OtherMinion implements Minion { }
+class OtherMinion implements Minion {
+
+}
 
 @Singleton
-class NormalMinion implements Minion { }
+@CompileStatic
+class NormalMinion implements Minion {
+
+}

subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/LegacyGrailsMicronautBeanProcessorSpec.groovy

@@ -17,6 +17,7 @@
  */
 package com.agorapulse.micronaut.grails
 
+import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import io.micronaut.inject.qualifiers.Qualifiers
 import org.springframework.beans.factory.annotation.Autowired
@@ -31,6 +32,7 @@ import spock.lang.Specification
 /**
  * Tests for micronaut Spring bean processor.
  */
+@CompileDynamic
 @ContextConfiguration(classes = [GrailsLegacyConfig])
 @TestPropertySource('classpath:com/agorapulse/micronaut/grails/GrailsMicronautBeanProcessorSpec.properties')
 class LegacyGrailsMicronautBeanProcessorSpec extends Specification {
@@ -67,6 +69,7 @@ class LegacyGrailsMicronautBeanProcessorSpec extends Specification {
             prototypeBean.redisPort == REDIS_PORT
             prototypeBean.redisTimeout == REDIS_TIMEOUT
     }
+
 }
 
 // tag::configuration[]
@@ -76,7 +79,7 @@ class GrailsLegacyConfig {
 
     @Bean
     GrailsMicronautBeanProcessor widgetProcessor() {
-        GrailsMicronautBeanProcessor
+        return GrailsMicronautBeanProcessor
             .builder()
             .addByType(Widget)
             .addByType('someInterface', SomeInterface)

subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/PropertyTranslatingCustomizerSpec.groovy

@@ -17,11 +17,13 @@
  */
 package com.agorapulse.micronaut.grails
 
+import groovy.transform.CompileDynamic
 import spock.lang.Specification
 
 /**
  * Tests for property translating customizer.
  */
+@CompileDynamic
 class PropertyTranslatingCustomizerSpec extends Specification {
 
     void 'custom replacements works'() {
@@ -36,10 +38,10 @@ class PropertyTranslatingCustomizerSpec extends Specification {
                 .build()
 
         then:
-            customizer.getAlternativeNames(null).isEmpty()
-            customizer.getAlternativeNames('').isEmpty()
-            customizer.getAlternativeNames('foo.bar').isEmpty()
-            customizer.getAlternativeNames('foo.gar').isEmpty()
+            customizer.getAlternativeNames(null).empty
+            customizer.getAlternativeNames('').empty
+            customizer.getAlternativeNames('foo.bar').empty
+            customizer.getAlternativeNames('foo.gar').empty
             customizer.getAlternativeNames('foo.baz') == ['bar.baz', 'baz'] as Set<String>
             customizer.getAlternativeNames('baz') == ['foo.baz'] as Set<String>
     }
@@ -49,9 +51,9 @@ class PropertyTranslatingCustomizerSpec extends Specification {
             PropertyTranslatingCustomizer customizer = PropertyTranslatingCustomizer.none()
 
         then:
-            customizer.getAlternativeNames('foo.bar').isEmpty()
-            customizer.getAlternativeNames('foo.baz').isEmpty()
-            customizer.getAlternativeNames('baz').isEmpty()
+            customizer.getAlternativeNames('foo.bar').empty
+            customizer.getAlternativeNames('foo.baz').empty
+            customizer.getAlternativeNames('baz').empty
     }
 
     void 'standard replacements works'() {
@@ -62,7 +64,7 @@ class PropertyTranslatingCustomizerSpec extends Specification {
                 .build()
 
         then:
-            customizer.getAlternativeNames('redis.timeout').isEmpty()
+            customizer.getAlternativeNames('redis.timeout').empty
             customizer.getAlternativeNames('redis.port') == ['grails.redis.port'] as Set<String>
             customizer.getAlternativeNames('micronaut.redis.port') == ['grails.redis.port', 'grails.micronaut.redis.port'] as Set<String>
             customizer.getAlternativeNames('micronaut.server.url') == ['grails.server.url', 'grails.micronaut.server.url'] as Set<String>

subprojects/micronaut-grails/src/test/groovy/com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.groovy

@@ -20,6 +20,7 @@ package com.agorapulse.micronaut.grails
 import com.agorapulse.micronaut.amazon.awssdk.sns.SimpleNotificationService
 import com.agorapulse.micronaut.amazon.awssdk.sns.SimpleNotificationServiceConfiguration
 import com.agorapulse.micronaut.amazon.awssdk.sqs.SimpleQueueService
+import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import io.micronaut.inject.qualifiers.Qualifiers
 import org.springframework.beans.factory.annotation.Autowired
@@ -33,6 +34,7 @@ import spock.lang.Specification
 /**
  * Tests for micronaut Spring bean processor.
  */
+@CompileDynamic
 @ContextConfiguration(classes = [GrailsSimpleNotificationServiceConfig, MicronautGrailsConfiguration])
 @TestPropertySource('classpath:com/agorapulse/micronaut/grails/SimpleNotificationServiceConfigurationSpec.properties')
 class SimpleNotificationServiceConfigurationSpec extends Specification {
@@ -52,6 +54,7 @@ class SimpleNotificationServiceConfigurationSpec extends Specification {
             configuration.android
             configuration.android.arn == ARN
     }
+
 }
 
 @CompileStatic
@@ -60,7 +63,7 @@ class GrailsSimpleNotificationServiceConfig {
 
     @Bean
     MicronautBeanImporter myImporter() {
-        MicronautBeanImporter.create()
+        return MicronautBeanImporter.create()
             .customize(PropertyTranslatingCustomizer
                 .builder()
                 .replacePrefix('aws.sns', 'grails.plugin.awssdk.sns')