Merge pull request #1933 from jdaugherty/newMongoMerge

Merge Mongodb & Hibernate5

Author: jamesfredley

.github/workflows/gradle.yml

@@ -6,17 +6,70 @@ on:
   pull_request:
     branches:
       - '[7-9]+.[0-9]+.x'
+permissions:
+  contents: read
+  packages: read
 jobs:
-  build:
-    name: "Build Project"
+  datastore-build:
+    name: "Build Datastore Project"
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 17, 21 ]
+    steps:
+      - name: "📥 Checkout the repository"
+        uses: actions/checkout@v4
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: liberica
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+      - name: "🔨 Run Build"
+        id: build
+        env:
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew cleanTest build --continue -PonlyDatastoreTests
+  mongodb-build:
+    name: "Build Mongodb Project"
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 17, 21 ]
+        mongodb-version: [ '4', '5', '6', '7', '8' ]
+    steps:
+      - name: "📥 Checkout the repository"
+        uses: actions/checkout@v4
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: liberica
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+      - name: "▶️ Start MongoDB (needed for some tests)"
+        uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # v1.12.0 (Use commit sha as this is a 3rd party action)
+        with:
+          mongodb-version: ${{ matrix.mongodb-version }}
+      - name: "🔨 Run Build"
+        id: build
+        env:
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew cleanTest build --continue -PonlyMongodbTests
+  hibernate5-build:
+    name: "Build Hibernate5 Project"
     runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-      packages: read
     strategy:
       fail-fast: false
       matrix:
-        java: [17, 21]
+        java: [ 17, 21 ]
     steps:
       - name: "📥 Checkout the repository"
         uses: actions/checkout@v4
@@ -33,15 +86,12 @@ jobs:
         id: build
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build --continue
+        run: ./gradlew cleanTest build --continue -PonlyHibernate5Tests
   publish:
     if: github.event_name == 'push'
     name: "Publish Snapshot"
-    needs: build
+    needs: [datastore-build, hibernate5-build, mongodb-build]
     runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-      packages: read
     steps:
       - name: "📥 Checkout the repository"
         uses: actions/checkout@v4
@@ -68,8 +118,7 @@ jobs:
     needs: publish
     runs-on: ubuntu-24.04
     permissions:
-      contents: write
-      packages: read
+      contents: write # so gh-pages can be updated
     steps:
       - name: "📥 Checkout the repository"
         uses: actions/checkout@v4
@@ -97,7 +146,7 @@ jobs:
   trigger-build-gorm-impls:
     if: github.event_name == 'push'
     name: "Trigger Build in GORM Implementations"
-    needs: [build, publish]
+    needs: [publish]
     runs-on: ubuntu-24.04
     continue-on-error: true
     steps:
@@ -111,37 +160,11 @@ jobs:
       - name: "📝 Create Snapshot Message for the Workflow Dispatch"
         id: dispatch_message
         run: echo "value={\"message\":\"New Data Mapping Snapshots $(date) - $GITHUB_SHA\"}" >> $GITHUB_OUTPUT
-      - name: "📡 Invoke the Java CI workflow in GORM Hibernate5"
-        uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1.2.4 (Use commit sha as this is a 3rd party action)
-        continue-on-error: true
-        with:
-          workflow: Java CI
-          repo: grails/gorm-hibernate5
-          ref: ${{ steps.extract_branch.outputs.value }}
-          token: ${{ secrets.GH_TOKEN }}
       - name: "📡 Invoke the Java CI workflow in GORM Hibernate6"
         continue-on-error: true
         uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1.2.4 (Use commit sha as this is a 3rd party action)
         with:
           workflow: Java CI
           repo: grails/gorm-hibernate6
           ref: ${{ steps.extract_branch.outputs.value }}
-          token: ${{ secrets.GH_TOKEN }}
-      - name: "📡 Invoke the Java CI workflow in GORM MongoDB"
-        continue-on-error: true
-        uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1.2.4 (Use commit sha as this is a 3rd party action)
-        with:
-          workflow: Java CI
-          repo: grails/gorm-mongodb
-          ref: ${{ steps.extract_branch.outputs.value }}
-          token: ${{ secrets.GH_TOKEN }}
-          inputs: ${{ steps.dispatch_message.outputs.value }}
-      - name: "📡 Invoke the Java CI workflow in GORM Neo4j"
-        if: false # Skip until neo4j is ported to grails 7
-        continue-on-error: true
-        uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1.2.4 (Use commit sha as this is a 3rd party action)
-        with:
-          workflow: Java CI
-          repo: grails/gorm-neo4j
-          ref: ${{ steps.extract_branch.outputs.value }}
           token: ${{ secrets.GH_TOKEN }}

