Merge branch '7.0.x' into add-graalvm-versions

# Conflicts:
#	grails-bom/build.gradle

Author: jamesfredley

build.gradle

@@ -191,9 +191,26 @@ subprojects { subproject ->
         group = 'org.grails'
     }
 
+    if(isExample) {
+        // Test projects will often include dependencies from grails-core, this file will ensure any dependencies included
+        // will be substituted with projects in this repository instead of pulling upstream
+        configurations.all {
+            resolutionStrategy {
+                dependencySubstitution {
+                    for (def possibleProject  : rootProject.subprojects) {
+                        if(!possibleProject.name.startsWith('grails-test-suite') && !possibleProject.name.contains('grails-test-examples') && possibleProject.name != 'grails-bom') {
+                            def artifactId = mappedArtifactIds[possibleProject.name] ?: possibleProject.name
+                            substitute module("${subproject.name in ['grails-async-plugin', 'grails-events-plugin'] ? 'org.grails.plugins' : 'org.grails'}:${artifactId}") using project(":${possibleProject.name}")
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     ext.pomInfo = {
         delegate.name 'Grails® framework'
-        delegate.description 'Grails Web Application Framework'
+        delegate.description subproject.name == 'grails-testing-support' ? 'Support for writing concise expressive tests for Grails artifacts' : 'Grails Web Application Framework'
         delegate.url 'https://grails.org/'
 
         delegate.licenses {
@@ -210,11 +227,25 @@ subprojects { subproject ->
             delegate.developerConnection 'scm:[email protected]:grails/grails-core.git'
         }
 
-        delegate.developers {
-            delegate.developer {
-                delegate.id 'graemerocher'
-                delegate.name 'Graeme Rocher'
-                delegate.email '[email protected]'
+        if(subproject.name == 'grails-testing-support') {
+            delegate.developers {
+                delegate.developer {
+                    delegate.id 'jeffscottbrown'
+                    delegate.name 'Jeff Brown'
+                }
+                delegate.developer {
+                    delegate.id 'jameskleeh'
+                    delegate.name 'James Kleeh'
+                }
+            }
+        }
+        else {
+            delegate.developers {
+                delegate.developer {
+                    delegate.id 'graemerocher'
+                    delegate.name 'Graeme Rocher'
+                    delegate.email '[email protected]'
+                }
             }
         }
     }
@@ -374,8 +405,6 @@ subprojects { subproject ->
         testImplementation "org.junit.platform:junit-platform-runner"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 
-        compileOnly "com.github.spotbugs:spotbugs-annotations"
-
         if (subproject.name != "grails-docs") {
             // Logging
             api "org.slf4j:slf4j-api"

dependabot/build.gradle

@@ -14,7 +14,6 @@ dependencies {
     api "net.bytebuddy:byte-buddy:${project['byte-buddy.version']}"
     api "commons-codec:commons-codec:${project['commons-codec.version']}"
     api "org.apache.commons:commons-text:${project['commons-text.version']}"
-    api "org.grails.plugins:converters:${project['converters.version']}"
     api "io.methvin:directory-watcher:${project['directory-watcher.version']}"
     api "org.xhtmlrenderer:flying-saucer-pdf-openpdf:${project['flying-saucer-pdf-openpdf.version']}"
     api "org.gebish:geb-spock:${project['geb-spock.version']}"
@@ -36,7 +35,6 @@ dependencies {
     api "org.grails:grails-gdoc-engine:${project['grails-gdoc-engine.version']}"
     api "org.grails:grails-gradle-plugin:${project['grails-gradle-plugin.version']}"
     api "org.grails:grails-gorm-testing-support:${project['grails-testing-support.version']}"
-    api "org.grails:grails-testing-support:${project['grails-testing-support.version']}"
     api "org.grails:grails-web-testing-support:${project['grails-testing-support.version']}"
     api "org.apache.groovy:groovy-bom:${project['groovy.version']}"
     api "org.grails:grails-gsp:${project['gsp.version']}"
@@ -82,7 +80,6 @@ dependencies {
     api "org.grails.profiles:web:${project['profiles-web.version']}"
     api "org.spockframework:spock-core:${project['spock.version']}"
     api "org.spockframework:spock-spring:${project['spock.version']}"
-    api "com.github.spotbugs:spotbugs-annotations:${project['spotbugs-annotations.version']}"
     api "org.springframework.boot:spring-boot-cli:${project['spring-boot.version']}"
     api "org.springframework.boot:spring-boot-gradle-plugin:${project['spring-boot.version']}"
     api "org.springframework:springloaded:${project['springloaded.version']}"

gradle.properties

@@ -15,8 +15,6 @@ plexusComponentApiVersion=1.0-alpha-33
 plexusSecDispatcherVersion=1.4
 plexusSisuInjectVersion=2.6.0
 slf4jVersion=2.0.16
-rxJava1Version=1.3.8
-rxJava2Version=2.2.21
 gparsVersion=1.2.1
 
 org.gradle.caching=true
@@ -32,7 +30,7 @@ preventSnapshotPublish=false
 # https://github.com/grails/grails-gradle-plugin/issues/222
 slf4jPreventExclusion=true
 
-# Generated on Tue Jan 07 15:14:48 EST 2025 by: ./gradlew :grails-bom:syncProps
+# Generated on Thu Jan 16 10:23:54 EST 2025 by: ./gradlew :grails-bom:syncProps
 # Only version value modifications allowed after this point. Do not insert or change version names. 
 ant.version=1.10.15
 asciidoctorj.version=3.0.0
@@ -43,7 +41,6 @@ bootstrap-icons.version=1.11.3
 byte-buddy.version=1.15.5
 commons-codec.version=1.17.1
 commons-text.version=1.12.0
-converters.version=6.0.0-SNAPSHOT
 directory-watcher.version=0.18.0
 flying-saucer-pdf-openpdf.version=9.4.0
 geb-spock.version=7.0
@@ -53,7 +50,6 @@ grails-datastore-gorm-hibernate5.version=9.0.0-SNAPSHOT
 grails-datastore-gorm-mongodb.version=9.0.0-SNAPSHOT
 grails-gdoc-engine.version=1.0.1
 grails-gradle-plugin.version=7.0.0-SNAPSHOT
-grails-testing-support.version=4.0.0-SNAPSHOT
 groovy.version=4.0.24
 gsp.version=7.0.0-SNAPSHOT
 h2.version=2.3.232
@@ -73,8 +69,6 @@ plugins-geb.version=5.0.0-SNAPSHOT
 plugins-hibernate5.version=9.0.0-SNAPSHOT
 plugins-mongodb.version=9.0.0-SNAPSHOT
 plugins-neo4j.version=8.1.0
-plugins-rxjava.version=1.1.1
-plugins-rxjava2.version=2.0.0
 plugins-scaffolding.version=6.0.0-SNAPSHOT
 plugins-views-gradle.version=4.0.0-SNAPSHOT
 plugins-views-json.version=4.0.0-SNAPSHOT
@@ -90,8 +84,10 @@ profiles-rest-api-plugin.version=7.0.1
 profiles-vue.version=7.0.1
 profiles-web.version=7.0.1
 profiles-web-plugin.version=7.0.1
+rxjava.version=1.3.8
+rxjava2.version=2.2.21
+rxjava3.version=3.1.10
 spock.version=2.3-groovy-4.0
-spotbugs-annotations.version=4.8.6
 spring-boot.version=3.4.1
 springloaded.version=1.2.8.RELEASE
 views-json-testing-support.version=4.0.0-SNAPSHOT

grails-async/rxjava/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation platform(project(':grails-bom'))
 
     api project(':grails-async-core')
-    api "io.reactivex:rxjava:$rxJava1Version"
+    api "io.reactivex:rxjava"
 
     implementation 'org.apache.groovy:groovy'
     implementation 'org.slf4j:slf4j-api'

grails-async/rxjava2/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation platform(project(':grails-bom'))
 
     api project(':grails-async-core')
-    api "io.reactivex.rxjava2:rxjava:$rxJava2Version"
+    api "io.reactivex.rxjava2:rxjava"
 
     implementation 'org.apache.groovy:groovy'
     implementation 'org.slf4j:slf4j-api'

grails-async/rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromise.groovy

@@ -41,9 +41,10 @@ class RxPromise<T>  implements Promise<T> {
     protected boolean finished = false
 
     RxPromise(RxPromiseFactory promiseFactory, Closure callable, Scheduler scheduler) {
+
         this(promiseFactory, Single.create( { SingleEmitter<? super T> singleSubscriber ->
             try {
-                singleSubscriber.onSuccess((T)callable.call())
+                singleSubscriber.onSuccess((T)runCallable(callable))
             } catch (Throwable t) {
                 singleSubscriber.onError(t)
             }
@@ -158,4 +159,13 @@ class RxPromise<T>  implements Promise<T> {
             }
         }
     }
+
+    static Object runCallable(Closure callable) {
+        Object rtn = callable.call()
+        if(rtn == null) {
+            return Void
+        } else {
+            return rtn
+        }
+    }
 }

grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy

@@ -54,6 +54,18 @@ class RxPromiseSpec extends Specification {
             result == [one: 1, two: 2, four: 4]
     }
 
+    void 'Test promise null handling'() {
+
+        when: 'a null promise result is created'
+        def promise = Promises.createPromise {
+            return null
+        }
+        def result = promise.get()
+
+        then: 'result is void'
+        result == Void
+    }
+
     void 'Test promise list handling'() {
 
         when: 'a promise list is created from two promises'

grails-async/rxjava3/build.gradle

@@ -0,0 +1,13 @@
+dependencies {
+    implementation platform(project(':grails-bom'))
+
+    api project(':grails-async-core')
+    api "io.reactivex.rxjava3:rxjava"
+
+    implementation 'org.apache.groovy:groovy'
+    implementation 'org.slf4j:slf4j-api'
+
+    testImplementation 'org.spockframework:spock-core'
+
+    testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task
+}

grails-async/rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromise.groovy

@@ -0,0 +1,168 @@
+package org.grails.async.factory.rxjava3
+
+import grails.async.Promise
+import groovy.transform.AutoFinal
+import groovy.transform.CompileStatic
+import groovy.transform.PackageScope
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Observer
+import io.reactivex.rxjava3.core.Scheduler
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.core.SingleEmitter
+import io.reactivex.rxjava3.core.SingleOnSubscribe
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.functions.Function
+import io.reactivex.rxjava3.subjects.ReplaySubject
+import io.reactivex.rxjava3.subjects.Subject
+import org.grails.async.factory.BoundPromise
+
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+
+/**
+ * Promise based on RxJava 3.x
+ *
+ * @since 7.0
+ */
+@AutoFinal
+@CompileStatic
+@PackageScope
+class RxPromise<T>  implements Promise<T> {
+
+    protected final Subject<T> subject
+    protected final RxPromiseFactory promiseFactory
+    protected final Observable<T> observable
+
+    protected Disposable subscription
+    protected boolean finished = false
+
+    RxPromise(RxPromiseFactory promiseFactory, Closure callable, Scheduler scheduler) {
+        this(promiseFactory, Single.create( { SingleEmitter<? super T> singleSubscriber ->
+            try {
+                singleSubscriber.onSuccess((T)runCallable(callable))
+            } catch (Throwable t) {
+                singleSubscriber.onError(t)
+            }
+        } as SingleOnSubscribe<T>)
+                .subscribeOn(scheduler))
+    }
+
+    RxPromise(RxPromiseFactory promiseFactory, Observable single) {
+        this(promiseFactory, single, ReplaySubject.create(1))
+    }
+
+    RxPromise(RxPromiseFactory promiseFactory, Single single) {
+        this(promiseFactory, single, ReplaySubject.create(1))
+    }
+
+    RxPromise(RxPromiseFactory promiseFactory, Single single, Subject subject) {
+        this(promiseFactory, single.toObservable(), subject)
+    }
+
+    RxPromise(RxPromiseFactory promiseFactory, Observable observable, Subject subject) {
+        this.observable = observable
+        this.promiseFactory = promiseFactory
+        observable.subscribe(new Observer<T>() {
+            @Override
+            void onSubscribe(Disposable d) {
+                subscription = d
+            }
+
+            @Override
+            void onNext(T t) {
+                subject.onNext(t)
+            }
+
+            @Override
+            void onError(Throwable e) {
+                subject.onError(e)
+            }
+
+            @Override
+            void onComplete() {
+                finished = true
+            }
+        })
+        this.subject = subject
+    }
+
+    Observable<T> toObservable() {
+        return this.observable
+    }
+
+    @Override
+    Promise<T> accept(T value) {
+        return new BoundPromise<T>(value)
+    }
+
+    @Override
+    Promise<T> onComplete(Closure<T> callable) {
+        def decoratedCallable = promiseFactory.applyDecorators(callable, null)
+        return new RxPromise<T>(promiseFactory, subject.map(decoratedCallable as Function<T, T>))
+    }
+
+    @Override
+    Promise<T> onError(Closure<T> callable) {
+        def decoratedCallable = promiseFactory.applyDecorators(callable, null)
+        return new RxPromise<T>(promiseFactory, subject.doOnError(decoratedCallable as Consumer<Throwable>))
+    }
+
+    @Override
+    Promise<T> then(Closure<T> callable) {
+        return onComplete(callable)
+    }
+
+    @Override
+    boolean cancel(boolean mayInterruptIfRunning) {
+        if(subscription != null) {
+            subscription.dispose()
+            return subscription.isDisposed()
+        }
+        return false
+    }
+
+    @Override
+    boolean isCancelled() {
+        if(subscription == null) {
+            return false
+        }
+        else {
+            return subscription.isDisposed()
+        }
+    }
+
+    @Override
+    boolean isDone() {
+        return finished
+    }
+
+    @Override
+    T get() throws InterruptedException, ExecutionException {
+        return subject.blockingFirst()
+    }
+
+    @Override
+    T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+        try {
+            return subject.timeout(timeout, unit).blockingFirst()
+        } catch (Throwable e) {
+            if(e.cause instanceof TimeoutException) {
+                throw e.cause
+            }
+            else {
+                throw e
+            }
+        }
+    }
+
+    static Object runCallable(Closure callable) {
+        Object rtn = callable.call()
+        if(rtn == null) {
+            return Void
+        } else {
+            return rtn
+        }
+    }
+}