Merge branch '7.0.x' into 7.0.x-buildSettingsFix-forked-solution-3

Author: codeconsole

build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/SbomPlugin.groovy

@@ -67,7 +67,7 @@ class SbomPlugin implements Plugin<Project> {
             ],
             'BSD-2-Clause': [
                     id : 'BSD-2-Clause',
-                    url: 'https://opensource.org/license/bsd-3-clause/'
+                    url: 'https://opensource.org/license/bsd-2-clause/'
             ],
             'BSD-3-Clause': [
                     id : 'BSD-3-Clause',

gradle.properties

@@ -54,7 +54,7 @@ gradleCycloneDxPluginVersion=2.4.1
 micronautPlatformVersion=4.9.2
 
 # Libraries only specific to test apps, these should not be exposed
-grailsSpringSecurityVersion=7.0.0-SNAPSHOT
+grailsSpringSecurityVersion=7.0.1-SNAPSHOT
 jbossTransactionApiVersion=2.0.0.Final
 # Note: we do not import the micronaut bom in our tests to avoid spring version mismatches
 micronautHttpClientVersion=4.9.9

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

@@ -20,6 +20,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
@@ -37,6 +38,7 @@ trait AsyncEntity<D> extends GormEntity<D> {
     /**
      * @return The async version of the GORM static API
      */
+    @Generated
     static GormAsyncStaticApi<D> getAsync() {
         return new GormAsyncStaticApi(GormEnhancer.findStaticApi(this))
     }

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

@@ -18,37 +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
 
-
 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.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

@@ -20,6 +20,7 @@
 package grails.gorm
 
 import groovy.transform.CompileStatic
+import groovy.transform.Generated
 
 import grails.gorm.api.GormAllOperations
 import org.grails.datastore.gorm.GormEnhancer
@@ -41,6 +42,7 @@ trait MultiTenant<D> extends Entity {
      * @param callable The closure
      * @return The result of the closure
      */
+    @Generated
     static <T> T withTenant(Serializable tenantId, Closure<T> callable) {
         GormEnhancer.findStaticApi(this).withTenant(tenantId, callable)
     }
@@ -51,6 +53,7 @@ trait MultiTenant<D> extends Entity {
      * @param callable The closure
      * @return The result of the closure
      */
+    @Generated
     static <D> GormAllOperations eachTenant(Closure callable) {
         GormEnhancer.findStaticApi(this, ConnectionSource.DEFAULT).eachTenant(callable)
     }
@@ -61,6 +64,7 @@ trait MultiTenant<D> extends Entity {
      * @param tenantId The tenant id
      * @return The operations
      */
+    @Generated
     static <D> GormAllOperations<D> withTenant(Serializable tenantId) {
         (GormAllOperations<D>) GormEnhancer.findStaticApi(this).withTenant(tenantId)
     }

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

@@ -22,6 +22,7 @@ package grails.gorm.time
 import java.time.Instant
 
 import groovy.transform.CompileStatic
+import groovy.transform.Generated
 
 /**
  * A trait to convert a {@link java.time.Instant} to and from a long
@@ -31,10 +32,12 @@ import groovy.transform.CompileStatic
 @CompileStatic
 trait InstantConverter {
 
+    @Generated
     Long convert(Instant value) {
         value.toEpochMilli()
     }
 
+    @Generated
     Instant convert(Long value) {
         Instant.ofEpochMilli(value)
     }

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

@@ -27,6 +27,7 @@ import java.time.ZoneId
 import java.time.ZoneOffset
 
 import groovy.transform.CompileStatic
+import groovy.transform.Generated
 
 /**
  * A trait to convert a {@link LocalDate} to and from a long
@@ -37,12 +38,14 @@ import groovy.transform.CompileStatic
 trait LocalDateConverter extends TemporalConverter<LocalDate> {
 
     @Override
+    @Generated
     Long convert(LocalDate value) {
         LocalDateTime localDateTime = LocalDateTime.of(value, LocalTime.MIN)
         localDateTime.toInstant(ZoneOffset.UTC).toEpochMilli()
     }
 
     @Override
+    @Generated
     LocalDate convert(Long value) {
         Instant instant = Instant.ofEpochMilli(value)
         LocalDateTime.ofInstant(instant, ZoneId.of('UTC')).toLocalDate()

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

@@ -25,6 +25,7 @@ import java.time.ZoneId
 import java.time.ZoneOffset
 
 import groovy.transform.CompileStatic
+import groovy.transform.Generated
 
 /**
  * A trait to convert a {@link java.time.LocalDateTime} to and from a long
@@ -35,11 +36,13 @@ import groovy.transform.CompileStatic
 trait LocalDateTimeConverter implements TemporalConverter<LocalDateTime> {
 
     @Override
+    @Generated
     Long convert(LocalDateTime value) {
         value.toInstant(ZoneOffset.UTC).toEpochMilli()
     }
 
     @Override
+    @Generated
     LocalDateTime convert(Long value) {
         LocalDateTime.ofInstant(Instant.ofEpochMilli(value), ZoneId.of('UTC'))
     }

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

@@ -22,6 +22,7 @@ package grails.gorm.time
 import java.time.LocalTime
 
 import groovy.transform.CompileStatic
+import groovy.transform.Generated
 
 /**
  * A trait to convert a {@link LocalTime} to and from a long
@@ -32,11 +33,13 @@ import groovy.transform.CompileStatic
 trait LocalTimeConverter implements TemporalConverter<LocalTime> {
 
     @Override
+    @Generated
     Long convert(LocalTime value) {
         value.toNanoOfDay()
     }
 
     @Override
+    @Generated
     LocalTime convert(Long value) {
         LocalTime.ofNanoOfDay(value)
     }

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

@@ -23,6 +23,7 @@ import java.time.Instant
 import java.time.OffsetDateTime
 
 import groovy.transform.CompileStatic
+import groovy.transform.Generated
 
 /**
  * A trait to convert a {@link java.time.OffsetDateTime} to and from a long
@@ -33,11 +34,13 @@ import groovy.transform.CompileStatic
 trait OffsetDateTimeConverter implements TemporalConverter<OffsetDateTime> {
 
     @Override
+    @Generated
     Long convert(OffsetDateTime value) {
         value.toInstant().toEpochMilli()
     }
 
     @Override
+    @Generated
     OffsetDateTime convert(Long value) {
         OffsetDateTime.ofInstant(Instant.ofEpochMilli(value), systemOffset)
     }