.github/workflows/groovy-joint-workflow.yml

@@ -127,6 +127,10 @@ jobs:
           key: cache-local-maven-${{ github.sha }}
       - name: "🪶 Add mavenLocal repository to build"
         run: sed -i 's|// mavenLocal() // Keep|mavenLocal() // Keep|' build.gradle
+      - name: "▶️ Start MongoDB (needed for some tests)"
+        uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # v1.12.0 (Use commit sha as this is a 3rd party action)
+        with:
+          mongodb-version: '8'
       - name: "🔨 Build and test the project using the locally built Groovy snapshot"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,31 +1,33 @@
+!gradle-wrapper.jar
+*.db
+*.iml
+*.ipr
+*.iws
+*.sha1
 *.swp
-.settings/
+*.zip
+.DS_Store
 .classpath
-.project
+.gradle
+.gradletasknamecache
+.idea
 .metadata
-.DS_Store
+.project
+.settings/
+Servers/
+bin/
 build/
-target/
-.gradle/
-grails-plugins/mongodb/web-app
+classes/
+eclipse-workspace/
+gradle-app.setting
 grails-plugins/checkout
-grails-plugins/redis/web-app
+grails-plugins/mongodb/grails-mongodb-1.0.0.RC5.zip.sha1
+grails-plugins/mongodb/web-app
 grails-plugins/neo4j/web-app
-eclipse-workspace/
-Servers/
+grails-plugins/redis/web-app
 out
