Make project compatible with Groovy 3.0.19 (#1754)

matrei · web-flow · commit 3f7b3ccf2af5 · 2023-11-05T11:50:55.000+05:30
* Make project compatible with Groovy 3.0.19

* Revert to still use Groovy v3.0.11
diff --git a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/collection/AbstractPersistentCollection.java b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/collection/AbstractPersistentCollection.java
@@ -266,7 +266,7 @@ public boolean isInitialized() {
         return initialized;
     }
 
-    private void setInitializing(Boolean initializing) {
+    protected void setInitializing(Boolean initializing) {
         this.initializing = initializing;
     }
 
diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/DetachedCriteria.groovy b/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/DetachedCriteria.groovy
@@ -118,7 +118,7 @@ class DetachedCriteria<T> extends AbstractDetachedCriteria<Observable<T>> implem
     Observable<Number> getCount(Map args = Collections.emptyMap(), @DelegatesTo(DetachedCriteria) Closure additionalCriteria = null) {
         Query query = prepareQuery(args, additionalCriteria)
         query.projections().count()
-        return ((RxQuery)query).singleResult(args)
+        return ((RxQuery)query).singleResult(args) as Observable<Number>
     }
 
     /**
diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/AbstractRxDatastoreClient.groovy b/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/AbstractRxDatastoreClient.groovy
@@ -378,7 +378,7 @@ abstract class AbstractRxDatastoreClient<T> implements RxDatastoreClient<T>, RxD
                         }
                     }
                     return identifiers
-                })
+                }) as Observable<List<Serializable>>
             } else {
                 return Observable.just(identifiers)
             }
diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSet.groovy b/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSet.groovy
@@ -81,7 +81,7 @@ class RxPersistentSet extends PersistentSet implements RxPersistentCollection, R
     @Override
     void initialize() {
         if(initializing != null) return
-        initializing = true
+        initializing = Boolean.TRUE
 
         try {
             def observable = toListObservable()
diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/RxQueryUtils.groovy b/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/RxQueryUtils.groovy
@@ -111,7 +111,8 @@ class RxQueryUtils {
                         return Arrays.asList(args)
                     }
                 })
-            }.map { List<Object> result ->
+            }.map { r ->
+                List<Object> result = (List<Object>) r
                 // first result is the entity
                 def entityInstance = result.get(0)
                 if(result.size() > 1) {
diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormEnhancer.groovy b/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormEnhancer.groovy
@@ -23,13 +23,13 @@ import java.util.concurrent.ConcurrentHashMap
 class RxGormEnhancer {
 
     private static final Map<String, Map<String,RxGormStaticApi>> STATIC_APIS = new ConcurrentHashMap<String, Map<String,RxGormStaticApi>>().withDefault { String key ->
-        return new ConcurrentHashMap<String, RxGormStaticApi>()
+        return new ConcurrentHashMap() as Map<String, RxGormStaticApi>
     }
     private static final Map<String, Map<String, RxGormInstanceApi>> INSTANCE_APIS = new ConcurrentHashMap<String, Map<String, RxGormInstanceApi>>().withDefault { String key ->
-        return new ConcurrentHashMap<String, RxGormInstanceApi>()
+        return new ConcurrentHashMap() as Map<String, RxGormInstanceApi>
     }
     private static final Map<String, Map<String, RxGormValidationApi>> VALIDATION_APIS = new ConcurrentHashMap<String, Map<String, RxGormValidationApi>>().withDefault { String key ->
-        return new ConcurrentHashMap<String, RxGormValidationApi>()
+        return new ConcurrentHashMap() as Map<String, RxGormValidationApi>
     }
     private static final Map<Class<? extends RxDatastoreClient>, RxDatastoreClient> DATASTORE_CLIENTS = new ConcurrentHashMap<Class<? extends RxDatastoreClient>, RxDatastoreClient>()
 
diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormStaticApi.groovy b/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormStaticApi.groovy
@@ -148,7 +148,7 @@ class RxGormStaticApi<D> implements RxGormAllOperations<D> {
     Observable<Number> count() {
         def query = datastoreClient.createQuery(entity.javaClass)
         query.projections().count()
-        return ((RxQuery)query).singleResult()
+        return ((RxQuery)query).singleResult() as Observable<Number>
     }
 
     @Override
diff --git a/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultConstraintRegistry.groovy b/grails-datastore-gorm-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/registry/DefaultConstraintRegistry.groovy
@@ -36,10 +36,10 @@ import java.util.concurrent.ConcurrentHashMap
 class DefaultConstraintRegistry implements ConstraintRegistry {
 
     protected Map<String, List<ConstraintFactory>> factoriesByName = new ConcurrentHashMap<String, List<ConstraintFactory>>().withDefault { String name ->
-        return []
+        return [] as List<ConstraintFactory>
     }
     protected Map<Class<? extends Constraint>, List<ConstraintFactory>> factoriesByType = new ConcurrentHashMap<Class<? extends Constraint>, List<ConstraintFactory>>().withDefault { Class<? extends Constraint> type ->
-        return []
+        return [] as List<ConstraintFactory>
     }
 
     protected final MessageSource messageSource
@@ -84,7 +84,7 @@ class DefaultConstraintRegistry implements ConstraintRegistry {
     }
 
     @Override
-    void addConstraint(Class<? extends Constraint> constraintClass, List<Class> targetPropertyTypes = [Object]) {
+    void addConstraint(Class<? extends Constraint> constraintClass, List<Class> targetPropertyTypes = [Object] as List<Class>) {
         addConstraintFactory(new DefaultConstraintFactory(constraintClass, messageSource, targetPropertyTypes))
     }
 
@@ -94,7 +94,7 @@ class DefaultConstraintRegistry implements ConstraintRegistry {
     }
 
     @Override
-    def <T extends Constraint> List<ConstraintFactory<T>> findConstraintFactories(Class<T> constraintType) {
-        return factoriesByType.get(constraintType)
+    <T extends Constraint> List<ConstraintFactory<T>> findConstraintFactories(Class<T> constraintType) {
+        return factoriesByType.get(constraintType) as List<ConstraintFactory<T>>
     }
 }
diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEnhancer.groovy b/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEnhancer.groovy
@@ -63,17 +63,17 @@ class GormEnhancer implements Closeable {
 
     private static final Map<String, Map<String, Closure>> NAMED_QUERIES = new ConcurrentHashMap<>()
 
-    private static final Map<String, Map<String,GormStaticApi>> STATIC_APIS = new ConcurrentHashMap<String, Map<String,GormStaticApi>>().withDefault { String key ->
-        return new ConcurrentHashMap<String, GormStaticApi>()
+    private static final Map<String, Map<String, GormStaticApi>> STATIC_APIS = new ConcurrentHashMap<String, Map<String, GormStaticApi>>().withDefault { String key ->
+        return new ConcurrentHashMap() as Map<String, GormStaticApi>
     }
     private static final Map<String, Map<String, GormInstanceApi>> INSTANCE_APIS = new ConcurrentHashMap<String, Map<String, GormInstanceApi>>().withDefault { String key ->
-        return new ConcurrentHashMap<String, GormInstanceApi>()
+        return new ConcurrentHashMap() as Map<String, GormInstanceApi>
     }
     private static final Map<String, Map<String, GormValidationApi>> VALIDATION_APIS = new ConcurrentHashMap<String, Map<String, GormValidationApi>>().withDefault { String key ->
-        return new ConcurrentHashMap<String, GormValidationApi>()
+        return new ConcurrentHashMap() as Map<String, GormValidationApi>
     }
     private static final Map<String, Map<String, Datastore>> DATASTORES = new ConcurrentHashMap<String, Map<String, Datastore>>().withDefault { String key ->
-        return new ConcurrentHashMap<String, Datastore>()
+        return new ConcurrentHashMap() as Map<String, Datastore>
     }
 
     private static final Map<Class, Datastore> DATASTORES_BY_TYPE = new ConcurrentHashMap<Class, Datastore>()
@@ -580,7 +580,7 @@ class GormEnhancer implements Closeable {
                 Class[] parameterTypes = method.parameterTypes
 
                 if (parameterTypes) {
-                    parameterTypes = parameterTypes.length == 1 ? []: parameterTypes[1..-1]
+                    parameterTypes = (parameterTypes.length == 1 ? [] : parameterTypes[1..-1]) as Class[]
 
                     boolean realMethodExists = doesRealMethodExist(mc, methodName, parameterTypes, false)
 
diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/AutoTimestampEventListener.java b/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/AutoTimestampEventListener.java
@@ -132,6 +132,7 @@ public boolean beforeUpdate(PersistentEntity entity, EntityAccess ea) {
      *
      * @deprecated Use {@link #hasLastUpdated(String)} instead
      */
+    @Deprecated
     protected boolean hasLastUpdated(PersistentEntity entity) {
         return hasLastUpdated(entity.getName());
     }
@@ -145,6 +146,7 @@ protected boolean hasLastUpdated(String n) {
      *
      * @deprecated Use {@link #hasDateCreated(String)} instead
      */
+    @Deprecated
     protected boolean hasDateCreated(PersistentEntity entity) {
         return hasDateCreated(entity.getName());
     }
diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/DomainEventListener.java b/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/DomainEventListener.java
@@ -135,6 +135,7 @@ protected void onPersistenceEvent(final AbstractPersistenceEvent event) {
     /**
      * @deprecated Use {@link #beforeInsert(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.engine.EntityAccess, org.grails.datastore.mapping.engine.event.PreInsertEvent)} instead
      */
+    @Deprecated
     public boolean beforeInsert(final PersistentEntity entity, final EntityAccess ea) {
         return beforeInsert(entity, ea, null);
     }
diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/javax/services/ValidatedService.groovy b/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/javax/services/ValidatedService.groovy
@@ -35,8 +35,8 @@ trait ValidatedService<T> extends Service<T> {
      */
     private ValidatorFactory validatorFactory
 
-    private Map<Method, ExecutableValidator> executableValidatorMap = new LinkedHashMap<Method,ExecutableValidator>().withDefault {
-        getValidatorFactory().getValidator().forExecutables()
+    private Map<Method, ExecutableValidator> executableValidatorMap = new LinkedHashMap<Method, ExecutableValidator>().withDefault {
+        validatorFactory.getValidator().forExecutables()
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public boolean isInitialized() {`
`266`	`266`	`return initialized;`
`267`	`267`	`}`
`268`	`268`
`269`		`- private void setInitializing(Boolean initializing) {`
	`269`	`+ protected void setInitializing(Boolean initializing) {`
`270`	`270`	`this.initializing = initializing;`
`271`	`271`	`}`
`272`	`272`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ class DetachedCriteria<T> extends AbstractDetachedCriteria<Observable<T>> implem`
`118`	`118`	`Observable<Number> getCount(Map args = Collections.emptyMap(), @DelegatesTo(DetachedCriteria) Closure additionalCriteria = null) {`
`119`	`119`	`Query query = prepareQuery(args, additionalCriteria)`
`120`	`120`	`query.projections().count()`
`121`		`- return ((RxQuery)query).singleResult(args)`
	`121`	`+ return ((RxQuery)query).singleResult(args) as Observable<Number>`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ abstract class AbstractRxDatastoreClient<T> implements RxDatastoreClient<T>, RxD`
`378`	`378`	`}`
`379`	`379`	`}`
`380`	`380`	`return identifiers`
`381`		`- })`
	`381`	`+ }) as Observable<List<Serializable>>`
`382`	`382`	`} else {`
`383`	`383`	`return Observable.just(identifiers)`
`384`	`384`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ import java.util.concurrent.ConcurrentHashMap`
`23`	`23`	`class RxGormEnhancer {`
`24`	`24`
`25`	`25`	`private static final Map<String, Map<String,RxGormStaticApi>> STATIC_APIS = new ConcurrentHashMap<String, Map<String,RxGormStaticApi>>().withDefault { String key ->`
`26`		`- return new ConcurrentHashMap<String, RxGormStaticApi>()`
	`26`	`+ return new ConcurrentHashMap() as Map<String, RxGormStaticApi>`
`27`	`27`	`}`
`28`	`28`	`private static final Map<String, Map<String, RxGormInstanceApi>> INSTANCE_APIS = new ConcurrentHashMap<String, Map<String, RxGormInstanceApi>>().withDefault { String key ->`
`29`		`- return new ConcurrentHashMap<String, RxGormInstanceApi>()`
	`29`	`+ return new ConcurrentHashMap() as Map<String, RxGormInstanceApi>`
`30`	`30`	`}`
`31`	`31`	`private static final Map<String, Map<String, RxGormValidationApi>> VALIDATION_APIS = new ConcurrentHashMap<String, Map<String, RxGormValidationApi>>().withDefault { String key ->`
`32`		`- return new ConcurrentHashMap<String, RxGormValidationApi>()`
	`32`	`+ return new ConcurrentHashMap() as Map<String, RxGormValidationApi>`
`33`	`33`	`}`
`34`	`34`	`private static final Map<Class<? extends RxDatastoreClient>, RxDatastoreClient> DATASTORE_CLIENTS = new ConcurrentHashMap<Class<? extends RxDatastoreClient>, RxDatastoreClient>()`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ class RxGormStaticApi<D> implements RxGormAllOperations<D> {`
`148`	`148`	`Observable<Number> count() {`
`149`	`149`	`def query = datastoreClient.createQuery(entity.javaClass)`
`150`	`150`	`query.projections().count()`
`151`		`- return ((RxQuery)query).singleResult()`
	`151`	`+ return ((RxQuery)query).singleResult() as Observable<Number>`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,10 @@ import java.util.concurrent.ConcurrentHashMap`
`36`	`36`	`class DefaultConstraintRegistry implements ConstraintRegistry {`
`37`	`37`
`38`	`38`	`protected Map<String, List<ConstraintFactory>> factoriesByName = new ConcurrentHashMap<String, List<ConstraintFactory>>().withDefault { String name ->`
`39`		`- return []`
	`39`	`+ return [] as List<ConstraintFactory>`
`40`	`40`	`}`
`41`	`41`	`protected Map<Class<? extends Constraint>, List<ConstraintFactory>> factoriesByType = new ConcurrentHashMap<Class<? extends Constraint>, List<ConstraintFactory>>().withDefault { Class<? extends Constraint> type ->`
`42`		`- return []`
	`42`	`+ return [] as List<ConstraintFactory>`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`protected final MessageSource messageSource`
`@@ -84,7 +84,7 @@ class DefaultConstraintRegistry implements ConstraintRegistry {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Override`
`87`		`- void addConstraint(Class<? extends Constraint> constraintClass, List<Class> targetPropertyTypes = [Object]) {`
	`87`	`+ void addConstraint(Class<? extends Constraint> constraintClass, List<Class> targetPropertyTypes = [Object] as List<Class>) {`
`88`	`88`	`addConstraintFactory(new DefaultConstraintFactory(constraintClass, messageSource, targetPropertyTypes))`
`89`	`89`	`}`
`90`	`90`
`@@ -94,7 +94,7 @@ class DefaultConstraintRegistry implements ConstraintRegistry {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`@Override`
`97`		`- def <T extends Constraint> List<ConstraintFactory<T>> findConstraintFactories(Class<T> constraintType) {`
`98`		`- return factoriesByType.get(constraintType)`
	`97`	`+ <T extends Constraint> List<ConstraintFactory<T>> findConstraintFactories(Class<T> constraintType) {`
	`98`	`+ return factoriesByType.get(constraintType) as List<ConstraintFactory<T>>`
`99`	`99`	`}`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ public boolean beforeUpdate(PersistentEntity entity, EntityAccess ea) {`
`132`	`132`	`*`
`133`	`133`	`* @deprecated Use {@link #hasLastUpdated(String)} instead`
`134`	`134`	`*/`
	`135`	`+ @Deprecated`
`135`	`136`	`protected boolean hasLastUpdated(PersistentEntity entity) {`
`136`	`137`	`return hasLastUpdated(entity.getName());`
`137`	`138`	`}`
`@@ -145,6 +146,7 @@ protected boolean hasLastUpdated(String n) {`
`145`	`146`	`*`
`146`	`147`	`* @deprecated Use {@link #hasDateCreated(String)} instead`
`147`	`148`	`*/`
	`149`	`+ @Deprecated`
`148`	`150`	`protected boolean hasDateCreated(PersistentEntity entity) {`
`149`	`151`	`return hasDateCreated(entity.getName());`
`150`	`152`	`}`