From a6e26b2d161a2b379f7202196c004699aeb3b7e3 Mon Sep 17 00:00:00 2001
From: Mattias Reichel <mattias.reichel@gmail.com>
Date: Fri, 8 Dec 2023 11:25:14 +0100
Subject: [PATCH] Groovy 3.0.19 compatible (#791)

* Update Groovy to 3.0.19

* Make project compatible with Groovy 3.0.19
---
 gradle.properties                                               | 2 +-
 .../grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 3903ed49..e4faa029 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ assetPipelineVersion=3.3.4
 gebVersion=2.3
 gormVersion=8.0.2
 grailsGradlePluginVersion=6.1.0
-groovyVersion=3.0.11
+groovyVersion=3.0.19
 h2Version=1.4.200
 hibernate5Version=5.6.15.Final
 hibernateValidatorVersion=6.2.5.Final
diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy b/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy
index 018d8f8b..d4719365 100644
--- a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy
+++ b/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormStaticApi.groovy
@@ -771,7 +771,7 @@ abstract class AbstractHibernateGormStaticApi<D> extends GormStaticApi<D> {
 
     protected List<String> removeNullNames(Map query) {
         List<String> nullNames = []
-        Set<String> allNames = new HashSet<String>(query.keySet())
+        Set<String> allNames = new HashSet<>(query.keySet() as Set<String>)
         for (String name in allNames) {
             if (query[name] == null) {
                 query.remove name