-stacktrace.log
-*.iws
-*.iml
-*.ipr
-.idea/*
-classes/*
-bin/
-boot-plugins/*/.idea/*
-grails-plugins/mongodb/grails-mongodb-1.0.0.RC5.zip.sha1
+prodDb.mv.db
+secring.gpg
 spy.log
-*.db
-
-*.sha1
-
-*.zip
+stacktrace.log
+target/

DEVELOPMENT.md

@@ -0,0 +1,10 @@
+# Various properties that control which tests run
+* onlyHibernate5Tests 
+* onlyMongodbTests
+* onlyDatastoreTests
+* skipHibernate5Tests
+* skipMongodbTests
+* skipDatastoreTests
+
+# Start a mongo docker container
+docker run -d  --name mongo-on-docker  -p 27017:27017 mongo

build.gradle

@@ -54,17 +54,33 @@ version = projectVersion
 group = 'this.will.be.overridden'
 
 def publishedProjects = [
+        // datastore
         'grails-datastore-async',
         'grails-datastore-core',
         'grails-datastore-gorm',
         'grails-datastore-gorm-async',
         //'grails-datastore-gorm-rx',
         'grails-datastore-gorm-support',
         'grails-datastore-gorm-tck',
-        'grails-datastore-gorm-test',
+        'grails-datastore-gorm-tck-base',
+        'grails-datastore-gorm-tck-domains',
         'grails-datastore-gorm-validation',
         'grails-datastore-web',
         'grails-gorm-testing-support',
+        // simple
+        'simple-gorm',
+        // hibernate5
+        'hibernate5-boot-plugin',
+        'hibernate5-database-migration',
+        'hibernate5-gorm',
+        'hibernate5-grails-plugin',
+        // mongodb
+        'mongodb-boot-plugin',
+        'mongodb-gorm',
+        'mongodb-gorm-bson',
+        'mongodb-gorm-ext',
+        'mongodb-grails-plugin',
+        'mongodb-views-json-templates'
 ]
 subprojects {
     if (name in publishedProjects) {
@@ -73,4 +89,4 @@ subprojects {
     }
 }
 
-apply from: layout.projectDirectory.file('gradle/documentation-config.gradle')
+apply from: layout.projectDirectory.file('gradle/documentation-config.gradle')

buildSrc/build.gradle

@@ -8,7 +8,7 @@ file('../gradle.properties').withInputStream {
 }
 
 repositories {
-    mavenLocal()
+//    mavenLocal()
     maven { url = 'https://repo.grails.org/grails/core' }
     mavenCentral()
     if (System.getenv('GITHUB_MAVEN_PASSWORD')) {
@@ -25,5 +25,7 @@ repositories {
 dependencies {
     implementation platform("org.grails:grails-bom:${versions.getProperty('grailsVersion')}")
     implementation 'org.grails:grails-gradle-plugin'
-    runtimeOnly 'io.github.gradle-nexus:publish-plugin:2.0.0'
+    implementation 'com.bertramlabs.plugins:asset-pipeline-gradle'
+    implementation 'org.grails.plugins:views-gradle'
+    implementation 'org.springframework.boot:spring-boot-gradle-plugin'
 }

docs/data-mapping-website/src/main/resources/index.html

@@ -82,8 +82,8 @@ <h2 class='icon icon-lab'>Socialize</h2>
                             <div class='navbar-collapse collapse'>
                                 <ul class='nav navbar-nav navbar-right'>
                                     <li class=''><a href='whatsNew/manual/index.html'>What's New?</a></li>                                
-                                    <li class=''><a href='hibernate/manual/index.html'>Documentation</a></li>                                
-                                    <li class=''><a href='hibernate/api/index.html'>Core API</a></li>
+                                    <li class=''><a href='hibernate5/manual/index.html'>Documentation</a></li>
+                                    <li class=''><a href='hibernate5/api/index.html'>Core API</a></li>
                                     <li class=''><a href='developer/manual/index.html'>Developer Guide</a></li>                                    
                                     <li class=''><a href='https://grails.org/support.html'>Support</a></li>
                                     <li>
@@ -114,7 +114,7 @@ <h1>Hibernate</h1>
                                     <p>The original implementation of GORM, GORM for Hibernate provides all the goodness of GORM for SQL databases.
 
                                     </p>
-                                    <p>- <a href="hibernate/manual/index.html">Documentation</a> - <a href="hibernate/api/index.html">API</a> - <a href="https://github.com/grails/gorm-hibernate5">Source</a>
+                                    <p>- <a href="hibernate5/manual/index.html">Documentation</a> - <a href="hibernate5/api/index.html">API</a> - <a href="https://github.com/grails/gorm-hibernate5">Source</a>
 
                                     </p>
                                 </article>

docs/guide-rx/src/main/docs/gettingStarted/CRUD.adoc

@@ -60,7 +60,7 @@ Book.get(id)
     }
 ----
 
-The `switchMap` transforms an `Observable` and converts the result into another `Observable`. However, this is not the most efficient way to perform updates as you can use https://gorm.grails.org/latest/hibernate/manual/index.html#whereQueries[where queries] to update an instance without retrieving it:
+The `switchMap` transforms an `Observable` and converts the result into another `Observable`. However, this is not the most efficient way to perform updates as you can use https://gorm.grails.org/latest/hibernate5/manual/index.html#whereQueries[where queries] to update an instance without retrieving it:
 
 
 [source,groovy]

docs/guide-rx/src/main/docs/querying/dynamicFinders.adoc

@@ -1,5 +1,5 @@
 === Dynamic Finders
-Although _Where queries_ are preferred, _Dynamic finders_ are another option for simple queries and are also very expressive. The https://gorm.grails.org/latest/hibernate/manual/index.html#finders[syntax for Dynamic finders is described in the GORM user guide]. The major difference in RxGORM is that all dynamic finders return an `rx.Observable`:
+Although _Where queries_ are preferred, _Dynamic finders_ are another option for simple queries and are also very expressive. The https://gorm.grails.org/latest/hibernate5/manual/index.html#finders[syntax for Dynamic finders is described in the GORM user guide]. The major difference in RxGORM is that all dynamic finders return an `rx.Observable`:
 
 [source,groovy]
 ----

docs/guide-rx/src/main/docs/querying/index.adoc

@@ -1,10 +1,10 @@
 == Querying
 RxGORM supports all the typical ways of querying that you are used to with GORM including:
 
-* https://gorm.grails.org/latest/hibernate/manual/index.html#finders[Dynamic finders]
-* https://gorm.grails.org/latest/hibernate/manual/index.html#whereQueries[Where queries]
-* https://gorm.grails.org/latest/hibernate/manual/index.html#detachedCriteria[Detached Criteria]
-* https://gorm.grails.org/latest/hibernate/manual/index.html#criteria[Criteria queries]
+* https://gorm.grails.org/latest/hibernate5/manual/index.html#finders[Dynamic finders]
+* https://gorm.grails.org/latest/hibernate5/manual/index.html#whereQueries[Where queries]
+* https://gorm.grails.org/latest/hibernate5/manual/index.html#detachedCriteria[Detached Criteria]
+* https://gorm.grails.org/latest/hibernate5/manual/index.html#criteria[Criteria queries]
 
 The major difference is that all query operations return an `Observable`. In this section we will go through the various ways you can query for GORM objects.