Merge pull request #15180 from apache/cleanup-post-15150

Author: matrei

grails-datamapping-async/src/main/groovy/grails/gorm/async/AsyncEntity.groovy

@@ -21,6 +21,7 @@ package grails.gorm.async
 
 import groovy.transform.CompileStatic
 import groovy.transform.Generated
+
 import org.grails.datastore.gorm.GormEnhancer
 import org.grails.datastore.gorm.GormEntity
 import org.grails.datastore.gorm.async.GormAsyncStaticApi

grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/schemaless/ImplementsDynamicAttributes.groovy

@@ -18,46 +18,44 @@
  */
 package org.grails.datastore.gorm.schemaless
 
+import java.lang.reflect.Method
+
 import groovy.transform.Generated
+
 import spock.lang.Issue
 import spock.lang.Specification
 
-import java.lang.reflect.Method
-
-
 class DynamicDomainSpec extends Specification {
 
-    @Issue("GDM-769")
-    void "Test a domain with dynamic attributes doesn't try to set readonly properties"() {
+    @Issue('GDM-769')
+    void 'test a domain with dynamic attributes does not try to set readonly properties'() {
         given:
-        DynamicEntity entity = new DynamicEntity()
+        def entity = new DynamicEntity()
 
         when:
-        entity.putAt("foo", 123)
-        entity.putAt("name", "Sally")
+        entity.putAt('foo', 123)
+        entity.putAt('name', 'Sally')
 
         then:
-        entity.foo == "foo"
-        entity.name == "Sally"
-        entity.getAt("foo") == "foo"
-        !entity.attributes().containsKey("name")
+        entity.foo == 'foo'
+        entity.name == 'Sally'
+        entity.getAt('foo') == 'foo'
+        !entity.attributes().containsKey('name')
         entity.attributes().foo == 123
     }
 
-    void "test that all DynamicAttributes trait methods are marked as Generated"() {
-        expect: "all DynamicAttributes methods are marked as Generated on implementation class"
-        DynamicAttributes.getMethods().each { Method traitMethod ->
-            assert DynamicEntity.class.getMethod(traitMethod.name, traitMethod.parameterTypes).isAnnotationPresent(Generated)
+    void 'test that all DynamicAttributes trait methods are marked as Generated'() {
+
+        expect: 'all DynamicAttributes methods are marked as Generated on implementation class'
+        DynamicAttributes.methods.each { Method traitMethod ->
+            assert DynamicEntity.getMethod(traitMethod.name, traitMethod.parameterTypes).isAnnotationPresent(Generated)
         }
     }
 }
 
 class DynamicEntity implements DynamicAttributes {
-
     String name
-
     String getFoo() {
-        "foo"
+        'foo'
     }
-
 }

grails-datamapping-core/src/main/groovy/grails/gorm/MultiTenant.groovy

@@ -21,6 +21,7 @@ package grails.gorm
 
 import groovy.transform.CompileStatic
 import groovy.transform.Generated
+
 import grails.gorm.api.GormAllOperations
 import org.grails.datastore.gorm.GormEnhancer
 import org.grails.datastore.mapping.core.connections.ConnectionSource

grails-datamapping-core/src/main/groovy/grails/gorm/time/TemporalConverter.groovy

@@ -19,12 +19,12 @@
 
 package grails.gorm.time
 
-import groovy.transform.Generated
-
 import java.time.Instant
 import java.time.ZoneId
 import java.time.ZoneOffset
 
+import groovy.transform.Generated
+
 trait TemporalConverter<T> {
 
     abstract Long convert(T value)

grails-datamapping-core/src/main/groovy/grails/gorm/time/ZonedDateTimeConverter.groovy

@@ -33,14 +33,14 @@ import groovy.transform.Generated
 @CompileStatic
 trait ZonedDateTimeConverter implements TemporalConverter<ZonedDateTime> {
 
-    @Generated
     @Override
+    @Generated
     Long convert(ZonedDateTime value) {
         value.toInstant().toEpochMilli()
     }
 
-    @Generated
     @Override
+    @Generated
     ZonedDateTime convert(Long value) {
         ZonedDateTime.ofInstant(Instant.ofEpochMilli(value), systemOffset)
     }

grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/DirtyCheckingTransformer.groovy

@@ -56,6 +56,7 @@ import org.grails.datastore.mapping.reflect.ReflectionUtils
 import static java.lang.reflect.Modifier.PUBLIC
 import static java.lang.reflect.Modifier.isFinal
 import static java.lang.reflect.Modifier.isTransient
+import static org.apache.groovy.ast.tools.AnnotatedNodeUtils.markAsGenerated
 import static org.codehaus.groovy.ast.tools.GeneralUtils.args
 import static org.codehaus.groovy.ast.tools.GeneralUtils.assignS
 import static org.codehaus.groovy.ast.tools.GeneralUtils.block
@@ -72,7 +73,6 @@ import static org.grails.datastore.mapping.reflect.AstUtils.ZERO_PARAMETERS
 import static org.grails.datastore.mapping.reflect.AstUtils.addAnnotationIfNecessary
 import static org.grails.datastore.mapping.reflect.AstUtils.hasAnnotation
 import static org.grails.datastore.mapping.reflect.AstUtils.isDomainClass
-import static org.apache.groovy.ast.tools.AnnotatedNodeUtils.markAsGenerated
 
 /**
  *
@@ -218,7 +218,6 @@ class DirtyCheckingTransformer implements CompilationUnitAware {
                                     null,
                                     GeneralUtils.returnS(GeneralUtils.varX(propertyField))
                             )
-
                             markAsGenerated(classNode, getIdMethod)
                             classNode.addMethod(getIdMethod)
                             getIdMethod.addAnnotation(GormEntityTransformation.JPA_TRANSIENT_ANNOTATION_NODE)

grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/GormEntityTransformation.groovy

@@ -350,7 +350,6 @@ class GormEntityTransformation extends AbstractASTTransformation implements Comp
                                             }
                                             methodBody.addStatement(returnS(createNamedQueryCall))
                                             MethodNode newMethod = new MethodNode(methodName, Modifier.PUBLIC | Modifier.STATIC, queryOperationsClassNode, newParams, null, methodBody)
-
                                             markAsGenerated(thisClassNode, newMethod)
                                             thisClassNode.addMethod(newMethod)
 

grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy

@@ -21,6 +21,7 @@ package org.grails.datastore.gorm
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import groovy.transform.Generated
+
 import jakarta.persistence.Transient
 
 import org.springframework.transaction.TransactionDefinition
@@ -58,8 +59,8 @@ trait GormEntity<D> implements GormValidateable, DirtyCheckable, GormEntityApi<D
      * @param name The property name
      * @return The property value
      */
-    @CompileDynamic
     @Generated
+    @CompileDynamic
     def propertyMissing(String name) {
         GormEnhancer.findInstanceApi(getClass()).propertyMissing(this, name)
     }

grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntityDirtyCheckable.groovy

@@ -19,9 +19,8 @@
 package org.grails.datastore.gorm
 
 import groovy.transform.CompileStatic
+import groovy.transform.Generated
 
-import jakarta.annotation.Generated
-import groovy.transform.Generated as GroovyGenerated
 import org.grails.datastore.mapping.config.Property
 import org.grails.datastore.mapping.dirty.checking.DirtyCheckable
 import org.grails.datastore.mapping.model.PersistentEntity
@@ -39,7 +38,6 @@ trait GormEntityDirtyCheckable extends DirtyCheckable {
 
     @Override
     @Generated
-    @GroovyGenerated
     boolean hasChanged(String propertyName) {
         PersistentEntity entity = currentGormInstanceApi().persistentEntity
 

grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidateable.groovy

@@ -20,6 +20,7 @@ package org.grails.datastore.gorm
 
 import groovy.transform.CompileStatic
 import groovy.transform.Generated
+
 import jakarta.persistence.Transient
 
 import org.springframework.validation.Errors
@@ -38,6 +39,7 @@ trait GormValidateable {
 
     @Transient
     private transient boolean skipValidate = false
+
     /**
      * The validation errors object
      */