From 577d1c5bea1d88d446dbc7d48f950bfe3160fb0e Mon Sep 17 00:00:00 2001 From: James Fredley Date: Mon, 16 Sep 2024 15:50:56 -0400 Subject: [PATCH] javax to jakarta, groovy 4, spring framework 6 and spring boot 3 (#581) * javax to jakarta, groovy 4, spring framework 6 and spring boot 3 migrations * Select the Grails messageSource when Micronaut creates a 2nd messageSource bean * fix: Compatible with Gradle 8 * fix: Move parent domain class to src/main/groovy --------- Co-authored-by: Mattias Reichel --- .github/workflows/gradle.yml | 15 +- .github/workflows/groovy-joint-workflow.yml | 120 ++- .github/workflows/release.yml | 10 +- build.gradle | 4 +- buildSrc/build.gradle | 4 +- buildSrc/settings.gradle | 4 + core/build.gradle | 1 + .../ResolvableGroovyTemplateEngine.groovy | 7 +- .../mvc/GenericGroovyTemplateView.groovy | 4 +- .../GenericGroovyTemplateViewResolver.groovy | 4 +- .../grails/views/mvc/SmartViewResolver.groovy | 4 +- .../src/docs/asciidoc/json/pluginSupport.adoc | 2 +- examples/functional-tests-plugin/build.gradle | 2 +- examples/functional-tests/build.gradle | 9 + .../grails-app/views/error.gsp | 4 +- .../tests/TestGmlControllerSpec.groovy | 3 +- .../groovy}/functional/tests/Vehicle.groovy | 0 gradle-plugin/build.gradle | 1 + .../AbstractGroovyTemplateCompileTask.groovy | 75 +- .../AbstractGroovyTemplatePlugin.groovy | 2 +- .../views/gradle/ViewCompileOptions.groovy | 14 +- gradle/buildsrc.libs.versions.toml | 6 +- gradle/dependency-updates.gradle | 30 + gradle/libs.versions.toml | 40 +- gradle/wrapper/gradle-wrapper.jar | Bin 61624 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 34 +- gradlew.bat | 22 +- json/build.gradle | 2 + .../plugin/json/builder/JsonOutput.java | 2 +- .../AbstractJsonViewContainerRenderer.groovy | 3 +- .../json/view/mvc/JsonViewResolver.groovy | 2 +- .../plugin/json/view/test/JsonViewTest.groovy | 12 +- .../json/view/EmbeddedAssociationsSpec.groovy | 176 ++-- .../grails/plugin/json/view/ExpandSpec.groovy | 246 ++++-- .../plugin/json/view/HalEmbeddedSpec.groovy | 552 +++++++++---- .../json/view/IterableRenderSpec.groovy | 4 +- .../json/view/JsonViewHelperSpec.groovy | 754 ++++++++++++------ .../view/JsonViewTemplateResolverSpec.groovy | 4 +- .../plugin/json/view/MapRenderSpec.groovy | 434 ++++++---- .../plugin/json/view/NullRenderingSpec.groovy | 99 +-- .../plugin/json/view/api/JsonApiSpec.groovy | 428 +++++++--- markup/build.gradle | 2 +- .../markup/view/mvc/MarkupViewResolver.groovy | 2 +- 44 files changed, 2094 insertions(+), 1052 deletions(-) rename examples/functional-tests/{grails-app/domain => src/main/groovy}/functional/tests/Vehicle.groovy (100%) create mode 100644 gradle/dependency-updates.gradle diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 20a58c243..1e08044bb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -7,24 +7,21 @@ on: branches: - '[2-9]+.[0-9]+.x' env: - GIT_USER_NAME: puneetbehl - GIT_USER_EMAIL: behlp@unityfoundation.io + GIT_USER_NAME: 'grails-build' + GIT_USER_EMAIL: 'grails-build@users.noreply.github.com' jobs: test_project: runs-on: ubuntu-latest if: github.event_name == 'pull_request' - strategy: - fail-fast: false - matrix: { java: [11, 17] } steps: - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v2 - uses: actions/setup-java@v4 with: distribution: temurin - java-version: ${{ matrix.java }} + java-version: 17 - name: Run Tests if: github.event_name == 'pull_request' id: tests @@ -34,7 +31,7 @@ jobs: GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} with: - arguments: check -Dgeb.env=chromeHeadless + arguments: check -Dgeb.env=chromeHeadless -x test -x integrationTest build_project: runs-on: ubuntu-latest @@ -43,7 +40,7 @@ jobs: - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v2 - uses: actions/setup-java@v4 - with: { java-version: 11, distribution: temurin } + with: { java-version: 17, distribution: temurin } - name: Run Build uses: gradle/actions/setup-gradle@v3 env: @@ -51,7 +48,7 @@ jobs: GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} with: - arguments: build -Dgeb.env=chromeHeadless + arguments: build -Dgeb.env=chromeHeadless -x test -x integrationTest - name: Publish Snapshot artifacts to Artifactory (repo.grails.org) if: success() diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml index 620ec928e..5a943537a 100644 --- a/.github/workflows/groovy-joint-workflow.yml +++ b/.github/workflows/groovy-joint-workflow.yml @@ -1,4 +1,22 @@ -name: "Groovy Joint Validation Build" +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: "Grails Joint Validation Build" +# GROOVY_2_5_X == Grails 4.0.x +# GROOVY_3_0_X == grails master +# Groovy master branch does not map to any due to changed package names. on: push: branches: @@ -9,18 +27,22 @@ on: workflow_dispatch: permissions: contents: read +env: + CI_GROOVY_VERSION: jobs: build_groovy: + strategy: + fail-fast: true runs-on: ubuntu-latest outputs: - groovySnapshotVersion: ${{ steps.groovy_snapshot_version.outputs.value }} + groovyVersion: ${{ steps.groovy-version.outputs.value }} steps: - name: Set up JDK uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Cache local Maven repository & Groovy uses: actions/cache@v4 @@ -29,65 +51,34 @@ jobs: ~/groovy ~/.m2/repository key: cache-local-groovy-maven-${{ github.sha }} - - - name: Checkout project to fetch some versions it uses - uses: actions/checkout@v4 - with: - sparse-checkout-cone-mode: false - sparse-checkout: | - settings.gradle - gradle/libs.versions.toml - - - name: Get version of Gradle Enterprise plugin - id: gradle_enterprise_version - run: | - GE_PLUGIN_VERSION=$(grep -m 1 'id\s*\(\"com.gradle.enterprise\"\|'"'com.gradle.enterprise'"'\)\s*version' settings.gradle | sed -E "s/.*version[[:space:]]*['\"]?([0-9]+\.[0-9]+(\.[0-9]+)?)['\"]?.*/\1/" | tr -d [:space:]) - GE_USER_DATA_PLUGIN_VERSION=$(grep -m 1 'id\s*\(\"com.gradle.common-custom-user-data-gradle-plugin\"\|'"'com.gradle.common-custom-user-data-gradle-plugin'"'\)\s*version' settings.gradle | sed -E "s/.*version[[:space:]]*['\"]?([0-9]+\.[0-9]+(\.[0-9]+)?)['\"]?.*/\1/" | tr -d [:space:]) - echo "Project uses Gradle Enterprise Plugin version: $GE_PLUGIN_VERSION" - echo "Project uses Gradle Common Custom User Data Plugin version: $GE_USER_DATA_PLUGIN_VERSION" - echo "ge_plugin_version=$GE_PLUGIN_VERSION" >> $GITHUB_OUTPUT - echo "ge_user_data_plugin_version=$GE_USER_DATA_PLUGIN_VERSION" >> $GITHUB_OUTPUT - rm settings.gradle - - - name: Select Groovy Branch to checkout - id: groovy_branch - run: | - PROJECT_GROOVY_VERSION=$(grep -m 1 groovy gradle/libs.versions.toml | cut -d\= -f2 | tr -d "[:space:]'\"") - MAJOR_VERSION=$(echo $PROJECT_GROOVY_VERSION | cut -d'.' -f1) - MINOR_VERSION=$(echo $PROJECT_GROOVY_VERSION | cut -d'.' -f2) - BRANCH="GROOVY_${MAJOR_VERSION}_${MINOR_VERSION}_X" - echo "Project uses Groovy $PROJECT_GROOVY_VERSION" - echo "value=$BRANCH" >> $GITHUB_OUTPUT - rm -rf gradle - - - name: Checkout Groovy Snapshot - run: | - BRANCH=${{ steps.groovy_branch.outputs.value }} - echo "Checking out Groovy branch $BRANCH" - cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b $BRANCH --single-branch - - - name: Set Groovy Snapshot version for project build - id: groovy_snapshot_version + - name: Checkout Groovy 4_0_X (Grails 7 and later) + run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_4_0_X --single-branch + - name: Set CI_GROOVY_VERSION for Grails + id: groovy-version run: | cd ../groovy - GROOVY_SNAPSHOT_VERSION=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d "[:space:]") - echo "value=$GROOVY_SNAPSHOT_VERSION" >> $GITHUB_OUTPUT - - - name: Prepare Gradle Enterprise Set-up Configuration - id: ge_conf + echo "CI_GROOVY_VERSION=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_ENV + echo "value=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_OUTPUT + - name: Prepare Develocity Setup 1 + id: develocity_conf_1 run: | echo "VALUE<> $GITHUB_OUTPUT echo "plugins { " >> $GITHUB_OUTPUT - echo " id 'com.gradle.enterprise' version '${{ steps.gradle_enterprise_version.outputs.ge_plugin_version }}'" >> $GITHUB_OUTPUT - echo " id 'com.gradle.common-custom-user-data-gradle-plugin' version '${{ steps.gradle_enterprise_version.outputs.ge_user_data_plugin_version }}'" >> $GITHUB_OUTPUT + echo " id 'com.gradle.enterprise' version '3.15.1'" >> $GITHUB_OUTPUT + echo " id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'" >> $GITHUB_OUTPUT echo "}" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + - name: Prepare Develocity Setup 2 + id: develocity_conf_2 + run: | + echo "VALUE<> $GITHUB_OUTPUT echo "gradleEnterprise {" >> $GITHUB_OUTPUT echo " server = 'https://ge.grails.org'" >> $GITHUB_OUTPUT echo " buildScan {" >> $GITHUB_OUTPUT echo " publishAlways()" >> $GITHUB_OUTPUT echo " publishIfAuthenticated()" >> $GITHUB_OUTPUT - echo " uploadInBackground = false" >> $GITHUB_OUTPUT + echo " uploadInBackground = System.getenv('CI') == null" >> $GITHUB_OUTPUT echo " capture {" >> $GITHUB_OUTPUT echo " taskInputFiles = true" >> $GITHUB_OUTPUT echo " }" >> $GITHUB_OUTPUT @@ -95,9 +86,9 @@ jobs: echo "}" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT echo "buildCache {" >> $GITHUB_OUTPUT - echo " local { enabled = false }" >> $GITHUB_OUTPUT + echo " local { enabled = System.getenv('CI') != 'true' }" >> $GITHUB_OUTPUT echo " remote(HttpBuildCache) {" >> $GITHUB_OUTPUT - echo " push = true" >> $GITHUB_OUTPUT + echo " push = System.getenv('CI') == 'true'" >> $GITHUB_OUTPUT echo " enabled = true" >> $GITHUB_OUTPUT echo " url = 'https://ge.grails.org/cache/'" >> $GITHUB_OUTPUT echo " credentials {" >> $GITHUB_OUTPUT @@ -108,17 +99,19 @@ jobs: echo "}" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - - - name: Gradle Enterprise Set-up + - name: Develocity Set-up run: | cd ../groovy - # Delete exiting plugins and build-scan from settings.gradle file - sed -i '21,31d' settings.gradle - # Add Gradle Enterprise set-up related configuration after line no 20 in settings.gradle - echo "${{ steps.ge_conf.outputs.value }}" | sed -i -e "20r /dev/stdin" settings.gradle - + # Delete existing plugins from settings.gradle file + sed -i '32,37d' settings.gradle + # Add Gradle Enterprise set-up related configuration after line no 31 in settings.gradle + echo "${{ steps.develocity_conf_1.outputs.value }}" | sed -i -e "31r /dev/stdin" settings.gradle + # Delete existing buildCache configuration from gradle/build-scans.gradle file + sed -i '23,46d' gradle/build-scans.gradle + # Add Gradle Enterprise set-up related configuration after line no 22 in gradle/build-scans.gradle + echo "${{ steps.develocity_conf_2.outputs.value }}" | sed -i -e "22r /dev/stdin" gradle/build-scans.gradle - name: Build and install groovy (no docs) - uses: gradle/actions/setup-gradle@v3 + uses: gradle/gradle-build-action@v3 env: GRADLE_SCANS_ACCEPT: yes GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} @@ -137,17 +130,16 @@ jobs: build_project: needs: [build_groovy] + strategy: + fail-fast: true runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Set up JDK uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 - + java-version: 17 - name: Cache local Maven repository & Groovy uses: actions/cache@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ffb2e1f5a..31f4a827a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,14 +8,14 @@ jobs: release_version: ${{ steps.release_version.outputs.value }} runs-on: ubuntu-latest env: - GIT_USER_NAME: puneetbehl - GIT_USER_EMAIL: behlp@unityfoundation.io + GIT_USER_NAME: 'grails-build' + GIT_USER_EMAIL: 'grails-build@users.noreply.github.com' steps: - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v2 - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: temurin - name: Get the current release version id: release_version @@ -106,8 +106,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: '11' + distribution: 'temurin' + java-version: '17' - name: Generate Documentation if: success() uses: gradle/actions/setup-gradle@v3 diff --git a/build.gradle b/build.gradle index d8a4745ac..bf85877e8 100644 --- a/build.gradle +++ b/build.gradle @@ -94,4 +94,6 @@ if (isReleaseVersion) { // Do not generate extra load on Nexus with new staging repository if signing fails tasks.withType(InitializeNexusStagingRepository).configureEach { shouldRunAfter = tasks.withType(Sign) -} \ No newline at end of file +} + +apply from: rootProject.layout.projectDirectory.file('gradle/dependency-updates.gradle') diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 998d89904..1b74d2a10 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -17,4 +17,6 @@ dependencies { runtimeOnly buildsrcLibs.grails.gradle.plugin runtimeOnly buildsrcLibs.grails.views.gradle.plugin runtimeOnly buildsrcLibs.groovydoc.gradle.plugin -} \ No newline at end of file +} + +apply from: rootProject.layout.projectDirectory.file('../gradle/dependency-updates.gradle') diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index 6cd9ab179..80738597b 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -3,5 +3,9 @@ dependencyResolutionManagement { buildsrcLibs { from(files('../gradle/buildsrc.libs.versions.toml')) } + + libs { + from(files('../gradle/libs.versions.toml')) + } } } \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle index 9540a3a89..b8c0e998f 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -18,6 +18,7 @@ dependencies { api libs.spring.context // MessageSource is used in public API implementation libs.grails.bootstrap + implementation libs.grails.core implementation libs.grails.datastore.gorm.support implementation libs.slf4j.api implementation libs.spring.beans diff --git a/core/src/main/groovy/grails/views/ResolvableGroovyTemplateEngine.groovy b/core/src/main/groovy/grails/views/ResolvableGroovyTemplateEngine.groovy index 2b7f9dddf..97a85de4f 100644 --- a/core/src/main/groovy/grails/views/ResolvableGroovyTemplateEngine.groovy +++ b/core/src/main/groovy/grails/views/ResolvableGroovyTemplateEngine.groovy @@ -5,6 +5,7 @@ import com.github.benmanes.caffeine.cache.Caffeine import grails.core.support.proxy.DefaultProxyHandler import grails.core.support.proxy.ProxyHandler import grails.util.Environment +import grails.util.GrailsMessageSourceUtils import grails.util.GrailsStringUtils import grails.views.api.GrailsView import grails.views.compiler.ViewsTransform @@ -152,10 +153,14 @@ abstract class ResolvableGroovyTemplateEngine extends TemplateEngine { } @Autowired(required = false) + void setMessageSource(List messageSources) { + setMessageSource(GrailsMessageSourceUtils.findPreferredMessageSource(messageSources)) + } + void setMessageSource(MessageSource messageSource) { this.messageSource = messageSource } - + @Autowired(required = false) void setMimeUtility(MimeUtility mimeUtility) { this.mimeUtility = mimeUtility diff --git a/core/src/main/groovy/grails/views/mvc/GenericGroovyTemplateView.groovy b/core/src/main/groovy/grails/views/mvc/GenericGroovyTemplateView.groovy index 129cc03c7..731acf69f 100644 --- a/core/src/main/groovy/grails/views/mvc/GenericGroovyTemplateView.groovy +++ b/core/src/main/groovy/grails/views/mvc/GenericGroovyTemplateView.groovy @@ -18,8 +18,8 @@ import org.springframework.http.HttpStatus import org.springframework.web.servlet.LocaleResolver import org.springframework.web.servlet.view.AbstractUrlBasedView -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse /** * An implementation of the Spring AbstractUrlBaseView class for ResolvableGroovyTemplateEngine diff --git a/core/src/main/groovy/grails/views/mvc/GenericGroovyTemplateViewResolver.groovy b/core/src/main/groovy/grails/views/mvc/GenericGroovyTemplateViewResolver.groovy index 265a3e39f..1f3b5bed8 100644 --- a/core/src/main/groovy/grails/views/mvc/GenericGroovyTemplateViewResolver.groovy +++ b/core/src/main/groovy/grails/views/mvc/GenericGroovyTemplateViewResolver.groovy @@ -5,8 +5,8 @@ import org.grails.web.servlet.mvc.GrailsWebRequest import org.springframework.web.servlet.View import org.springframework.web.servlet.ViewResolver -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse /** * A UrlBasedViewResolver for ResolvableGroovyTemplateEngine diff --git a/core/src/main/groovy/grails/views/mvc/SmartViewResolver.groovy b/core/src/main/groovy/grails/views/mvc/SmartViewResolver.groovy index 951ed0d65..4df22ce72 100644 --- a/core/src/main/groovy/grails/views/mvc/SmartViewResolver.groovy +++ b/core/src/main/groovy/grails/views/mvc/SmartViewResolver.groovy @@ -32,8 +32,8 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.web.servlet.LocaleResolver import org.springframework.web.servlet.View -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse /** * Spring's default view resolving mechanism only accepts the view name and locale, this forces you to code around its limitations when you want to add intelligent features such as * version and mime type awareness. diff --git a/docs/src/docs/asciidoc/json/pluginSupport.adoc b/docs/src/docs/asciidoc/json/pluginSupport.adoc index 2df64540c..67f79f64e 100644 --- a/docs/src/docs/asciidoc/json/pluginSupport.adoc +++ b/docs/src/docs/asciidoc/json/pluginSupport.adoc @@ -36,7 +36,7 @@ repositories { dependencies { compile "org.grails.plugins:views-json:{version}" compileOnly "org.grails:grails-plugin-rest:3.1.7" - compileOnly "javax.servlet:javax.servlet-api:4.0.1" + compileOnly "jakarta.servlet:jakarta.servlet-api:6.0.0" } task( compileViews, type:JsonViewCompilerTask ) { diff --git a/examples/functional-tests-plugin/build.gradle b/examples/functional-tests-plugin/build.gradle index a8980af4b..9eb70e048 100644 --- a/examples/functional-tests-plugin/build.gradle +++ b/examples/functional-tests-plugin/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-library' id 'org.grails.grails-plugin' - id 'org.grails.plugins.views-json' + //id 'org.grails.plugins.views-json' } group = 'functional.tests.plugin' diff --git a/examples/functional-tests/build.gradle b/examples/functional-tests/build.gradle index ca15003a1..c60a96bf4 100644 --- a/examples/functional-tests/build.gradle +++ b/examples/functional-tests/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-autoconfigure' implementation 'org.springframework.boot:spring-boot-starter-logging' implementation 'org.springframework.boot:spring-boot-starter-tomcat' + implementation libs.jakarta.servlet.api runtimeOnly 'com.h2database:h2' runtimeOnly 'org.apache.tomcat:tomcat-jdbc' @@ -54,4 +55,12 @@ assets { java { sourceCompatibility = JavaVersion.toVersion(libs.versions.java.baseline.get()) +} + +distTar { + duplicatesStrategy = DuplicatesStrategy.INCLUDE +} + +distZip { + duplicatesStrategy = DuplicatesStrategy.INCLUDE } \ No newline at end of file diff --git a/examples/functional-tests/grails-app/views/error.gsp b/examples/functional-tests/grails-app/views/error.gsp index 9a3bb8aa3..a2c4235ab 100644 --- a/examples/functional-tests/grails-app/views/error.gsp +++ b/examples/functional-tests/grails-app/views/error.gsp @@ -10,8 +10,8 @@ - - + +
    diff --git a/examples/functional-tests/src/integration-test/groovy/functional/tests/TestGmlControllerSpec.groovy b/examples/functional-tests/src/integration-test/groovy/functional/tests/TestGmlControllerSpec.groovy index b83c08341..302c8b15e 100644 --- a/examples/functional-tests/src/integration-test/groovy/functional/tests/TestGmlControllerSpec.groovy +++ b/examples/functional-tests/src/integration-test/groovy/functional/tests/TestGmlControllerSpec.groovy @@ -2,7 +2,8 @@ package functional.tests import grails.testing.mixin.integration.Integration import grails.testing.spock.RunOnce -import groovy.util.slurpersupport.GPathResult +import groovy.xml.XmlSlurper +import groovy.xml.slurpersupport.GPathResult import io.micronaut.http.HttpRequest import io.micronaut.http.HttpResponse import org.junit.jupiter.api.BeforeEach diff --git a/examples/functional-tests/grails-app/domain/functional/tests/Vehicle.groovy b/examples/functional-tests/src/main/groovy/functional/tests/Vehicle.groovy similarity index 100% rename from examples/functional-tests/grails-app/domain/functional/tests/Vehicle.groovy rename to examples/functional-tests/src/main/groovy/functional/tests/Vehicle.groovy diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle index 6995192bf..175f28375 100644 --- a/gradle-plugin/build.gradle +++ b/gradle-plugin/build.gradle @@ -18,6 +18,7 @@ dependencies { } implementation libs.grails.gradle.plugin implementation libs.spring.boot.gradle.plugin + implementation libs.jakarta.annotation.api compileOnly libs.groovy.core // @CompileStatic } diff --git a/gradle-plugin/src/main/groovy/grails/views/gradle/AbstractGroovyTemplateCompileTask.groovy b/gradle-plugin/src/main/groovy/grails/views/gradle/AbstractGroovyTemplateCompileTask.groovy index 1504001c4..32e35f6c8 100644 --- a/gradle-plugin/src/main/groovy/grails/views/gradle/AbstractGroovyTemplateCompileTask.groovy +++ b/gradle-plugin/src/main/groovy/grails/views/gradle/AbstractGroovyTemplateCompileTask.groovy @@ -3,16 +3,22 @@ package grails.views.gradle import groovy.transform.CompileDynamic import groovy.transform.CompileStatic import org.gradle.api.Action +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.model.ObjectFactory +import org.gradle.api.provider.Property import org.gradle.api.tasks.Input import org.gradle.api.tasks.InputDirectory import org.gradle.api.tasks.Nested import org.gradle.api.tasks.Optional +import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.process.ExecResult import org.gradle.process.JavaExecSpec import org.gradle.work.InputChanges +import javax.inject.Inject + /** * Abstract Gradle task for compiling templates, using GenericGroovyTemplateCompiler * @@ -24,25 +30,28 @@ abstract class AbstractGroovyTemplateCompileTask extends AbstractCompile { @Input @Optional - String packageName + final Property packageName @InputDirectory - File srcDir + final DirectoryProperty srcDir @Nested - ViewCompileOptions compileOptions = new ViewCompileOptions() + final ViewCompileOptions compileOptions + + @Inject + AbstractGroovyTemplateCompileTask(ObjectFactory objectFactory) { + packageName = objectFactory.property(String) + srcDir = objectFactory.directoryProperty() + compileOptions = new ViewCompileOptions(objectFactory) + } @Override void setSource(Object source) { - try { - srcDir = project.file(source) - if(srcDir.exists() && !srcDir.isDirectory()) { - throw new IllegalArgumentException("The source for GSP compilation must be a single directory, but was $source") - } - super.setSource(source) - } catch (e) { + srcDir.set(project.layout.projectDirectory.dir(source.toString())) + if (!srcDir.getAsFile().get().isDirectory()) { throw new IllegalArgumentException("The source for GSP compilation must be a single directory, but was $source") } + super.setSource(source) } @TaskAction @@ -51,50 +60,43 @@ abstract class AbstractGroovyTemplateCompileTask extends AbstractCompile { } protected void compile() { - def projectPackageNames = getProjectPackageNames(project.projectDir) + Iterable projectPackageNames = getProjectPackageNames(project.projectDir) - if(packageName == null) { - packageName = project.name - if(!packageName) { - packageName = project.projectDir.canonicalFile.name - } + if (packageName.isPresent()) { + packageName.set(project.name ?: project.projectDir.canonicalFile.name) } ExecResult result = project.javaexec( new Action() { - @Override - @CompileDynamic + @Override @CompileDynamic void execute(JavaExecSpec javaExecSpec) { javaExecSpec.mainClass.set(getCompilerName()) - javaExecSpec.setClasspath(getClasspath()) + javaExecSpec.classpath = getClasspath() - def jvmArgs = compileOptions.forkOptions.jvmArgs - if(jvmArgs) { + List jvmArgs = compileOptions.forkOptions.jvmArgs + if (jvmArgs) { javaExecSpec.jvmArgs(jvmArgs) } - javaExecSpec.setMaxHeapSize( compileOptions.forkOptions.memoryMaximumSize ) - javaExecSpec.setMinHeapSize( compileOptions.forkOptions.memoryInitialSize ) + javaExecSpec.maxHeapSize = compileOptions.forkOptions.memoryMaximumSize + javaExecSpec.minHeapSize = compileOptions.forkOptions.memoryInitialSize - - String packageImports = projectPackageNames.join(',') ?: packageName - def arguments = [ - srcDir.canonicalPath, - destinationDirectory.getAsFile().get()?.canonicalPath, + String packageImports = projectPackageNames.join(',') ?: packageName.get() + List arguments = [ + srcDir.get().asFile.canonicalPath, + destinationDirectory.get().asFile.canonicalPath, targetCompatibility, packageImports, - packageName, - project.file("grails-app/conf/application.yml").canonicalPath, + packageName.get(), + project.file('grails-app/conf/application.yml').canonicalPath, compileOptions.encoding - ] + ] as List prepareArguments(arguments) javaExecSpec.args(arguments) } - } ) result.assertNormalExitValue() - } void prepareArguments(List arguments) { @@ -103,7 +105,7 @@ abstract class AbstractGroovyTemplateCompileTask extends AbstractCompile { @Input protected String getCompilerName() { - "grails.views.GenericGroovyTemplateCompiler" + 'grails.views.GenericGroovyTemplateCompiler' } @Input @@ -116,17 +118,16 @@ abstract class AbstractGroovyTemplateCompileTask extends AbstractCompile { File rootDir = baseDir ? new File(baseDir, "grails-app${File.separator}domain") : null Set packageNames = [] if (rootDir?.exists()) { - populatePackages(rootDir, packageNames, "") + populatePackages(rootDir, packageNames, '') } return packageNames } protected populatePackages(File rootDir, Collection packageNames, String prefix) { rootDir.eachDir { File dir -> - def dirName = dir.name + String dirName = dir.name if (!dir.hidden && !dirName.startsWith('.')) { packageNames << "${prefix}${dirName}".toString() - populatePackages(dir, packageNames, "${prefix}${dirName}.") } } diff --git a/gradle-plugin/src/main/groovy/grails/views/gradle/AbstractGroovyTemplatePlugin.groovy b/gradle-plugin/src/main/groovy/grails/views/gradle/AbstractGroovyTemplatePlugin.groovy index 23f5b7fb3..880b33477 100644 --- a/gradle-plugin/src/main/groovy/grails/views/gradle/AbstractGroovyTemplatePlugin.groovy +++ b/gradle-plugin/src/main/groovy/grails/views/gradle/AbstractGroovyTemplatePlugin.groovy @@ -62,7 +62,7 @@ class AbstractGroovyTemplatePlugin implements Plugin { def allClasspath = classesDir + project.configurations.named('compileClasspath').get() templateCompileTask.getDestinationDirectory().set( destDir ) templateCompileTask.classpath = allClasspath - templateCompileTask.setPackageName(project.name) + templateCompileTask.packageName.set(project.name) templateCompileTask.setSource(project.file("${project.projectDir}/$pathToSource")) templateCompileTask.dependsOn( allTasks.named('classes').get() ) project.plugins.withType(SpringBootPlugin).configureEach {plugin -> diff --git a/gradle-plugin/src/main/groovy/grails/views/gradle/ViewCompileOptions.groovy b/gradle-plugin/src/main/groovy/grails/views/gradle/ViewCompileOptions.groovy index ecb0292e0..8175bd1af 100644 --- a/gradle-plugin/src/main/groovy/grails/views/gradle/ViewCompileOptions.groovy +++ b/gradle-plugin/src/main/groovy/grails/views/gradle/ViewCompileOptions.groovy @@ -1,8 +1,11 @@ package grails.views.gradle +import org.gradle.api.model.ObjectFactory +import org.gradle.api.provider.Property import org.gradle.api.tasks.Input import org.gradle.api.tasks.Nested import org.gradle.api.tasks.compile.GroovyForkOptions +import javax.inject.Inject; /** * @author Graeme Rocher @@ -10,12 +13,17 @@ import org.gradle.api.tasks.compile.GroovyForkOptions */ class ViewCompileOptions implements Serializable { - private static final long serialVersionUID = 0L; + private static final long serialVersionUID = 0L @Input - String encoding = "UTF-8" + final Property encoding @Nested - GroovyForkOptions forkOptions = new GroovyForkOptions() + GroovyForkOptions forkOptions + @Inject + ViewCompileOptions(ObjectFactory objects) { + encoding = objects.property(String).convention('UTF-8') + forkOptions = objects.newInstance(GroovyForkOptions) + } } diff --git a/gradle/buildsrc.libs.versions.toml b/gradle/buildsrc.libs.versions.toml index 0eb675358..58ea0ea59 100644 --- a/gradle/buildsrc.libs.versions.toml +++ b/gradle/buildsrc.libs.versions.toml @@ -1,8 +1,8 @@ [versions] asciidoctor-gradle-jvm = '4.0.2' -assetpipeline = '4.4.0' -grails-gradle-plugin = '6.1.2' -grails-views = '3.2.3' +assetpipeline = '4.5.1' +grails-gradle-plugin = '7.0.0-SNAPSHOT' +grails-views = '4.0.0-SNAPSHOT' groovy-doc = '1.0.1' nexus-publish-gradle-plugin = '1.3.0' diff --git a/gradle/dependency-updates.gradle b/gradle/dependency-updates.gradle new file mode 100644 index 000000000..07bc64454 --- /dev/null +++ b/gradle/dependency-updates.gradle @@ -0,0 +1,30 @@ +def groovyVersion = project.rootProject + .extensions + .getByType(VersionCatalogsExtension.class) + .named("libs") + .findVersion("groovy") + .get() + .displayName + +def micronautVersion = project.rootProject + .extensions + .getByType(VersionCatalogsExtension.class) + .named("libs") + .findVersion("micronaut") + .get() + .displayName + +allprojects { + configurations.configureEach { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') { + details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: groovyVersion) + details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version" + } + + if (details.requested.group == "io.micronaut" && details.requested.name == "micronaut-inject-groovy") { + details.useVersion(micronautVersion) + } + } + } +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fc5b27ee8..fc2e9b7c9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,24 @@ [versions] -assetpipeline = '4.3.0' +assetpipeline = '4.5.1' caffeine = '2.9.3' -gorm = '8.1.2' -gorm-hibernate5 = '8.1.0' +gorm = '9.0.0-SNAPSHOT' +gorm-hibernate5 = '9.0.0-SNAPSHOT' gorm-mongodb = '8.2.0' -grails = '6.2.0' -grails-gradle-plugin = '6.1.2' -grails-testing-support = '3.2.2' -groovy = '3.0.21' -java-baseline = '11' -javax-annotation-api = '1.3.2' -micronaut = '3.10.4' +grails = '7.0.0-SNAPSHOT' +grails-gradle-plugin = '7.0.0-SNAPSHOT' +grails-testing-support = '4.0.0-SNAPSHOT' +groovy = '4.0.22' +java-baseline = '17' +jackson-databind = '2.17.2' +jakarta-annotation-api = '3.0.0' +jakarta-servlet-api = '6.0.0' +jakarta-validation-api = '3.0.2' +micronaut = '4.5.3' mongodb = '4.11.2' slf4j = '1.7.36' -spock = '2.3-groovy-3.0' -spring = '5.3.33' -spring-boot = '2.7.18' +spock = '2.3-groovy-4.0' +spring = '6.1.8' +spring-boot = '3.2.6' [libraries] assetpipeline = { module = 'com.bertramlabs.plugins:asset-pipeline-grails', version.ref = 'assetpipeline' } @@ -33,10 +36,13 @@ grails-rest = { module = 'org.grails:grails-plugin-rest', version.ref = 'grails' grails-testing-support-core = { module = 'org.grails:grails-testing-support', version.ref = 'grails-testing-support' } grails-testing-support-gorm = { module = 'org.grails:grails-gorm-testing-support', version.ref = 'grails-testing-support' } grails-web-urlmappings = { module = 'org.grails:grails-web-url-mappings', version.ref = 'grails' } -groovy-core = { module = 'org.codehaus.groovy:groovy', version.ref = 'groovy' } -groovy-json = { module = 'org.codehaus.groovy:groovy-json', version.ref = 'groovy' } -groovy-templates = { module = 'org.codehaus.groovy:groovy-templates', version.ref = 'groovy' } -javax-annotation-api = { module = 'javax.annotation:javax.annotation-api', version.ref = 'javax-annotation-api' } +groovy-core = { module = 'org.apache.groovy:groovy', version.ref = 'groovy' } +groovy-json = { module = 'org.apache.groovy:groovy-json', version.ref = 'groovy' } +groovy-templates = { module = 'org.apache.groovy:groovy-templates', version.ref = 'groovy' } +jackson-databind = { module = 'com.fasterxml.jackson.core:jackson-databind', version.ref = 'jackson-databind' } +jakarta-annotation-api = { module = 'jakarta.annotation:jakarta.annotation-api', version.ref = 'jakarta-annotation-api' } +jakarta-servlet-api = { module = 'jakarta.servlet:jakarta.servlet-api', version.ref = 'jakarta-servlet-api' } +jakarta-validation-api = { module = 'jakarta.validation:jakarta.validation-api', version.ref = 'jakarta-validation-api' } micronaut-http-client = { module = 'io.micronaut:micronaut-http-client', version.ref = 'micronaut' } mongodb-bson = { module = 'org.mongodb:bson', version.ref = 'mongodb' } slf4j-api = { module = 'org.slf4j:slf4j-api', version.ref = 'slf4j' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index afba109285af78dbd2a1d187e33ac4f87c76e392..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ zQccdaaVK$5bz;*rnyK{_SQYM>;aES6Qs^lj9lEs6_J+%nIiuQC*fN;z8md>r_~Mfl zU%p5Dt_YT>gQqfr@`cR!$NWr~+`CZb%dn;WtzrAOI>P_JtsB76PYe*<%H(y>qx-`Kq!X_; z<{RpAqYhE=L1r*M)gNF3B8r(<%8mo*SR2hu zccLRZwGARt)Hlo1euqTyM>^!HK*!Q2P;4UYrysje@;(<|$&%vQekbn|0Ruu_Io(w4#%p6ld2Yp7tlA`Y$cciThP zKzNGIMPXX%&Ud0uQh!uQZz|FB`4KGD?3!ND?wQt6!n*f4EmCoJUh&b?;B{|lxs#F- z31~HQ`SF4x$&v00@(P+j1pAaj5!s`)b2RDBp*PB=2IB>oBF!*6vwr7Dp%zpAx*dPr zb@Zjq^XjN?O4QcZ*O+8>)|HlrR>oD*?WQl5ri3R#2?*W6iJ>>kH%KnnME&TT@ZzrHS$Q%LC?n|e>V+D+8D zYc4)QddFz7I8#}y#Wj6>4P%34dZH~OUDb?uP%-E zwjXM(?Sg~1!|wI(RVuxbu)-rH+O=igSho_pDCw(c6b=P zKk4ATlB?bj9+HHlh<_!&z0rx13K3ZrAR8W)!@Y}o`?a*JJsD+twZIv`W)@Y?Amu_u zz``@-e2X}27$i(2=9rvIu5uTUOVhzwu%mNazS|lZb&PT;XE2|B&W1>=B58#*!~D&) zfVmJGg8UdP*fx(>Cj^?yS^zH#o-$Q-*$SnK(ZVFkw+er=>N^7!)FtP3y~Xxnu^nzY zikgB>Nj0%;WOltWIob|}%lo?_C7<``a5hEkx&1ku$|)i>Rh6@3h*`slY=9U}(Ql_< zaNG*J8vb&@zpdhAvv`?{=zDedJ23TD&Zg__snRAH4eh~^oawdYi6A3w8<Ozh@Kw)#bdktM^GVb zrG08?0bG?|NG+w^&JvD*7LAbjED{_Zkc`3H!My>0u5Q}m!+6VokMLXxl`Mkd=g&Xx z-a>m*#G3SLlhbKB!)tnzfWOBV;u;ftU}S!NdD5+YtOjLg?X}dl>7m^gOpihrf1;PY zvll&>dIuUGs{Qnd- zwIR3oIrct8Va^Tm0t#(bJD7c$Z7DO9*7NnRZorrSm`b`cxz>OIC;jSE3DO8`hX955ui`s%||YQtt2 z5DNA&pG-V+4oI2s*x^>-$6J?p=I>C|9wZF8z;VjR??Icg?1w2v5Me+FgAeGGa8(3S z4vg*$>zC-WIVZtJ7}o9{D-7d>zCe|z#<9>CFve-OPAYsneTb^JH!Enaza#j}^mXy1 z+ULn^10+rWLF6j2>Ya@@Kq?26>AqK{A_| zQKb*~F1>sE*=d?A?W7N2j?L09_7n+HGi{VY;MoTGr_)G9)ot$p!-UY5zZ2Xtbm=t z@dpPSGwgH=QtIcEulQNI>S-#ifbnO5EWkI;$A|pxJd885oM+ zGZ0_0gDvG8q2xebj+fbCHYfAXuZStH2j~|d^sBAzo46(K8n59+T6rzBwK)^rfPT+B zyIFw)9YC-V^rhtK`!3jrhmW-sTmM+tPH+;nwjL#-SjQPUZ53L@A>y*rt(#M(qsiB2 zx6B)dI}6Wlsw%bJ8h|(lhkJVogQZA&n{?Vgs6gNSXzuZpEyu*xySy8ro07QZ7Vk1!3tJphN_5V7qOiyK8p z#@jcDD8nmtYi1^l8ml;AF<#IPK?!pqf9D4moYk>d99Im}Jtwj6c#+A;f)CQ*f-hZ< z=p_T86jog%!p)D&5g9taSwYi&eP z#JuEK%+NULWus;0w32-SYFku#i}d~+{Pkho&^{;RxzP&0!RCm3-9K6`>KZpnzS6?L z^H^V*s!8<>x8bomvD%rh>Zp3>Db%kyin;qtl+jAv8Oo~1g~mqGAC&Qi_wy|xEt2iz zWAJEfTV%cl2Cs<1L&DLRVVH05EDq`pH7Oh7sR`NNkL%wi}8n>IXcO40hp+J+sC!W?!krJf!GJNE8uj zg-y~Ns-<~D?yqbzVRB}G>0A^f0!^N7l=$m0OdZuqAOQqLc zX?AEGr1Ht+inZ-Qiwnl@Z0qukd__a!C*CKuGdy5#nD7VUBM^6OCpxCa2A(X;e0&V4 zM&WR8+wErQ7UIc6LY~Q9x%Sn*Tn>>P`^t&idaOEnOd(Ufw#>NoR^1QdhJ8s`h^|R_ zXX`c5*O~Xdvh%q;7L!_!ohf$NfEBmCde|#uVZvEo>OfEq%+Ns7&_f$OR9xsihRpBb z+cjk8LyDm@U{YN>+r46?nn{7Gh(;WhFw6GAxtcKD+YWV?uge>;+q#Xx4!GpRkVZYu zzsF}1)7$?%s9g9CH=Zs+B%M_)+~*j3L0&Q9u7!|+T`^O{xE6qvAP?XWv9_MrZKdo& z%IyU)$Q95AB4!#hT!_dA>4e@zjOBD*Y=XjtMm)V|+IXzjuM;(l+8aA5#Kaz_$rR6! zj>#&^DidYD$nUY(D$mH`9eb|dtV0b{S>H6FBfq>t5`;OxA4Nn{J(+XihF(stSche7$es&~N$epi&PDM_N`As;*9D^L==2Q7Z2zD+CiU(|+-kL*VG+&9!Yb3LgPy?A zm7Z&^qRG_JIxK7-FBzZI3Q<;{`DIxtc48k> zc|0dmX;Z=W$+)qE)~`yn6MdoJ4co;%!`ddy+FV538Y)j(vg}5*k(WK)KWZ3WaOG!8 z!syGn=s{H$odtpqFrT#JGM*utN7B((abXnpDM6w56nhw}OY}0TiTG1#f*VFZr+^-g zbP10`$LPq_;PvrA1XXlyx2uM^mrjTzX}w{yuLo-cOClE8MMk47T25G8M!9Z5ypOSV zAJUBGEg5L2fY)ZGJb^E34R2zJ?}Vf>{~gB!8=5Z) z9y$>5c)=;o0HeHHSuE4U)#vG&KF|I%-cF6f$~pdYJWk_dD}iOA>iA$O$+4%@>JU08 zS`ep)$XLPJ+n0_i@PkF#ri6T8?ZeAot$6JIYHm&P6EB=BiaNY|aA$W0I+nz*zkz_z zkEru!tj!QUffq%)8y0y`T&`fuus-1p>=^hnBiBqD^hXrPs`PY9tU3m0np~rISY09> z`P3s=-kt_cYcxWd{de@}TwSqg*xVhp;E9zCsnXo6z z?f&Sv^U7n4`xr=mXle94HzOdN!2kB~4=%)u&N!+2;z6UYKUDqi-s6AZ!haB;@&B`? z_TRX0%@suz^TRdCb?!vNJYPY8L_}&07uySH9%W^Tc&1pia6y1q#?*Drf}GjGbPjBS zbOPcUY#*$3sL2x4v_i*Y=N7E$mR}J%|GUI(>WEr+28+V z%v5{#e!UF*6~G&%;l*q*$V?&r$Pp^sE^i-0$+RH3ERUUdQ0>rAq2(2QAbG}$y{de( z>{qD~GGuOk559Y@%$?N^1ApVL_a704>8OD%8Y%8B;FCt%AoPu8*D1 zLB5X>b}Syz81pn;xnB}%0FnwazlWfUV)Z-~rZg6~b z6!9J$EcE&sEbzcy?CI~=boWA&eeIa%z(7SE^qgVLz??1Vbc1*aRvc%Mri)AJaAG!p z$X!_9Ds;Zz)f+;%s&dRcJt2==P{^j3bf0M=nJd&xwUGlUFn?H=2W(*2I2Gdu zv!gYCwM10aeus)`RIZSrCK=&oKaO_Ry~D1B5!y0R=%!i2*KfXGYX&gNv_u+n9wiR5 z*e$Zjju&ODRW3phN925%S(jL+bCHv6rZtc?!*`1TyYXT6%Ju=|X;6D@lq$8T zW{Y|e39ioPez(pBH%k)HzFITXHvnD6hw^lIoUMA;qAJ^CU?top1fo@s7xT13Fvn1H z6JWa-6+FJF#x>~+A;D~;VDs26>^oH0EI`IYT2iagy23?nyJ==i{g4%HrAf1-*v zK1)~@&(KkwR7TL}L(A@C_S0G;-GMDy=MJn2$FP5s<%wC)4jC5PXoxrQBFZ_k0P{{s@sz+gX`-!=T8rcB(=7vW}^K6oLWMmp(rwDh}b zwaGGd>yEy6fHv%jM$yJXo5oMAQ>c9j`**}F?MCry;T@47@r?&sKHgVe$MCqk#Z_3S z1GZI~nOEN*P~+UaFGnj{{Jo@16`(qVNtbU>O0Hf57-P>x8Jikp=`s8xWs^dAJ9lCQ z)GFm+=OV%AMVqVATtN@|vp61VVAHRn87}%PC^RAzJ%JngmZTasWBAWsoAqBU+8L8u z4A&Pe?fmTm0?mK-BL9t+{y7o(7jm+RpOhL9KnY#E&qu^}B6=K_dB}*VlSEiC9fn)+V=J;OnN)Ta5v66ic1rG+dGAJ1 z1%Zb_+!$=tQ~lxQrzv3x#CPb?CekEkA}0MYSgx$Jdd}q8+R=ma$|&1a#)TQ=l$1tQ z=tL9&_^vJ)Pk}EDO-va`UCT1m#Uty1{v^A3P~83_#v^ozH}6*9mIjIr;t3Uv%@VeW zGL6(CwCUp)Jq%G0bIG%?{_*Y#5IHf*5M@wPo6A{$Um++Co$wLC=J1aoG93&T7Ho}P z=mGEPP7GbvoG!uD$k(H3A$Z))+i{Hy?QHdk>3xSBXR0j!11O^mEe9RHmw!pvzv?Ua~2_l2Yh~_!s1qS`|0~0)YsbHSz8!mG)WiJE| z2f($6TQtt6L_f~ApQYQKSb=`053LgrQq7G@98#igV>y#i==-nEjQ!XNu9 z~;mE+gtj4IDDNQJ~JVk5Ux6&LCSFL!y=>79kE9=V}J7tD==Ga+IW zX)r7>VZ9dY=V&}DR))xUoV!u(Z|%3ciQi_2jl}3=$Agc(`RPb z8kEBpvY>1FGQ9W$n>Cq=DIpski};nE)`p3IUw1Oz0|wxll^)4dq3;CCY@RyJgFgc# zKouFh!`?Xuo{IMz^xi-h=StCis_M7yq$u) z?XHvw*HP0VgR+KR6wI)jEMX|ssqYvSf*_3W8zVTQzD?3>H!#>InzpSO)@SC8q*ii- z%%h}_#0{4JG;Jm`4zg};BPTGkYamx$Xo#O~lBirRY)q=5M45n{GCfV7h9qwyu1NxOMoP4)jjZMxmT|IQQh0U7C$EbnMN<3)Kk?fFHYq$d|ICu>KbY_hO zTZM+uKHe(cIZfEqyzyYSUBZa8;Fcut-GN!HSA9ius`ltNebF46ZX_BbZNU}}ZOm{M2&nANL9@0qvih15(|`S~z}m&h!u4x~(%MAO$jHRWNfuxWF#B)E&g3ghSQ9|> z(MFaLQj)NE0lowyjvg8z0#m6FIuKE9lDO~Glg}nSb7`~^&#(Lw{}GVOS>U)m8bF}x zVjbXljBm34Cs-yM6TVusr+3kYFjr28STT3g056y3cH5Tmge~ASxBj z%|yb>$eF;WgrcOZf569sDZOVwoo%8>XO>XQOX1OyN9I-SQgrm;U;+#3OI(zrWyow3 zk==|{lt2xrQ%FIXOTejR>;wv(Pb8u8}BUpx?yd(Abh6? zsoO3VYWkeLnF43&@*#MQ9-i-d0t*xN-UEyNKeyNMHw|A(k(_6QKO=nKMCxD(W(Yop zsRQ)QeL4X3Lxp^L%wzi2-WVSsf61dqliPUM7srDB?Wm6Lzn0&{*}|IsKQW;02(Y&| zaTKv|`U(pSzuvR6Rduu$wzK_W-Y-7>7s?G$)U}&uK;<>vU}^^ns@Z!p+9?St1s)dG zK%y6xkPyyS1$~&6v{kl?Md6gwM|>mt6Upm>oa8RLD^8T{0?HC!Z>;(Bob7el(DV6x zi`I)$&E&ngwFS@bi4^xFLAn`=fzTC;aimE^!cMI2n@Vo%Ae-ne`RF((&5y6xsjjAZ zVguVoQ?Z9uk$2ON;ersE%PU*xGO@T*;j1BO5#TuZKEf(mB7|g7pcEA=nYJ{s3vlbg zd4-DUlD{*6o%Gc^N!Nptgay>j6E5;3psI+C3Q!1ZIbeCubW%w4pq9)MSDyB{HLm|k zxv-{$$A*pS@csolri$Ge<4VZ}e~78JOL-EVyrbxKra^d{?|NnPp86!q>t<&IP07?Z z^>~IK^k#OEKgRH+LjllZXk7iA>2cfH6+(e&9ku5poo~6y{GC5>(bRK7hwjiurqAiZ zg*DmtgY}v83IjE&AbiWgMyFbaRUPZ{lYiz$U^&Zt2YjG<%m((&_JUbZcfJ22(>bi5 z!J?<7AySj0JZ&<-qXX;mcV!f~>G=sB0KnjWca4}vrtunD^1TrpfeS^4dvFr!65knK zZh`d;*VOkPs4*-9kL>$GP0`(M!j~B;#x?Ba~&s6CopvO86oM?-? zOw#dIRc;6A6T?B`Qp%^<U5 z19x(ywSH$_N+Io!6;e?`tWaM$`=Db!gzx|lQ${DG!zb1Zl&|{kX0y6xvO1o z220r<-oaS^^R2pEyY;=Qllqpmue|5yI~D|iI!IGt@iod{Opz@*ml^w2bNs)p`M(Io z|E;;m*Xpjd9l)4G#KaWfV(t8YUn@A;nK^#xgv=LtnArX|vWQVuw3}B${h+frU2>9^ z!l6)!Uo4`5k`<<;E(ido7M6lKTgWezNLq>U*=uz&s=cc$1%>VrAeOoUtA|T6gO4>UNqsdK=NF*8|~*sl&wI=x9-EGiq*aqV!(VVXA57 zw9*o6Ir8Lj1npUXvlevtn(_+^X5rzdR>#(}4YcB9O50q97%rW2me5_L=%ffYPUSRc z!vv?Kv>dH994Qi>U(a<0KF6NH5b16enCp+mw^Hb3Xs1^tThFpz!3QuN#}KBbww`(h z7GO)1olDqy6?T$()R7y%NYx*B0k_2IBiZ14&8|JPFxeMF{vW>HF-Vi3+ZOI=+qP}n zw(+!WcTd~4ZJX1!ZM&y!+uyt=&i!+~d(V%GjH;-NsEEv6nS1TERt|RHh!0>W4+4pp z1-*EzAM~i`+1f(VEHI8So`S`akPfPTfq*`l{Fz`hS%k#JS0cjT2mS0#QLGf=J?1`he3W*;m4)ce8*WFq1sdP=~$5RlH1EdWm|~dCvKOi4*I_96{^95p#B<(n!d?B z=o`0{t+&OMwKcxiBECznJcfH!fL(z3OvmxP#oWd48|mMjpE||zdiTBdWelj8&Qosv zZFp@&UgXuvJw5y=q6*28AtxZzo-UUpkRW%ne+Ylf!V-0+uQXBW=5S1o#6LXNtY5!I z%Rkz#(S8Pjz*P7bqB6L|M#Er{|QLae-Y{KA>`^} z@lPjeX>90X|34S-7}ZVXe{wEei1<{*e8T-Nbj8JmD4iwcE+Hg_zhkPVm#=@b$;)h6 z<<6y`nPa`f3I6`!28d@kdM{uJOgM%`EvlQ5B2bL)Sl=|y@YB3KeOzz=9cUW3clPAU z^sYc}xf9{4Oj?L5MOlYxR{+>w=vJjvbyO5}ptT(o6dR|ygO$)nVCvNGnq(6;bHlBd zl?w-|plD8spjDF03g5ip;W3Z z><0{BCq!Dw;h5~#1BuQilq*TwEu)qy50@+BE4bX28+7erX{BD4H)N+7U`AVEuREE8 z;X?~fyhF-x_sRfHIj~6f(+^@H)D=ngP;mwJjxhQUbUdzk8f94Ab%59-eRIq?ZKrwD z(BFI=)xrUlgu(b|hAysqK<}8bslmNNeD=#JW*}^~Nrswn^xw*nL@Tx!49bfJecV&KC2G4q5a!NSv)06A_5N3Y?veAz;Gv+@U3R% z)~UA8-0LvVE{}8LVDOHzp~2twReqf}ODIyXMM6=W>kL|OHcx9P%+aJGYi_Om)b!xe zF40Vntn0+VP>o<$AtP&JANjXBn7$}C@{+@3I@cqlwR2MdwGhVPxlTIcRVu@Ho-wO` z_~Or~IMG)A_`6-p)KPS@cT9mu9RGA>dVh5wY$NM9-^c@N=hcNaw4ITjm;iWSP^ZX| z)_XpaI61<+La+U&&%2a z0za$)-wZP@mwSELo#3!PGTt$uy0C(nTT@9NX*r3Ctw6J~7A(m#8fE)0RBd`TdKfAT zCf@$MAxjP`O(u9s@c0Fd@|}UQ6qp)O5Q5DPCeE6mSIh|Rj{$cAVIWsA=xPKVKxdhg zLzPZ`3CS+KIO;T}0Ip!fAUaNU>++ZJZRk@I(h<)RsJUhZ&Ru9*!4Ptn;gX^~4E8W^TSR&~3BAZc#HquXn)OW|TJ`CTahk+{qe`5+ixON^zA9IFd8)kc%*!AiLu z>`SFoZ5bW-%7}xZ>gpJcx_hpF$2l+533{gW{a7ce^B9sIdmLrI0)4yivZ^(Vh@-1q zFT!NQK$Iz^xu%|EOK=n>ug;(7J4OnS$;yWmq>A;hsD_0oAbLYhW^1Vdt9>;(JIYjf zdb+&f&D4@4AS?!*XpH>8egQvSVX`36jMd>$+RgI|pEg))^djhGSo&#lhS~9%NuWfX zDDH;3T*GzRT@5=7ibO>N-6_XPBYxno@mD_3I#rDD?iADxX`! zh*v8^i*JEMzyN#bGEBz7;UYXki*Xr(9xXax(_1qVW=Ml)kSuvK$coq2A(5ZGhs_pF z$*w}FbN6+QDseuB9=fdp_MTs)nQf!2SlROQ!gBJBCXD&@-VurqHj0wm@LWX-TDmS= z71M__vAok|@!qgi#H&H%Vg-((ZfxPAL8AI{x|VV!9)ZE}_l>iWk8UPTGHs*?u7RfP z5MC&=c6X;XlUzrz5q?(!eO@~* zoh2I*%J7dF!!_!vXoSIn5o|wj1#_>K*&CIn{qSaRc&iFVxt*^20ngCL;QonIS>I5^ zMw8HXm>W0PGd*}Ko)f|~dDd%;Wu_RWI_d;&2g6R3S63Uzjd7dn%Svu-OKpx*o|N>F zZg=-~qLb~VRLpv`k zWSdfHh@?dp=s_X`{yxOlxE$4iuyS;Z-x!*E6eqmEm*j2bE@=ZI0YZ5%Yj29!5+J$4h{s($nakA`xgbO8w zi=*r}PWz#lTL_DSAu1?f%-2OjD}NHXp4pXOsCW;DS@BC3h-q4_l`<))8WgzkdXg3! zs1WMt32kS2E#L0p_|x+x**TFV=gn`m9BWlzF{b%6j-odf4{7a4y4Uaef@YaeuPhU8 zHBvRqN^;$Jizy+ z=zW{E5<>2gp$pH{M@S*!sJVQU)b*J5*bX4h>5VJve#Q6ga}cQ&iL#=(u+KroWrxa%8&~p{WEUF0il=db;-$=A;&9M{Rq`ouZ5m%BHT6%st%saGsD6)fQgLN}x@d3q>FC;=f%O3Cyg=Ke@Gh`XW za@RajqOE9UB6eE=zhG%|dYS)IW)&y&Id2n7r)6p_)vlRP7NJL(x4UbhlcFXWT8?K=%s7;z?Vjts?y2+r|uk8Wt(DM*73^W%pAkZa1Jd zNoE)8FvQA>Z`eR5Z@Ig6kS5?0h;`Y&OL2D&xnnAUzQz{YSdh0k zB3exx%A2TyI)M*EM6htrxSlep!Kk(P(VP`$p0G~f$smld6W1r_Z+o?=IB@^weq>5VYsYZZR@` z&XJFxd5{|KPZmVOSxc@^%71C@;z}}WhbF9p!%yLj3j%YOlPL5s>7I3vj25 z@xmf=*z%Wb4;Va6SDk9cv|r*lhZ`(y_*M@>q;wrn)oQx%B(2A$9(74>;$zmQ!4fN; z>XurIk-7@wZys<+7XL@0Fhe-f%*=(weaQEdR9Eh6>Kl-EcI({qoZqyzziGwpg-GM#251sK_ z=3|kitS!j%;fpc@oWn65SEL73^N&t>Ix37xgs= zYG%eQDJc|rqHFia0!_sm7`@lvcv)gfy(+KXA@E{3t1DaZ$DijWAcA)E0@X?2ziJ{v z&KOYZ|DdkM{}t+@{@*6ge}m%xfjIxi%qh`=^2Rwz@w0cCvZ&Tc#UmCDbVwABrON^x zEBK43FO@weA8s7zggCOWhMvGGE`baZ62cC)VHyy!5Zbt%ieH+XN|OLbAFPZWyC6)p z4P3%8sq9HdS3=ih^0OOlqTPbKuzQ?lBEI{w^ReUO{V?@`ARsL|S*%yOS=Z%sF)>-y z(LAQdhgAcuF6LQjRYfdbD1g4o%tV4EiK&ElLB&^VZHbrV1K>tHTO{#XTo>)2UMm`2 z^t4s;vnMQgf-njU-RVBRw0P0-m#d-u`(kq7NL&2T)TjI_@iKuPAK-@oH(J8?%(e!0Ir$yG32@CGUPn5w4)+9@8c&pGx z+K3GKESI4*`tYlmMHt@br;jBWTei&(a=iYslc^c#RU3Q&sYp zSG){)V<(g7+8W!Wxeb5zJb4XE{I|&Y4UrFWr%LHkdQ;~XU zgy^dH-Z3lmY+0G~?DrC_S4@=>0oM8Isw%g(id10gWkoz2Q%7W$bFk@mIzTCcIB(K8 zc<5h&ZzCdT=9n-D>&a8vl+=ZF*`uTvQviG_bLde*k>{^)&0o*b05x$MO3gVLUx`xZ z43j+>!u?XV)Yp@MmG%Y`+COH2?nQcMrQ%k~6#O%PeD_WvFO~Kct za4XoCM_X!c5vhRkIdV=xUB3xI2NNStK*8_Zl!cFjOvp-AY=D;5{uXj}GV{LK1~IE2 z|KffUiBaStRr;10R~K2VVtf{TzM7FaPm;Y(zQjILn+tIPSrJh&EMf6evaBKIvi42-WYU9Vhj~3< zZSM-B;E`g_o8_XTM9IzEL=9Lb^SPhe(f(-`Yh=X6O7+6ALXnTcUFpI>ekl6v)ZQeNCg2 z^H|{SKXHU*%nBQ@I3It0m^h+6tvI@FS=MYS$ZpBaG7j#V@P2ZuYySbp@hA# ze(kc;P4i_-_UDP?%<6>%tTRih6VBgScKU^BV6Aoeg6Uh(W^#J^V$Xo^4#Ekp ztqQVK^g9gKMTHvV7nb64UU7p~!B?>Y0oFH5T7#BSW#YfSB@5PtE~#SCCg3p^o=NkMk$<8- z6PT*yIKGrvne7+y3}_!AC8NNeI?iTY(&nakN>>U-zT0wzZf-RuyZk^X9H-DT_*wk= z;&0}6LsGtfVa1q)CEUPlx#(ED@-?H<1_FrHU#z5^P3lEB|qsxEyn%FOpjx z3S?~gvoXy~L(Q{Jh6*i~=f%9kM1>RGjBzQh_SaIDfSU_9!<>*Pm>l)cJD@wlyxpBV z4Fmhc2q=R_wHCEK69<*wG%}mgD1=FHi4h!98B-*vMu4ZGW~%IrYSLGU{^TuseqVgV zLP<%wirIL`VLyJv9XG_p8w@Q4HzNt-o;U@Au{7%Ji;53!7V8Rv0^Lu^Vf*sL>R(;c zQG_ZuFl)Mh-xEIkGu}?_(HwkB2jS;HdPLSxVU&Jxy9*XRG~^HY(f0g8Q}iqnVmgjI zfd=``2&8GsycjR?M%(zMjn;tn9agcq;&rR!Hp z$B*gzHsQ~aXw8c|a(L^LW(|`yGc!qOnV(ZjU_Q-4z1&0;jG&vAKuNG=F|H?@m5^N@ zq{E!1n;)kNTJ>|Hb2ODt-7U~-MOIFo%9I)_@7fnX+eMMNh>)V$IXesJpBn|uo8f~#aOFytCT zf9&%MCLf8mp4kwHTcojWmM3LU=#|{3L>E}SKwOd?%{HogCZ_Z1BSA}P#O(%H$;z7XyJ^sjGX;j5 zrzp>|Ud;*&VAU3x#f{CKwY7Vc{%TKKqmB@oTHA9;>?!nvMA;8+Jh=cambHz#J18x~ zs!dF>$*AnsQ{{82r5Aw&^7eRCdvcgyxH?*DV5(I$qXh^zS>us*I66_MbL8y4d3ULj z{S(ipo+T3Ag!+5`NU2sc+@*m{_X|&p#O-SAqF&g_n7ObB82~$p%fXA5GLHMC+#qqL zdt`sJC&6C2)=juQ_!NeD>U8lDVpAOkW*khf7MCcs$A(wiIl#B9HM%~GtQ^}yBPjT@ z+E=|A!Z?A(rwzZ;T}o6pOVqHzTr*i;Wrc%&36kc@jXq~+w8kVrs;%=IFdACoLAcCAmhFNpbP8;s`zG|HC2Gv?I~w4ITy=g$`0qMQdkijLSOtX6xW%Z9Nw<;M- zMN`c7=$QxN00DiSjbVt9Mi6-pjv*j(_8PyV-il8Q-&TwBwH1gz1uoxs6~uU}PrgWB zIAE_I-a1EqlIaGQNbcp@iI8W1sm9fBBNOk(k&iLBe%MCo#?xI$%ZmGA?=)M9D=0t7 zc)Q0LnI)kCy{`jCGy9lYX%mUsDWwsY`;jE(;Us@gmWPqjmXL+Hu#^;k%eT>{nMtzj zsV`Iy6leTA8-PndszF;N^X@CJrTw5IIm!GPeu)H2#FQitR{1p;MasQVAG3*+=9FYK zw*k!HT(YQorfQj+1*mCV458(T5=fH`um$gS38hw(OqVMyunQ;rW5aPbF##A3fGH6h z@W)i9Uff?qz`YbK4c}JzQpuxuE3pcQO)%xBRZp{zJ^-*|oryTxJ-rR+MXJ)!f=+pp z10H|DdGd2exhi+hftcYbM0_}C0ZI-2vh+$fU1acsB-YXid7O|=9L!3e@$H*6?G*Zp z%qFB(sgl=FcC=E4CYGp4CN>=M8#5r!RU!u+FJVlH6=gI5xHVD&k;Ta*M28BsxfMV~ zLz+@6TxnfLhF@5=yQo^1&S}cmTN@m!7*c6z;}~*!hNBjuE>NLVl2EwN!F+)0$R1S! zR|lF%n!9fkZ@gPW|x|B={V6x3`=jS*$Pu0+5OWf?wnIy>Y1MbbGSncpKO0qE(qO=ts z!~@&!N`10S593pVQu4FzpOh!tvg}p%zCU(aV5=~K#bKi zHdJ1>tQSrhW%KOky;iW+O_n;`l9~omqM%sdxdLtI`TrJzN6BQz+7xOl*rM>xVI2~# z)7FJ^Dc{DC<%~VS?@WXzuOG$YPLC;>#vUJ^MmtbSL`_yXtNKa$Hk+l-c!aC7gn(Cg ze?YPYZ(2Jw{SF6MiO5(%_pTo7j@&DHNW`|lD`~{iH+_eSTS&OC*2WTT*a`?|9w1dh zh1nh@$a}T#WE5$7Od~NvSEU)T(W$p$s5fe^GpG+7fdJ9=enRT9$wEk+ZaB>G3$KQO zgq?-rZZnIv!p#>Ty~}c*Lb_jxJg$eGM*XwHUwuQ|o^}b3^T6Bxx{!?va8aC@-xK*H ztJBFvFfsSWu89%@b^l3-B~O!CXs)I6Y}y#0C0U0R0WG zybjroj$io0j}3%P7zADXOwHwafT#uu*zfM!oD$6aJx7+WL%t-@6^rD_a_M?S^>c;z zMK580bZXo1f*L$CuMeM4Mp!;P@}b~$cd(s5*q~FP+NHSq;nw3fbWyH)i2)-;gQl{S zZO!T}A}fC}vUdskGSq&{`oxt~0i?0xhr6I47_tBc`fqaSrMOzR4>0H^;A zF)hX1nfHs)%Zb-(YGX;=#2R6C{BG;k=?FfP?9{_uFLri~-~AJ;jw({4MU7e*d)?P@ zXX*GkNY9ItFjhwgAIWq7Y!ksbMzfqpG)IrqKx9q{zu%Mdl+{Dis#p9q`02pr1LG8R z@As?eG!>IoROgS!@J*to<27coFc1zpkh?w=)h9CbYe%^Q!Ui46Y*HO0mr% zEff-*$ndMNw}H2a5@BsGj5oFfd!T(F&0$<{GO!Qdd?McKkorh=5{EIjDTHU`So>8V zBA-fqVLb2;u7UhDV1xMI?y>fe3~4urv3%PX)lDw+HYa;HFkaLqi4c~VtCm&Ca+9C~ zge+67hp#R9`+Euq59WhHX&7~RlXn=--m8$iZ~~1C8cv^2(qO#X0?vl91gzUKBeR1J z^p4!!&7)3#@@X&2aF2-)1Ffcc^F8r|RtdL2X%HgN&XU-KH2SLCbpw?J5xJ*!F-ypZ zMG%AJ!Pr&}`LW?E!K~=(NJxuSVTRCGJ$2a*Ao=uUDSys!OFYu!Vs2IT;xQ6EubLIl z+?+nMGeQQhh~??0!s4iQ#gm3!BpMpnY?04kK375e((Uc7B3RMj;wE?BCoQGu=UlZt!EZ1Q*auI)dj3Jj{Ujgt zW5hd~-HWBLI_3HuO) zNrb^XzPsTIb=*a69wAAA3J6AAZZ1VsYbIG}a`=d6?PjM)3EPaDpW2YP$|GrBX{q*! z$KBHNif)OKMBCFP5>!1d=DK>8u+Upm-{hj5o|Wn$vh1&K!lVfDB&47lw$tJ?d5|=B z^(_9=(1T3Fte)z^>|3**n}mIX;mMN5v2F#l(q*CvU{Ga`@VMp#%rQkDBy7kYbmb-q z<5!4iuB#Q_lLZ8}h|hPODI^U6`gzLJre9u3k3c#%86IKI*^H-@I48Bi*@avYm4v!n0+v zWu{M{&F8#p9cx+gF0yTB_<2QUrjMPo9*7^-uP#~gGW~y3nfPAoV%amgr>PSyVAd@l)}8#X zR5zV6t*uKJZL}?NYvPVK6J0v4iVpwiN|>+t3aYiZSp;m0!(1`bHO}TEtWR1tY%BPB z(W!0DmXbZAsT$iC13p4f>u*ZAy@JoLAkJhzFf1#4;#1deO8#8d&89}en&z!W&A3++^1(;>0SB1*54d@y&9Pn;^IAf3GiXbfT`_>{R+Xv; zQvgL>+0#8-laO!j#-WB~(I>l0NCMt_;@Gp_f0#^c)t?&#Xh1-7RR0@zPyBz!U#0Av zT?}n({(p?p7!4S2ZBw)#KdCG)uPnZe+U|0{BW!m)9 zi_9$F?m<`2!`JNFv+w8MK_K)qJ^aO@7-Ig>cM4-r0bi=>?B_2mFNJ}aE3<+QCzRr*NA!QjHw# z`1OsvcoD0?%jq{*7b!l|L1+Tw0TTAM4XMq7*ntc-Ived>Sj_ZtS|uVdpfg1_I9knY z2{GM_j5sDC7(W&}#s{jqbybqJWyn?{PW*&cQIU|*v8YGOKKlGl@?c#TCnmnAkAzV- zmK={|1G90zz=YUvC}+fMqts0d4vgA%t6Jhjv?d;(Z}(Ep8fTZfHA9``fdUHkA+z3+ zhh{ohP%Bj?T~{i0sYCQ}uC#5BwN`skI7`|c%kqkyWIQ;!ysvA8H`b-t()n6>GJj6xlYDu~8qX{AFo$Cm3d|XFL=4uvc?Keb zzb0ZmMoXca6Mob>JqkNuoP>B2Z>D`Q(TvrG6m`j}-1rGP!g|qoL=$FVQYxJQjFn33lODt3Wb1j8VR zlR++vIT6^DtYxAv_hxupbLLN3e0%A%a+hWTKDV3!Fjr^cWJ{scsAdfhpI)`Bms^M6 zQG$waKgFr=c|p9Piug=fcJvZ1ThMnNhQvBAg-8~b1?6wL*WyqXhtj^g(Ke}mEfZVM zJuLNTUVh#WsE*a6uqiz`b#9ZYg3+2%=C(6AvZGc=u&<6??!slB1a9K)=VL zY9EL^mfyKnD zSJyYBc_>G;5RRnrNgzJz#Rkn3S1`mZgO`(r5;Hw6MveN(URf_XS-r58Cn80K)ArH4 z#Rrd~LG1W&@ttw85cjp8xV&>$b%nSXH_*W}7Ch2pg$$c0BdEo-HWRTZcxngIBJad> z;C>b{jIXjb_9Jis?NZJsdm^EG}e*pR&DAy0EaSGi3XWTa(>C%tz1n$u?5Fb z1qtl?;_yjYo)(gB^iQq?=jusF%kywm?CJP~zEHi0NbZ);$(H$w(Hy@{i>$wcVRD_X|w-~(0Z9BJyh zhNh;+eQ9BEIs;tPz%jSVnfCP!3L&9YtEP;svoj_bNzeGSQIAjd zBss@A;)R^WAu-37RQrM%{DfBNRx>v!G31Z}8-El9IOJlb_MSoMu2}GDYycNaf>uny z+8xykD-7ONCM!APry_Lw6-yT>5!tR}W;W`C)1>pxSs5o1z#j7%m=&=7O4hz+Lsqm` z*>{+xsabZPr&X=}G@obTb{nPTkccJX8w3CG7X+1+t{JcMabv~UNv+G?txRqXib~c^Mo}`q{$`;EBNJ;#F*{gvS12kV?AZ%O0SFB$^ zn+}!HbmEj}w{Vq(G)OGAzH}R~kS^;(-s&=ectz8vN!_)Yl$$U@HNTI-pV`LSj7Opu zTZ5zZ)-S_{GcEQPIQXLQ#oMS`HPu{`SQiAZ)m1at*Hy%3xma|>o`h%E%8BEbi9p0r zVjcsh<{NBKQ4eKlXU|}@XJ#@uQw*$4BxKn6#W~I4T<^f99~(=}a`&3(ur8R9t+|AQ zWkQx7l}wa48-jO@ft2h+7qn%SJtL%~890FG0s5g*kNbL3I&@brh&f6)TlM`K^(bhr zJWM6N6x3flOw$@|C@kPi7yP&SP?bzP-E|HSXQXG>7gk|R9BTj`e=4de9C6+H7H7n# z#GJeVs1mtHhLDmVO?LkYRQc`DVOJ_vdl8VUihO-j#t=0T3%Fc1f9F73ufJz*adn*p zc%&vi(4NqHu^R>sAT_0EDjVR8bc%wTz#$;%NU-kbDyL_dg0%TFafZwZ?5KZpcuaO54Z9hX zD$u>q!-9`U6-D`E#`W~fIfiIF5_m6{fvM)b1NG3xf4Auw;Go~Fu7cth#DlUn{@~yu z=B;RT*dp?bO}o%4x7k9v{r=Y@^YQ^UUm(Qmliw8brO^=NP+UOohLYiaEB3^DB56&V zK?4jV61B|1Uj_5fBKW;8LdwOFZKWp)g{B%7g1~DgO&N& z#lisxf?R~Z@?3E$Mms$$JK8oe@X`5m98V*aV6Ua}8Xs2#A!{x?IP|N(%nxsH?^c{& z@vY&R1QmQs83BW28qAmJfS7MYi=h(YK??@EhjL-t*5W!p z^gYX!Q6-vBqcv~ruw@oMaU&qp0Fb(dbVzm5xJN%0o_^@fWq$oa3X?9s%+b)x4w-q5Koe(@j6Ez7V@~NRFvd zfBH~)U5!ix3isg`6be__wBJp=1@yfsCMw1C@y+9WYD9_C%{Q~7^0AF2KFryfLlUP# zwrtJEcH)jm48!6tUcxiurAMaiD04C&tPe6DI0#aoqz#Bt0_7_*X*TsF7u*zv(iEfA z;$@?XVu~oX#1YXtceQL{dSneL&*nDug^OW$DSLF0M1Im|sSX8R26&)<0Fbh^*l6!5wfSu8MpMoh=2l z^^0Sr$UpZp*9oqa23fcCfm7`ya2<4wzJ`Axt7e4jJrRFVf?nY~2&tRL* zd;6_njcz01c>$IvN=?K}9ie%Z(BO@JG2J}fT#BJQ+f5LFSgup7i!xWRKw6)iITjZU z%l6hPZia>R!`aZjwCp}I zg)%20;}f+&@t;(%5;RHL>K_&7MH^S+7<|(SZH!u zznW|jz$uA`P9@ZWtJgv$EFp>)K&Gt+4C6#*khZQXS*S~6N%JDT$r`aJDs9|uXWdbg zBwho$phWx}x!qy8&}6y5Vr$G{yGSE*r$^r{}pw zVTZKvikRZ`J_IJrjc=X1uw?estdwm&bEahku&D04HD+0Bm~q#YGS6gp!KLf$A{%Qd z&&yX@Hp>~(wU{|(#U&Bf92+1i&Q*-S+=y=3pSZy$#8Uc$#7oiJUuO{cE6=tsPhwPe| zxQpK>`Dbka`V)$}e6_OXKLB%i76~4N*zA?X+PrhH<&)}prET;kel24kW%+9))G^JI zsq7L{P}^#QsZViX%KgxBvEugr>ZmFqe^oAg?{EI=&_O#e)F3V#rc z8$4}0Zr19qd3tE4#$3_f=Bbx9oV6VO!d3(R===i-7p=Vj`520w0D3W6lQfY48}!D* z&)lZMG;~er2qBoI2gsX+Ts-hnpS~NYRDtPd^FPzn!^&yxRy#CSz(b&E*tL|jIkq|l zf%>)7Dtu>jCf`-7R#*GhGn4FkYf;B$+9IxmqH|lf6$4irg{0ept__%)V*R_OK=T06 zyT_m-o@Kp6U{l5h>W1hGq*X#8*y@<;vsOFqEjTQXFEotR+{3}ODDnj;o0@!bB5x=N z394FojuGOtVKBlVRLtHp%EJv_G5q=AgF)SKyRN5=cGBjDWv4LDn$IL`*=~J7u&Dy5 zrMc83y+w^F&{?X(KOOAl-sWZDb{9X9#jrQtmrEXD?;h-}SYT7yM(X_6qksM=K_a;Z z3u0qT0TtaNvDER_8x*rxXw&C^|h{P1qxK|@pS7vdlZ#P z7PdB7MmC2}%sdzAxt>;WM1s0??`1983O4nFK|hVAbHcZ3x{PzytQLkCVk7hA!Lo` zEJH?4qw|}WH{dc4z%aB=0XqsFW?^p=X}4xnCJXK%c#ItOSjdSO`UXJyuc8bh^Cf}8 z@Ht|vXd^6{Fgai8*tmyRGmD_s_nv~r^Fy7j`Bu`6=G)5H$i7Q7lvQnmea&TGvJp9a|qOrUymZ$6G|Ly z#zOCg++$3iB$!6!>215A4!iryregKuUT344X)jQb3|9qY>c0LO{6Vby05n~VFzd?q zgGZv&FGlkiH*`fTurp>B8v&nSxNz)=5IF$=@rgND4d`!AaaX;_lK~)-U8la_Wa8i?NJC@BURO*sUW)E9oyv3RG^YGfN%BmxzjlT)bp*$<| zX3tt?EAy<&K+bhIuMs-g#=d1}N_?isY)6Ay$mDOKRh z4v1asEGWoAp=srraLW^h&_Uw|6O+r;wns=uwYm=JN4Q!quD8SQRSeEcGh|Eb5Jg8m zOT}u;N|x@aq)=&;wufCc^#)5U^VcZw;d_wwaoh9$p@Xrc{DD6GZUqZ ziC6OT^zSq@-lhbgR8B+e;7_Giv;DK5gn^$bs<6~SUadiosfewWDJu`XsBfOd1|p=q zE>m=zF}!lObA%ePey~gqU8S6h-^J2Y?>7)L2+%8kV}Gp=h`Xm_}rlm)SyUS=`=S7msKu zC|T!gPiI1rWGb1z$Md?0YJQ;%>uPLOXf1Z>N~`~JHJ!^@D5kSXQ4ugnFZ>^`zH8CAiZmp z6Ms|#2gcGsQ{{u7+Nb9sA?U>(0e$5V1|WVwY`Kn)rsnnZ4=1u=7u!4WexZD^IQ1Jk zfF#NLe>W$3m&C^ULjdw+5|)-BSHwpegdyt9NYC{3@QtMfd8GrIWDu`gd0nv-3LpGCh@wgBaG z176tikL!_NXM+Bv#7q^cyn9$XSeZR6#!B4JE@GVH zoobHZN_*RF#@_SVYKkQ_igme-Y5U}cV(hkR#k1c{bQNMji zU7aE`?dHyx=1`kOYZo_8U7?3-7vHOp`Qe%Z*i+FX!s?6huNp0iCEW-Z7E&jRWmUW_ z67j>)Ew!yq)hhG4o?^z}HWH-e=es#xJUhDRc4B51M4~E-l5VZ!&zQq`gWe`?}#b~7w1LH4Xa-UCT5LXkXQWheBa2YJYbyQ zl1pXR%b(KCXMO0OsXgl0P0Og<{(@&z1aokU-Pq`eQq*JYgt8xdFQ6S z6Z3IFSua8W&M#`~*L#r>Jfd6*BzJ?JFdBR#bDv$_0N!_5vnmo@!>vULcDm`MFU823 zpG9pqjqz^FE5zMDoGqhs5OMmC{Y3iVcl>F}5Rs24Y5B^mYQ;1T&ks@pIApHOdrzXF z-SdX}Hf{X;TaSxG_T$0~#RhqKISGKNK47}0*x&nRIPtmdwxc&QT3$8&!3fWu1eZ_P zJveQj^hJL#Sn!*4k`3}(d(aasl&7G0j0-*_2xtAnoX1@9+h zO#c>YQg60Z;o{Bi=3i7S`Ic+ZE>K{(u|#)9y}q*j8uKQ1^>+(BI}m%1v3$=4ojGBc zm+o1*!T&b}-lVvZqIUBc8V}QyFEgm#oyIuC{8WqUNV{Toz`oxhYpP!_p2oHHh5P@iB*NVo~2=GQm+8Yrkm2Xjc_VyHg1c0>+o~@>*Qzo zHVBJS>$$}$_4EniTI;b1WShX<5-p#TPB&!;lP!lBVBbLOOxh6FuYloD%m;n{r|;MU3!q4AVkua~fieeWu2 zQAQ$ue(IklX6+V;F1vCu-&V?I3d42FgWgsb_e^29ol}HYft?{SLf>DrmOp9o!t>I^ zY7fBCk+E8n_|apgM|-;^=#B?6RnFKlN`oR)`e$+;D=yO-(U^jV;rft^G_zl`n7qnM zL z*-Y4Phq+ZI1$j$F-f;`CD#|`-T~OM5Q>x}a>B~Gb3-+9i>Lfr|Ca6S^8g*{*?_5!x zH_N!SoRP=gX1?)q%>QTY!r77e2j9W(I!uAz{T`NdNmPBBUzi2{`XMB^zJGGwFWeA9 z{fk33#*9SO0)DjROug+(M)I-pKA!CX;IY(#gE!UxXVsa)X!UftIN98{pt#4MJHOhY zM$_l}-TJlxY?LS6Nuz1T<44m<4i^8k@D$zuCPrkmz@sdv+{ciyFJG2Zwy&%c7;atIeTdh!a(R^QXnu1Oq1b42*OQFWnyQ zWeQrdvP|w_idy53Wa<{QH^lFmEd+VlJkyiC>6B#s)F;w-{c;aKIm;Kp50HnA-o3lY z9B~F$gJ@yYE#g#X&3ADx&tO+P_@mnQTz9gv30_sTsaGXkfNYXY{$(>*PEN3QL>I!k zp)KibPhrfX3%Z$H6SY`rXGYS~143wZrG2;=FLj50+VM6soI~up_>fU(2Wl@{BRsMi zO%sL3x?2l1cXTF)k&moNsHfQrQ+wu(gBt{sk#CU=UhrvJIncy@tJX5klLjgMn>~h= zg|FR&;@eh|C7`>s_9c~0-{IAPV){l|Ts`i=)AW;d9&KPc3fMeoTS%8@V~D8*h;&(^>yjT84MM}=%#LS7shLAuuj(0VAYoozhWjq z4LEr?wUe2^WGwdTIgWBkDUJa>YP@5d9^Rs$kCXmMRxuF*YMVrn?0NFyPl}>`&dqZb z<5eqR=ZG3>n2{6v6BvJ`YBZeeTtB88TAY(x0a58EWyuf>+^|x8Qa6wA|1Nb_p|nA zWWa}|z8a)--Wj`LqyFk_a3gN2>5{Rl_wbW?#by7&i*^hRknK%jwIH6=dQ8*-_{*x0j^DUfMX0`|K@6C<|1cgZ~D(e5vBFFm;HTZF(!vT8=T$K+|F)x3kqzBV4-=p1V(lzi(s7jdu0>LD#N=$Lk#3HkG!a zIF<7>%B7sRNzJ66KrFV76J<2bdYhxll0y2^_rdG=I%AgW4~)1Nvz=$1UkE^J%BxLo z+lUci`UcU062os*=`-j4IfSQA{w@y|3}Vk?i;&SSdh8n+$iHA#%ERL{;EpXl6u&8@ zzg}?hkEOUOJt?ZL=pWZFJ19mI1@P=$U5*Im1e_8Z${JsM>Ov?nh8Z zP5QvI!{Jy@&BP48%P2{Jr_VgzW;P@7)M9n|lDT|Ep#}7C$&ud&6>C^5ZiwKIg2McPU(4jhM!BD@@L(Gd*Nu$ji(ljZ<{FIeW_1Mmf;76{LU z-ywN~=uNN)Xi6$<12A9y)K%X|(W0p|&>>4OXB?IiYr||WKDOJPxiSe01NSV-h24^L z_>m$;|C+q!Mj**-qQ$L-*++en(g|hw;M!^%_h-iDjFHLo-n3JpB;p?+o2;`*jpvJU zLY^lt)Un4joij^^)O(CKs@7E%*!w>!HA4Q?0}oBJ7Nr8NQ7QmY^4~jvf0-`%waOLn zdNjAPaC0_7c|RVhw)+71NWjRi!y>C+Bl;Z`NiL^zn2*0kmj5gyhCLCxts*cWCdRI| zjsd=sT5BVJc^$GxP~YF$-U{-?kW6r@^vHXB%{CqYzU@1>dzf#3SYedJG-Rm6^RB7s zGM5PR(yKPKR)>?~vpUIeTP7A1sc8-knnJk*9)3t^e%izbdm>Y=W{$wm(cy1RB-19i za#828DMBY+ps#7Y8^6t)=Ea@%Nkt)O6JCx|ybC;Ap}Z@Zw~*}3P>MZLPb4Enxz9Wf zssobT^(R@KuShj8>@!1M7tm|2%-pYYDxz-5`rCbaTCG5{;Uxm z*g=+H1X8{NUvFGzz~wXa%Eo};I;~`37*WrRU&K0dPSB$yk(Z*@K&+mFal^?c zurbqB-+|Kb5|sznT;?Pj!+kgFY1#Dr;_%A(GIQC{3ct|{*Bji%FNa6c-thbpBkA;U zURV!Dr&X{0J}iht#-Qp2=xzuh(fM>zRoiGrYl5ttw2#r34gC41CCOC31m~^UPTK@s z6;A@)7O7_%C)>bnAXerYuAHdE93>j2N}H${zEc6&SbZ|-fiG*-qtGuy-qDelH(|u$ zorf8_T6Zqe#Ub!+e3oSyrskt_HyW_^5lrWt#30l)tHk|j$@YyEkXUOV;6B51L;M@=NIWZXU;GrAa(LGxO%|im%7F<-6N;en0Cr zLH>l*y?pMwt`1*cH~LdBPFY_l;~`N!Clyfr;7w<^X;&(ZiVdF1S5e(+Q%60zgh)s4 zn2yj$+mE=miVERP(g8}G4<85^-5f@qxh2ec?n+$A_`?qN=iyT1?U@t?V6DM~BIlBB z>u~eXm-aE>R0sQy!-I4xtCNi!!qh?R1!kKf6BoH2GG{L4%PAz0{Sh6xpuyI%*~u)s z%rLuFl)uQUCBQAtMyN;%)zFMx4loh7uTfKeB2Xif`lN?2gq6NhWhfz0u5WP9J>=V2 zo{mLtSy&BA!mSzs&CrKWq^y40JF5a&GSXIi2= z{EYb59J4}VwikL4P=>+mc6{($FNE@e=VUwG+KV21;<@lrN`mnz5jYGASyvz7BOG_6(p^eTxD-4O#lROgon;R35=|nj#eHIfJBYPWG>H>`dHKCDZ3`R{-?HO0mE~(5_WYcFmp8sU?wr*UkAQiNDGc6T zA%}GOLXlOWqL?WwfHO8MB#8M8*~Y*gz;1rWWoVSXP&IbKxbQ8+s%4Jnt?kDsq7btI zCDr0PZ)b;B%!lu&CT#RJzm{l{2fq|BcY85`w~3LSK<><@(2EdzFLt9Y_`;WXL6x`0 zDoQ?=?I@Hbr;*VVll1Gmd8*%tiXggMK81a+T(5Gx6;eNb8=uYn z5BG-0g>pP21NPn>$ntBh>`*})Fl|38oC^9Qz>~MAazH%3Q~Qb!ALMf$srexgPZ2@&c~+hxRi1;}+)-06)!#Mq<6GhP z-Q?qmgo${aFBApb5p}$1OJKTClfi8%PpnczyVKkoHw7Ml9e7ikrF0d~UB}i3vizos zXW4DN$SiEV9{faLt5bHy2a>33K%7Td-n5C*N;f&ZqAg#2hIqEb(y<&f4u5BWJ>2^4 z414GosL=Aom#m&=x_v<0-fp1r%oVJ{T-(xnomNJ(Dryv zh?vj+%=II_nV+@NR+(!fZZVM&(W6{6%9cm+o+Z6}KqzLw{(>E86uA1`_K$HqINlb1 zKelh3-jr2I9V?ych`{hta9wQ2c9=MM`2cC{m6^MhlL2{DLv7C^j z$xXBCnDl_;l|bPGMX@*tV)B!c|4oZyftUlP*?$YU9C_eAsuVHJ58?)zpbr30P*C`T z7y#ao`uE-SOG(Pi+`$=e^mle~)pRrdwL5)N;o{gpW21of(QE#U6w%*C~`v-z0QqBML!!5EeYA5IQB0 z^l01c;L6E(iytN!LhL}wfwP7W9PNAkb+)Cst?qg#$n;z41O4&v+8-zPs+XNb-q zIeeBCh#ivnFLUCwfS;p{LC0O7tm+Sf9Jn)~b%uwP{%69;QC)Ok0t%*a5M+=;y8j=v z#!*pp$9@!x;UMIs4~hP#pnfVc!%-D<+wsG@R2+J&%73lK|2G!EQC)O05TCV=&3g)C!lT=czLpZ@Sa%TYuoE?v8T8`V;e$#Zf2_Nj6nvBgh1)2 GZ~q4|mN%#X literal 61624 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�Zy z^6AJh1X3pXq!CBB#`$5K8SM`A8- zu91@KW`jScvm}!^xaOr;l$}&)!qA=c4=tjb*AM^d9ZpDQjv*NDBXOUm9fM235A&Im zWb|jcBV^{}f>q*lY$s)A{g3K~i*dC}iz|ddMG+h2%gJJkYA%43!xj8A# zx}S=RPcxSSrC^je-O9-uG*4zN`%yO%D|8Y(M!;etj}#5<%)tweodG864mERu+wUwi zqO?7XNoGj5REy(>@FR?cmjdtzHh0Uyxc{bl7pq)x$iETy-gSOl4<=ay@B=!9(wjJhfW}ymgfT)tNU6b0S)wq zMeKw$AI+3w&@(KkXo2zZi+rD-;<`>S;(xh}N&A!yleW!DXaff`xq(&MU0v$=thsf{ zg(^n}x}gz%(ZMmnHv?lM149>hnCRcQl$2k+_R4YyxfW?lIfN`D`XCfH^dukp(N-@j zMOjDZSdpW2Zto4Xiwh$>MX#mx)#OxcM|qz7llutxlZ_J1E-I`Y&pzh)RfL03EK;d5 zsT1+B_S@MLCz)zQys)rDnV4a5!lT8<#kf<49)lNk;@0XW#dWoeCWlSU+e{zMyS1wNXB%6Un^?S8n~Jr%mk_^NT02xU zcTMjr6I|wbWAcf|&V@-_UA*XcHhl7mB~=D;T8nHdVRQX{LQT~{H7`n|hq82!6^^Qw zk3=bdrx(+2sKb?>S1*r#`#OK-jkDlW+^JkfcM1$YFJ9fi*s(8+3Ci?UHN7bY? zh4N;Ruf^YWl3Qug_Tt8ssOAr0u~l&@T3xKa)~WpBgpn}4a($+RfpKJts{-~X3lBbV zc}00$dp*~Rd#{MEJ)=}o%Ba+MxXj)G#S95An)W3pi<`?g$LYqs4y$@&P;h2dic|#Y zLG)4ki^^AYUpsZAtoN-`*PqRPm+BW{Sv93rQm8yHt2BO(SDmGJrDwCJ{h{LXJS+K? zT1`EUhgnKGwTy3CHN7c~OstGDJK;&0nUisI+TC|(NNeXbcpIy&DJ~-gy%PgMJwLdo zM-N=_#u(Fd`$DV<|BjAmhg*xPy8UhsziP>UzRJia${pQz)OyY|sn2Gsb@F5HMbeG4MJ)A6 zip8_D9EG_-mY)rt>E9tGKb6fE<=v;PY4-MR6_G!&r%+)@O^Sbo&N-QmW{8WLEyL}XI25|Lqcq;31FtfOg)YjO+kPkZx<1Xmr5EtjPCpi(FSH)6*cL~Wd3u@NkeeRsqV;PX~8DoAyr~*@QZEkWN8=j68 zK#oirFgtzpre!U$S(>lCULpEEsv^+Ew$A>6ZcsaAzLnn&J!{=Ke|!u)B`dFIl( z?vlF5euE?z5|cU)OPbl|@}Y3*ZkOOxEGXmrJOU-KoLFT{TuqWvZCG2==*;<06n)skW(dvAJ*9=S9v^7qHS$`Dl`eJ81@Mlj~ z%Bo)zV6lv$?7RyQZk6arskVWO0fvBrre8Jb*1R-cnz|i~~_ZLzp^Z zdUn~P6=9O$!Q)VJRz{VIA?$9b0acoc>g7?zFWpmZ`LCh`ie2bgsRy+C*Kf9A&<|h` zsZ76F{`l!LU2>tQjr$3#kYM{%d`Isn`WyaKUjrDwRSP0!kYpX9^R#RX!bjqmXkl!N zs))gf1ol~L3Xef4B?`<1GD_lBnuW{~+??9GRAgt)(@DZTFH|4Pb1o4CG6_f6rtEL@s<5ctjNIRvCMi=l?B-P+D8i*$H^-jz8Z{US(1{-DrHKNdc1xhp*${Nt%oj8oK2`gW#Eln z_W0bDj>|ck)XEBq1P`QeJDFebd}11SLV)K$4t+l=Q{P6MQl7?TD{C;U&*dbLVA^+O|OPt6jn6n7E<+DFOlud1?|k`TpU64 z;$jlu4;R1(yvFk@WgytV_g~pmB`+$<$!chFsmh@uY-a&yhCdS66WdAK#PQ(!wie!> za^US|K-U#D3pwGEmZaAO5FGbBetWB&z!hL(Y#21lO< z==S{#=CQN3-q!B>xq*jTqmfoF$8F`mZFNt^eYl~ZfNo4ZesiHf6ckDWcr$E=Jljnf2>9=rB~7>G4$a`w_O`ZQ>r=(b4ho+AfwCzm=D{`` zxKUQ313J(GXdjVXY;es$Y=PrSl(Ox@gV<_27CbzWPkyI|JZNrZP?!DnC<2`dh3H?f zl1?xeTOery;+#Pp_VzDOo33PR@(U$^hXMHgO(zGQ-u@f@FXqv(zXpH6P(7H2 z_BZ4J^&wCtEkGBMvvP8VYq*&1nE&7&Q|V%yoCd7S0*oDU|z z;;3i(25RC0#+>LbI=E&a?3fNgAO*FscLLGy4pEgQ+a;py{$7t;FDno1Gd|q8GdaBptjT1bT9H=(4$xg(a^;9al$zc!KrKq zG}eBa?`J81tSKCNupu9b9huAk)ms5{`wf}KcL*v~D`#g=p`T=682*7N*bv<$7ceyg zru~&l5j+Ib4uzYE6ZEf@!Y__6tN~QHfa>f%`(*+Ln!mQ$PpZE)QXFUfR5qAR(m^-e zcFWmK8Hh44whl@1*Qy9}vM%I+s+5DNeg8-*21Yz2%g21|mWF5LAD))kxG9Vie$C1GCQds%bZ6Ads?$z`tU5 z?SB|JXQy=zH6(LHy8kTU;v!ohrDI+JF=6#HPj6L z|5+8_zB(ti&9ez=A-s>L*YYw(a_ang3D#00_4+d%7%~TH_MtMMYJ%-CwE6y#;b4P%poCH0gPXelM>tU415{2?ON$z{cn`ie z;z0Pn#V|%CK#d2vM=<>0K!X2{4v7kl8m4a#Iw|o$Xq2FRsCcNs@b>U-CLN5oKQtaH z9%}rWJv`>@KjQr!%?1_vJW5cJJ?QzIKS3Yd$56fS_t3Dxe#5^OH@lP3zkTvii-zhZ zy$4p>cp%t5huZ&gnnqa?_nIo@#~ChARYp9>ReiBVku_RyDJ v9f-cOr*eQp04g-<;pZOo<=#I*?>`DvQ^o}A^zD`USu`GEG&HBt?O*=~soeXc diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c7d437bbb..9355b4155 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d6..f5feea6d6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,10 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +134,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 6689b85be..9b42019c7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/json/build.gradle b/json/build.gradle index 9e7b6e880..ac83ab3c3 100644 --- a/json/build.gradle +++ b/json/build.gradle @@ -18,11 +18,13 @@ dependencies { implementation libs.grails.encoder implementation libs.groovy.core implementation libs.groovy.json + implementation libs.jakarta.validation.api testImplementation libs.grails.testing.support.core testImplementation libs.grails.testing.support.gorm testImplementation libs.grails.datastore.gorm.hibernate5 testImplementation libs.spock.core + testImplementation libs.jackson.databind testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task } diff --git a/json/src/main/groovy/grails/plugin/json/builder/JsonOutput.java b/json/src/main/groovy/grails/plugin/json/builder/JsonOutput.java index 06b3be316..6f7e284ec 100644 --- a/json/src/main/groovy/grails/plugin/json/builder/JsonOutput.java +++ b/json/src/main/groovy/grails/plugin/json/builder/JsonOutput.java @@ -28,7 +28,7 @@ import org.apache.groovy.json.internal.Chr; import org.grails.buffer.FastStringWriter; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.*; import java.net.URL; import java.util.*; diff --git a/json/src/main/groovy/grails/plugin/json/renderer/AbstractJsonViewContainerRenderer.groovy b/json/src/main/groovy/grails/plugin/json/renderer/AbstractJsonViewContainerRenderer.groovy index ff8595420..093636697 100644 --- a/json/src/main/groovy/grails/plugin/json/renderer/AbstractJsonViewContainerRenderer.groovy +++ b/json/src/main/groovy/grails/plugin/json/renderer/AbstractJsonViewContainerRenderer.groovy @@ -19,8 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired */ @CompileStatic @InheritConstructors -abstract class AbstractJsonViewContainerRenderer extends DefaultJsonRenderer implements ContainerRenderer { - +abstract class AbstractJsonViewContainerRenderer extends DefaultJsonRenderer { @Autowired JsonViewResolver jsonViewResolver diff --git a/json/src/main/groovy/grails/plugin/json/view/mvc/JsonViewResolver.groovy b/json/src/main/groovy/grails/plugin/json/view/mvc/JsonViewResolver.groovy index c7702afe9..15459d67b 100644 --- a/json/src/main/groovy/grails/plugin/json/view/mvc/JsonViewResolver.groovy +++ b/json/src/main/groovy/grails/plugin/json/view/mvc/JsonViewResolver.groovy @@ -13,7 +13,7 @@ import groovy.transform.CompileStatic import org.springframework.beans.factory.annotation.Autowired import org.springframework.validation.Errors -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct /** * @author Graeme Rocher * @since 1.0 diff --git a/json/src/main/groovy/grails/plugin/json/view/test/JsonViewTest.groovy b/json/src/main/groovy/grails/plugin/json/view/test/JsonViewTest.groovy index 53d2455d6..f9f4e9196 100644 --- a/json/src/main/groovy/grails/plugin/json/view/test/JsonViewTest.groovy +++ b/json/src/main/groovy/grails/plugin/json/view/test/JsonViewTest.groovy @@ -6,6 +6,7 @@ import grails.plugin.json.view.JsonViewTemplateEngine import grails.plugin.json.view.api.JsonView import grails.plugin.json.view.api.jsonapi.DefaultJsonApiIdRenderer import grails.plugin.json.view.api.jsonapi.JsonApiIdRenderStrategy +import grails.util.GrailsMessageSourceUtils import grails.views.api.HttpView import grails.views.api.http.Response import grails.web.mapping.LinkGenerator @@ -16,6 +17,7 @@ import groovy.transform.CompileStatic import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingContext import org.grails.datastore.mapping.model.MappingContext import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Qualifier import org.springframework.context.MessageSource import org.springframework.context.support.StaticMessageSource import org.springframework.http.HttpStatus @@ -30,9 +32,17 @@ import org.springframework.http.HttpStatus @CompileStatic trait JsonViewTest { - @Autowired(required = false) MessageSource messageSource = new StaticMessageSource() + @Autowired(required = false) + setMessageSource(List messageSources) { + setMessageSource(GrailsMessageSourceUtils.findPreferredMessageSource(messageSources)) + } + + void setMessageSource(MessageSource messageSource) { + this.messageSource = messageSource + } + @Autowired(required = false) MappingContext mappingContext = { def ctx = new KeyValueMappingContext("test") diff --git a/json/src/test/groovy/grails/plugin/json/view/EmbeddedAssociationsSpec.groovy b/json/src/test/groovy/grails/plugin/json/view/EmbeddedAssociationsSpec.groovy index 4fa7ed9e4..82b9af7d8 100644 --- a/json/src/test/groovy/grails/plugin/json/view/EmbeddedAssociationsSpec.groovy +++ b/json/src/test/groovy/grails/plugin/json/view/EmbeddedAssociationsSpec.groovy @@ -1,104 +1,159 @@ package grails.plugin.json.view +import com.fasterxml.jackson.databind.ObjectMapper import grails.gorm.annotation.Entity import grails.plugin.json.view.test.JsonViewTest import org.grails.testing.GrailsUnitTest import spock.lang.Issue +import spock.lang.Shared import spock.lang.Specification class EmbeddedAssociationsSpec extends Specification implements JsonViewTest, GrailsUnitTest { - void "Test render domain object with embedded associations"() { - given:"A domain class with embedded associations" + @Shared + ObjectMapper objectMapper = new ObjectMapper() + + void 'Test render domain object with embedded associations'() { + given: 'A domain class with embedded associations' mappingContext.addPersistentEntities(Person) - Person p = new Person(name:"Robert") - p.homeAddress = new Address(postCode: "12345") - p.otherAddresses = [new Address(postCode: "6789"), new Address(postCode: "54321")] + def p = new Person(name: 'Robert') + p.homeAddress = new Address(postCode: '12345') + p.otherAddresses = [new Address(postCode: '6789'), new Address(postCode: '54321')] p.nickNames = ['Rob','Bob'] - when:"A an instance with embedded assocations is rendered" + when: 'A an instance with embedded associations is rendered' def result = render(''' -import grails.plugin.json.view.* - -model { - Person person -} -json g.render(person) -''', [person:p]) - - then:"The result is correct" - result.jsonText == '{"otherAddresses":[{"postCode":"6789"},{"postCode":"54321"}],"name":"Robert","nickNames":["Rob","Bob"],"homeAddress":{"postCode":"12345"}}' + import grails.plugin.json.view.* + + model { + Person person + } + json g.render(person) + + ''', [person: p]) + + then: 'The result is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "otherAddresses": [ + {"postCode": "6789"}, + {"postCode": "54321"} + ], + "name": "Robert", + "nickNames": ["Rob", "Bob"], + "homeAddress": {"postCode": "12345"} + } + ''') } - void "Test render domain object with embedded associations in json api"() { - given:"A domain class with embedded associations" + void 'Test render domain object with embedded associations in json api'() { + given: 'A domain class with embedded associations' mappingContext.addPersistentEntities(Person) - Person p = new Person(name:"Robert") + def p = new Person(name: 'Robert') p.id = 2 - p.homeAddress = new Address(postCode: "12345") - p.otherAddresses = [new Address(postCode: "6789"), new Address(postCode: "54321")] - p.nickNames = ['Rob','Bob'] + p.homeAddress = new Address(postCode: '12345') + p.otherAddresses = [new Address(postCode: '6789'), new Address(postCode: '54321')] + p.nickNames = ['Rob', 'Bob'] - when:"A an instance with embedded assocations is rendered" + when: 'A an instance with embedded assocations is rendered' def result = render(''' -import grails.plugin.json.view.* - -model { - Person person -} -json jsonapi.render(person) -''', [person:p]) - - then:"The result is correct" - result.jsonText == '''{"data":{"type":"person","id":"2","attributes":{"otherAddresses":[{"postCode":"6789"},{"postCode":"54321"}],"name":"Robert","nickNames":["Rob","Bob"],"homeAddress":{"postCode":"12345"}}},"links":{"self":"/person/2"}}''' - + import grails.plugin.json.view.* + + model { + Person person + } + json jsonapi.render(person) + ''', [person: p]) + + then: 'The result is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "person", + "id": "2", + "attributes": { + "otherAddresses": [ + {"postCode": "6789"}, + {"postCode": "54321"} + ], + "name": "Robert", + "nickNames": ["Rob", "Bob"], + "homeAddress": { + "postCode": "12345" + } + } + }, + "links": { + "self": "/person/2" + } + } + ''') } - @Issue("https://github.com/grails/grails-views/issues/171") + @Issue('https://github.com/grails/grails-views/issues/171') void 'test render domain object with embedded associations and include'() { given: 'a domain class with embedded associations' mappingContext.addPersistentEntities(Person) - Person p = new Person(name:"Robert") - p.homeAddress = new Address(postCode: "12345") - p.otherAddresses = [new Address(postCode: "6789"), new Address(postCode: "54321")] - p.nickNames = ['Rob','Bob'] + def p = new Person(name: 'Robert') + p.homeAddress = new Address(postCode: '12345') + p.otherAddresses = [new Address(postCode: '6789'), new Address(postCode: '54321')] + p.nickNames = ['Rob', 'Bob'] when: 'an instance with embedded associations is rendered' def result = render(''' -import grails.plugin.json.view.* - -model { - Person person -} -json g.render(person, [includes: ['name', 'homeAddress']]) -''', [person:p]) + import grails.plugin.json.view.* + + model { + Person person + } + json g.render(person, [includes: ['name', 'homeAddress']]) + ''', [person: p]) then: 'the result is correct' - result.jsonText == '{"name":"Robert","homeAddress":{"postCode":"12345"}}' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "name": "Robert", + "homeAddress": {"postCode": "12345"} + } + ''') } - @Issue("https://github.com/grails/grails-views/issues/171") + @Issue('https://github.com/grails/grails-views/issues/171') void 'test render domain object with embedded associations and include in json api'() { given: 'a domain class with embedded associations' mappingContext.addPersistentEntities(Person) - Person p = new Person(name:"Robert") + def p = new Person(name: 'Robert') p.id = 4 - p.homeAddress = new Address(postCode: "12345") - p.otherAddresses = [new Address(postCode: "6789"), new Address(postCode: "54321")] - p.nickNames = ['Rob','Bob'] + p.homeAddress = new Address(postCode: '12345') + p.otherAddresses = [new Address(postCode: '6789'), new Address(postCode: '54321')] + p.nickNames = ['Rob', 'Bob'] when: 'an instance with embedded associations is rendered' def result = render(''' -import grails.plugin.json.view.* - -model { - Person person -} -json jsonapi.render(person, [includes: ['name', 'homeAddress']]) -''', [person:p]) + import grails.plugin.json.view.* + + model { + Person person + } + json jsonapi.render(person, [includes: ['name', 'homeAddress']]) + ''', [person: p]) then: 'the result is correct' - result.jsonText == '''{"data":{"type":"person","id":"4","attributes":{"name":"Robert","homeAddress":{"postCode":"12345"}}},"links":{"self":"/person/4"}}''' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "person", + "id": "4", + "attributes": { + "name": "Robert", + "homeAddress": {"postCode": "12345"} + } + }, + "links": { + "self": "/person/4" + } + } + ''') } } @@ -110,6 +165,7 @@ class Person { List

    otherAddresses = [] List nickNames = [] + @SuppressWarnings('unused') static embedded = ['homeAddress', 'otherAddresses'] } diff --git a/json/src/test/groovy/grails/plugin/json/view/ExpandSpec.groovy b/json/src/test/groovy/grails/plugin/json/view/ExpandSpec.groovy index f7eac942e..f7d2a20c5 100644 --- a/json/src/test/groovy/grails/plugin/json/view/ExpandSpec.groovy +++ b/json/src/test/groovy/grails/plugin/json/view/ExpandSpec.groovy @@ -1,125 +1,233 @@ package grails.plugin.json.view +import com.fasterxml.jackson.databind.ObjectMapper import grails.plugin.json.view.test.JsonRenderResult import grails.plugin.json.view.test.JsonViewTest import org.grails.datastore.mapping.core.Session import org.grails.testing.GrailsUnitTest +import spock.lang.Shared import spock.lang.Specification class ExpandSpec extends Specification implements JsonViewTest, GrailsUnitTest { + @Shared + ObjectMapper objectMapper = new ObjectMapper() + void setup() { mappingContext.addPersistentEntities(Team, Player) } - void "Test expand parameter allows expansion of child associations"() { - given:"A entity with a proxy association" + void 'Test expand parameter allows expansion of child associations'() { + given: 'An entity with a proxy association' def mockSession = Mock(Session) mockSession.getMappingContext() >> mappingContext - mockSession.retrieve(Team, 1L) >> new Team(name: "Manchester United") + mockSession.retrieve(Team, 1L) >> new Team(name: 'Manchester United') def teamProxy = mappingContext.proxyFactory.createProxy(mockSession, Team, 1L) - Player player = new Player(name: "Cantona", team: teamProxy) + def player = new Player(name: 'Cantona', team: teamProxy) def templateText = ''' -import grails.plugin.json.view.* - -@Field Player player - -json g.render(player) -''' - when:"The domain is rendered" - def result = render(templateText, [player:player]) - - then:"The result doesn't include the proxied association" - result.jsonText == '{"team":{"id":1},"name":"Cantona"}' - - when:"The domain is rendered with expand parameters" + import grails.plugin.json.view.* + + @Field Player player + + json g.render(player) + ''' + + when: 'The domain is rendered' + def result = render(templateText, [player: player]) + + then: 'The result does not include the proxied association' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "team": { "id": 1 }, + "name": "Cantona" + } + ''') + + when: 'The domain is rendered with expand parameters' result = render(templateText, [player:player]) { - params expand:'team' + params(expand: 'team') } - then:"The association is expanded" - result.jsonText == '{"team":{"id":1,"name":"Manchester United"},"name":"Cantona"}' + then: 'The association is expanded' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "team": { + "id": 1, + "name": "Manchester United" + }, + "name": "Cantona" + } + ''') } - void "Test expand parameter on nested property"() { + void 'Test expand parameter on nested property'() { + given: 'An entity with a proxy association' def mockSession = Mock(Session) mockSession.getMappingContext() >> mappingContext - mockSession.retrieve(Team, 1L) >> new Team(name: "Manchester United") + mockSession.retrieve(Team, 1L) >> new Team(name: 'Manchester United') def teamProxy = mappingContext.proxyFactory.createProxy(mockSession, Team, 1L) - Player player = new Player(name: "Cantona", team: teamProxy) + def player = new Player(name: 'Cantona', team: teamProxy) def templateText = ''' -import grails.plugin.json.view.* - -@Field Map map - -json g.render(map) -''' - - when:"The domain is rendered with expand parameters" + import grails.plugin.json.view.* + + @Field Map map + + json g.render(map) + ''' + + when: 'The domain is rendered with expand parameters' def result = render(templateText, [map: [player:player]]) { - params expand:'player.team' + params(expand: 'player.team') } - then:"The association is expanded" - result.jsonText == '{"player":{"team":{"id":1,"name":"Manchester United"},"name":"Cantona"}}' + then: 'The association is expanded' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "player": { + "team": { + "id": 1, + "name": "Manchester United" + }, + "name": "Cantona" + } + } + ''') } - void "Test expand parameter allows expansion of child associations with HAL"() { - - given:"A entity with a proxy association" + void 'Test expand parameter allows expansion of child associations with HAL'() { + given: 'An entity with a proxy association' def mockSession = Mock(Session) mockSession.getMappingContext() >> mappingContext - mockSession.retrieve(Team, 1L) >> new Team(name: "Manchester United") + mockSession.retrieve(Team, 1L) >> new Team(name: 'Manchester United') def teamProxy = mappingContext.proxyFactory.createProxy(mockSession, Team, 1L) - Player player = new Player(name: "Cantona", team: teamProxy) + def player = new Player(name: 'Cantona', team: teamProxy) def templateText = ''' -import grails.plugin.json.view.* -model { - Player player -} -json hal.render(player) -''' - when:"The domain is rendered" - def result = render(templateText, [player:player]) - - then:"The result doesn't include the proxied association" - result.jsonText == '{"_links":{"self":{"href":"http://localhost:8080/player","hreflang":"en","type":"application/hal+json"}},"name":"Cantona"}' - - when:"The domain is rendered with expand parameters" - result = render(templateText, [player:player]) { - params expand:'team' + import grails.plugin.json.view.* + model { + Player player + } + json hal.render(player) + ''' + + when: 'The domain is rendered' + def result = render(templateText, [player: player]) + + then: 'The result does not include the proxied association' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_links": { + "self": { + "href": "http://localhost:8080/player", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Cantona" + } + ''') + + when: 'The domain is rendered with expand parameters' + result = render(templateText, [player: player]) { + params(expand: 'team') } - then:"The association is expanded" - result.jsonText == '{"_embedded":{"team":{"_links":{"self":{"href":"http://localhost:8080/team/1","hreflang":"en","type":"application/hal+json"}},"name":"Manchester United"}},"_links":{"self":{"href":"http://localhost:8080/player","hreflang":"en","type":"application/hal+json"}},"name":"Cantona"}' + then: 'The association is expanded' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_embedded": { + "team": { + "_links": { + "self": { + "href": "http://localhost:8080/team/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Manchester United" + } + }, + "_links": { + "self": { + "href": "http://localhost:8080/player", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Cantona" + } + ''') } void 'Test expand parameter allows expansion of child associations with JSON API'() { - given: + given: 'An entity with a proxy association' def mockSession = Mock(Session) mockSession.getMappingContext() >> mappingContext - mockSession.retrieve(Team, 9L) >> new Team(name: "Manchester United") + mockSession.retrieve(Team, 9L) >> new Team(name: 'Manchester United') def teamProxy = mappingContext.proxyFactory.createProxy(mockSession, Team, 9L) - Player player = new Player(name: "Cantona", team: teamProxy) + def player = new Player(name: 'Cantona', team: teamProxy) player.id = 3 - - when: + when: 'The domain is rendered with expand parameters' JsonRenderResult result = render(''' -import grails.plugin.json.view.* -model { - Player player -} - -json jsonapi.render(player, [expand: 'team']) -''', [player: player]) + import grails.plugin.json.view.* + model { + Player player + } + + json jsonapi.render(player, [expand: 'team']) + ''', [player: player]) then: 'The JSON relationships are in place' - result.jsonText == '{"data":{"type":"player","id":"3","attributes":{"name":"Cantona"},"relationships":{"team":{"links":{"self":"/team/9"},"data":{"type":"team","id":"9"}}}},"links":{"self":"/player/3"},"included":[{"type":"team","id":"9","attributes":{"titles":null,"name":"Manchester United"},"relationships":{"players":{"data":[]},"captain":{"data":null}},"links":{"self":"/team/9"}}]}' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "player", + "id": "3", + "attributes": { + "name": "Cantona" + }, + "relationships": { + "team": { + "links": { + "self": "/team/9" + }, + "data": { + "type": "team", + "id": "9" + } + } + } + }, + "links": { + "self": "/player/3" + }, + "included": [ + { + "type":"team", + "id": "9", + "attributes": { + "titles": null, + "name": "Manchester United" + }, + "relationships": { + "players": { + "data":[] + }, + "captain": { + "data":null + } + }, + "links": { + "self": "/team/9" + } + } + ] + } + ''') } } diff --git a/json/src/test/groovy/grails/plugin/json/view/HalEmbeddedSpec.groovy b/json/src/test/groovy/grails/plugin/json/view/HalEmbeddedSpec.groovy index e7222511a..ccb81a0f4 100644 --- a/json/src/test/groovy/grails/plugin/json/view/HalEmbeddedSpec.groovy +++ b/json/src/test/groovy/grails/plugin/json/view/HalEmbeddedSpec.groovy @@ -1,248 +1,457 @@ package grails.plugin.json.view +import com.fasterxml.jackson.databind.ObjectMapper import grails.gorm.annotation.Entity import grails.plugin.json.view.test.JsonViewTest +import spock.lang.Shared import spock.lang.Specification /** * Created by graemerocher on 20/05/16. */ class HalEmbeddedSpec extends Specification implements JsonViewTest { + + @Shared + ObjectMapper objectMapper = new ObjectMapper() + void setup() { mappingContext.addPersistentEntities(Team, Player) } - void "test hal links method that takes an explicit model"() { - given:"A model" - def player = new Player(id: 1L, name: "Cantona") + void 'test hal links method that takes an explicit model'() { + given: 'A model' + def player = new Player(id: 1L, name: 'Cantona') player.id = 1L - def captain = new Player(name: "Keane") + def captain = new Player(name: 'Keane') captain.id = 2L - def team = new Team( captain: captain, name: "Manchester United", players: [player]) + def team = new Team(captain: captain, name: 'Manchester United', players: [player]) team.id = 1L - when:"hal.embedded(..) is used with a map" + when: 'hal.embedded(..) is used with a map' def result = render(''' -import grails.plugin.json.view.* - -@Field Team team - -json { - hal.links(self: team, captain: team.captain) - hal.inline(team) -} - -''', [players:team.players, team:team]) - then:"The output is correct" - result.jsonText == '{"_links":{"self":{"href":"http://localhost:8080/team/1","hreflang":"en","type":"application/hal+json"},"captain":{"href":"http://localhost:8080/player/2","hreflang":"en","type":"application/hal+json"}},"id":1,"name":"Manchester United"}' - + import grails.plugin.json.view.* + + @Field Team team + + json { + hal.links(self: team, captain: team.captain) + hal.inline(team) + } + ''', [players: team.players, team: team]) + + then: 'The output is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_links": { + "self": { + "href": "http://localhost:8080/team/1", + "hreflang": "en", + "type": "application/hal+json" + }, + "captain": { + "href": "http://localhost:8080/player/2", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "id": 1, + "name": "Manchester United" + } + ''') } - - void "test hal links only"() { - given:"A model" - def player = new Player(id: 1L, name: "Cantona") + void 'test hal links only'() { + given: 'A model' + def player = new Player(id: 1L, name: 'Cantona') player.id = 1L - def captain = new Player(name: "Keane") + def captain = new Player(name: 'Keane') captain.id = 2L - def team = new Team( captain: captain, name: "Manchester United", players: [player]) + def team = new Team(captain: captain, name: 'Manchester United', players: [player]) team.id = 1L - when:"hal.embedded(..) is used with a map" + when: 'hal.embedded(..) is used with a map' def result = render(''' -import grails.plugin.json.view.* - -@Field Team team - -json { - hal.links(self: team, captain: team.captain) -} - -''', [players:team.players, team:team]) - then:"The output is correct" - result.jsonText == '{"_links":{"self":{"href":"http://localhost:8080/team/1","hreflang":"en","type":"application/hal+json"},"captain":{"href":"http://localhost:8080/player/2","hreflang":"en","type":"application/hal+json"}}}' - + import grails.plugin.json.view.* + + @Field Team team + + json { + hal.links(self: team, captain: team.captain) + } + ''', [players: team.players, team: team]) + + then: 'The output is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_links": { + "self": { + "href": "http://localhost:8080/team/1", + "hreflang": "en", + "type": "application/hal+json" + }, + "captain": { + "href": "http://localhost:8080/player/2", + "hreflang": "en", + "type": "application/hal+json" + } + } + } + ''') } - void "test hal embedded with explicit model and inline rendering"() { - given:"A model" - def player = new Player(id: 1L, name: "Cantona") + void 'test hal embedded with explicit model and inline rendering'() { + given: 'A model' + def player = new Player(id: 1L, name: 'Cantona') player.id = 1L - def captain = new Player(name: "Keane") + def captain = new Player(name: 'Keane') captain.id = 2L - def team = new Team( captain: captain, name: "Manchester United", players: [player]) + def team = new Team(captain: captain, name: 'Manchester United', players: [player]) team.id = 1L - when:"hal.embedded(..) is used with a map" + when: 'hal.embedded(..) is used with a map' def result = render(''' -import grails.plugin.json.view.* - -@Field Team team - -json { - hal.embedded(players:team.players) - hal.inline(team) -} - -''', [players:team.players, team:team]) - then:"The output is correct" - result.jsonText == '{"_embedded":{"players":[{"_links":{"self":{"href":"http://localhost:8080/player/1","hreflang":"en","type":"application/hal+json"}},"_links":{"self":{"href":"http://localhost:8080/player/1","hreflang":"en","type":"application/hal+json"}},"name":"Cantona"}]},"id":1,"name":"Manchester United"}' + import grails.plugin.json.view.* + + @Field Team team + + json { + hal.embedded(players:team.players) + hal.inline(team) + } + ''', [players: team.players, team: team]) + + then: 'The output is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_embedded": { + "players": [ + { + "_links": { + "self": { + "href": "http://localhost:8080/player/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "_links": { + "self": { + "href": "http://localhost:8080/player/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Cantona" + } + ] + }, + "id": 1, + "name": "Manchester United" + } + ''') } - - void "test hal embedded only"() { - given:"A model" - def player = new Player(id: 1L, name: "Cantona") + void 'test hal embedded only'() { + given: 'A model' + def player = new Player(id: 1L, name: 'Cantona') player.id = 1L - def captain = new Player(name: "Keane") + def captain = new Player(name: 'Keane') captain.id = 2L - def team = new Team( captain: captain, name: "Manchester United", players: [player]) + def team = new Team(captain: captain, name: 'Manchester United', players: [player]) team.id = 1L - when:"hal.embedded(..) is used with a map" + when: 'hal.embedded(..) is used with a map' def result = render(''' -import grails.plugin.json.view.* - -@Field Team team - -json { - hal.embedded(players:team.players) -} - -''', [players:team.players, team:team]) - then:"The output is correct" - result.jsonText == '{"_embedded":{"players":[{"_links":{"self":{"href":"http://localhost:8080/player/1","hreflang":"en","type":"application/hal+json"}},"_links":{"self":{"href":"http://localhost:8080/player/1","hreflang":"en","type":"application/hal+json"}},"name":"Cantona"}]}}' + import grails.plugin.json.view.* + + @Field Team team + + json { + hal.embedded(players:team.players) + } + ''', [players: team.players, team: team]) + + then: 'The output is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_embedded": { + "players": [ + { + "_links": { + "self": { + "href": "http://localhost:8080/player/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "_links": { + "self": { + "href": "http://localhost:8080/player/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Cantona" + } + ] + } + } + ''') } - void "test hal embedded with explicit model"() { - given:"A model" - def player = new Player(id: 1L, name: "Cantona") + void 'test hal embedded with explicit model'() { + given: 'A model' + def player = new Player(id: 1L, name: 'Cantona') player.id = 1L - def captain = new Player(name: "Keane") + def captain = new Player(name: 'Keane') captain.id = 2L - def team = new Team( captain: captain, name: "Manchester United", players: [player]) + def team = new Team(captain: captain, name: 'Manchester United', players: [player]) team.id = 1L - when:"hal.embedded(..) is used with a map" + when: 'hal.embedded(..) is used with a map' def result = render(''' -import grails.plugin.json.view.* - -@Field List players - -json { - hal.embedded(players:players) - total 1 -} - -''', [players:team.players]) - then:"The output is correct" - result.jsonText == '{"_embedded":{"players":[{"_links":{"self":{"href":"http://localhost:8080/player/1","hreflang":"en","type":"application/hal+json"}},"_links":{"self":{"href":"http://localhost:8080/player/1","hreflang":"en","type":"application/hal+json"}},"name":"Cantona"}]},"total":1}' + import grails.plugin.json.view.* + + @Field List players + + json { + hal.embedded(players:players) + total 1 + } + ''', [players: team.players]) + + then: 'The output is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_embedded": { + "players": [ + { + "_links": { + "self": { + "href": "http://localhost:8080/player/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "_links": { + "self": { + "href": "http://localhost:8080/player/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Cantona" + } + ] + }, + "total": 1 + } + ''') } - void "test hal render method for one-to-many associations"() { - - when:"A GSON view that renders hal.render(..) is rendered" - - - def player = new Player(id: 1L, name: "Cantona") + void 'test hal render method for one-to-many associations'() { + when: 'A GSON view that renders hal.render(..) is rendered' + def player = new Player(id: 1L, name: 'Cantona') player.id = 1L - - def captain = new Player(name: "Keane") + def captain = new Player(name: 'Keane') captain.id = 2L - def team = new Team( captain: captain, name: "Manchester United", players: [player]) + def team = new Team(captain: captain, name: 'Manchester United', players: [player]) team.id = 1L def result = render(''' -import grails.plugin.json.view.* -model { - Team team -} -json hal.render(team) -''', [team: team]) - - then:'the result is correct' - result.jsonText == '{"_embedded":{"players":[{"_links":{"self":{"href":"http://localhost:8080/player/1","hreflang":"en","type":"application/hal+json"}},"name":"Cantona"}],"captain":{"_links":{"self":{"href":"http://localhost:8080/player/2","hreflang":"en","type":"application/hal+json"}},"name":"Keane"}},"_links":{"self":{"href":"http://localhost:8080/team/1","hreflang":"en","type":"application/hal+json"}},"id":1,"name":"Manchester United"}' - result.json.'_embedded' + import grails.plugin.json.view.* + model { + Team team + } + json hal.render(team) + ''', [team: team]) + + then: 'the result is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_embedded": { + "players": [ + { + "_links": { + "self": { + "href": "http://localhost:8080/player/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Cantona" + } + ], + "captain": { + "_links": { + "self": { + "href": "http://localhost:8080/player/2", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Keane" + } + }, + "_links": { + "self": { + "href": "http://localhost:8080/team/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "id": 1, + "name": "Manchester United" + } + ''') + result.json._embedded } - void "test hal embedded method for one-to-many associations"() { - when:"A GSON view that renders hal.embedded(..) is rendered" - - - def player = new Player(id: 1L, name: "Cantona") + void 'test hal embedded method for one-to-many associations'() { + when: 'A GSON view that renders hal.embedded(..) is rendered' + def player = new Player(id: 1L, name: 'Cantona') player.id = 1L - - def captain = new Player(name: "Keane") + def captain = new Player(name: 'Keane') captain.id == 1L - def team = new Team( captain: captain, name: "Manchester United", players: [player]) + def team = new Team(captain: captain, name: 'Manchester United', players: [player]) team.id = 1L def result = render(''' -import grails.plugin.json.view.* -model { - Team team -} -json { - hal.embedded(team) - name team.name -} -''', [team: team]) - - then:'the result is correct' - result.jsonText == '{"_embedded":{"players":[{"_links":{"self":{"href":"http://localhost:8080/player/1","hreflang":"en","type":"application/hal+json"}},"name":"Cantona"}],"captain":{"_links":{"self":{"href":"http://localhost:8080/player","hreflang":"en","type":"application/hal+json"}},"name":"Keane"}},"name":"Manchester United"}' - result.json.'_embedded' + import grails.plugin.json.view.* + model { + Team team + } + json { + hal.embedded(team) + name team.name + } + ''', [team: team]) + + then: 'the result is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_embedded": { + "players": [ + { + "_links": { + "self": { + "href": "http://localhost:8080/player/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Cantona" + } + ], + "captain": { + "_links": { + "self": { + "href": "http://localhost:8080/player", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Keane" + } + }, + "name":"Manchester United" + } + ''') + result.json._embedded } - void "test hal embedded method for many-to-one associations"() { - when:"A GSON view that renders hal.embedded(..) is rendered" - - def team = new Team(name: "Manchester United") - def player = new Player(id: 1L, name: "Cantona", team: team) + void 'test hal embedded method for many-to-one associations'() { + when: 'A GSON view that renders hal.embedded(..) is rendered' + def team = new Team(name: 'Manchester United') + def player = new Player(id: 1L, name: 'Cantona', team: team) team.players = [player] player.id = 1L team.id = 1L def result = render(''' -import grails.plugin.json.view.* -model { - Player player -} -json { - hal.embedded(player) - name player.name -} -''', [player: player]) - - then:'the result is correct' - result.jsonText == '{"_embedded":{"team":{"_links":{"self":{"href":"http://localhost:8080/team/1","hreflang":"en","type":"application/hal+json"}},"name":"Manchester United"}},"name":"Cantona"}' - result.json.'_embedded'.team.name == "Manchester United" + import grails.plugin.json.view.* + model { + Player player + } + json { + hal.embedded(player) + name player.name + } + ''', [player: player]) + + then: 'the result is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_embedded": { + "team": { + "_links": { + "self": { + "href": "http://localhost:8080/team/1", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name": "Manchester United" + } + }, + "name": "Cantona" + } + ''') + result.json._embedded.team.name == 'Manchester United' } - void "test hal embedded with associations that have GORM embedded properties"() { - given:"A domain class with embedded associations" + void 'test hal embedded with associations that have GORM embedded properties'() { + given: 'A domain class with embedded associations' mappingContext.addPersistentEntities(Person, Parent) - Person p = new Person(name:"Robert") - p.homeAddress = new Address(postCode: "12345") - p.otherAddresses = [new Address(postCode: "6789"), new Address(postCode: "54321")] - p.nickNames = ['Rob','Bob'] - def parent = new Parent(name: "Joe", person: p) - - when:"hal.render(..) is used" + def p = new Person(name: 'Robert') + p.homeAddress = new Address(postCode: '12345') + p.otherAddresses = [new Address(postCode: '6789'), new Address(postCode: '54321')] + p.nickNames = ['Rob', 'Bob'] + def parent = new Parent(name: 'Joe', person: p) + when: 'hal.render(..) is used' def result = render(''' -import grails.plugin.json.view.* -model { - Parent parent -} -json hal.render(parent) -''', [parent:parent]) - - then:"The result is correct" - result.jsonText == '{"_embedded":{"person":{"_links":{"self":{"href":"http://localhost:8080/person","hreflang":"en","type":"application/hal+json"}},"otherAddresses":[{"postCode":"6789"},{"postCode":"54321"}],"name":"Robert","nickNames":["Rob","Bob"],"homeAddress":{"postCode":"12345"}}},"_links":{"self":{"href":"http://localhost:8080/parent","hreflang":"en","type":"application/hal+json"}},"name":"Joe"}' - - + import grails.plugin.json.view.* + model { + Parent parent + } + json hal.render(parent) + ''', [parent: parent]) + + then: 'The result is correct' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "_embedded": { + "person": { + "_links": { + "self": { + "href": "http://localhost:8080/person", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "otherAddresses": [ + { "postCode": "6789" }, + { "postCode": "54321" } + ], + "name": "Robert", + "nickNames": ["Rob", "Bob"], + "homeAddress": { + "postCode": "12345" + } + } + }, + "_links": { + "self": { + "href": "http://localhost:8080/parent", + "hreflang": "en", + "type": "application/hal+json" + } + }, + "name":"Joe" + } + ''') } } @@ -250,5 +459,4 @@ json hal.render(parent) class Parent { String name Person person -} - +} \ No newline at end of file diff --git a/json/src/test/groovy/grails/plugin/json/view/IterableRenderSpec.groovy b/json/src/test/groovy/grails/plugin/json/view/IterableRenderSpec.groovy index a6c9a5de9..520b76ed8 100644 --- a/json/src/test/groovy/grails/plugin/json/view/IterableRenderSpec.groovy +++ b/json/src/test/groovy/grails/plugin/json/view/IterableRenderSpec.groovy @@ -111,9 +111,9 @@ import grails.plugin.json.view.* @Field Collection players json jsonapi.render(players, [pagination: [resource: Player, total: 11]]) -''', [players: players]) { +''', [players: players], { uri = "/foo" - } + }) then: "The result is an array" renderResult.jsonText == '{"data":[{"type":"player","id":"1","attributes":{"name":"Cantona"},"relationships":{"team":{"data":null}}},{"type":"player","id":"2","attributes":{"name":"Louis"},"relationships":{"team":{"data":null}}}],"links":{"self":"/foo","first":"http://localhost:8080/player?offset=0&max=10","next":"http://localhost:8080/player?offset=10&max=10","last":"http://localhost:8080/player?offset=10&max=10"}}' diff --git a/json/src/test/groovy/grails/plugin/json/view/JsonViewHelperSpec.groovy b/json/src/test/groovy/grails/plugin/json/view/JsonViewHelperSpec.groovy index 9e2b9d381..ac7200090 100644 --- a/json/src/test/groovy/grails/plugin/json/view/JsonViewHelperSpec.groovy +++ b/json/src/test/groovy/grails/plugin/json/view/JsonViewHelperSpec.groovy @@ -1,24 +1,11 @@ -package grails.plugin.json.view - -import grails.core.support.proxy.ProxyHandler -import grails.persistence.Entity -import grails.plugin.json.view.api.JsonView -import grails.plugin.json.view.api.internal.DefaultGrailsJsonViewHelper -import grails.plugin.json.view.test.JsonViewTest -import grails.views.GrailsViewTemplate -import grails.views.api.internal.EmptyParameters -import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingContext -import org.grails.testing.GrailsUnitTest -import spock.lang.Specification - /* - * Copyright 2014 original authors + * Copyright 2014-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -26,343 +13,646 @@ import spock.lang.Specification * See the License for the specific language governing permissions and * limitations under the License. */ +package grails.plugin.json.view + +import com.fasterxml.jackson.databind.ObjectMapper +import grails.core.support.proxy.ProxyHandler +import grails.persistence.Entity +import grails.plugin.json.view.api.JsonView +import grails.plugin.json.view.api.internal.DefaultGrailsJsonViewHelper +import grails.plugin.json.view.test.JsonViewTest +import grails.views.GrailsViewTemplate +import grails.views.api.internal.EmptyParameters +import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingContext +import org.grails.testing.GrailsUnitTest +import spock.lang.Shared +import spock.lang.Specification /** * @author graemerocher */ class JsonViewHelperSpec extends Specification implements JsonViewTest, GrailsUnitTest { - void "test render toMany association"() { - given:"A view helper" - DefaultGrailsJsonViewHelper viewHelper = mockViewHelper(Team, Player) - def player1 = new Player(name: "Iniesta") - def player2 = new Player(name: "Messi") - def team = new Team(name:"Barcelona", players: [player1, player2]) + @Shared + ObjectMapper objectMapper = new ObjectMapper() - when:"We render an object without deep argument and no child id" + void 'test render toMany association'() { + given: 'A view helper' + def viewHelper = mockViewHelper(Team, Player) + def player1 = new Player(name: 'Iniesta') + def player2 = new Player(name: 'Messi') + def team = new Team(name: 'Barcelona', players: [player1, player2]) + when: 'We render an object without deep argument and no child id' def result = viewHelper.render(team) - then:"The result is correct" - result.toString() == '{"name":"Barcelona","players":[{"name":"Iniesta"},{"name":"Messi"}]}' - - when:"We render an object without deep argument and child ids" - + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "name": "Barcelona", + "players": [ + { "name": "Iniesta" }, + { "name": "Messi" } + ] + } + ''') + + when: 'We render an object without deep argument and child ids' player1.id = 1L player2.id = 2L result = viewHelper.render(team) - then:"The result is correct" - result.toString() == '{"name":"Barcelona","players":[{"id":1},{"id":2}]}' - - when:"We render an object with deep argument and child ids" - + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "name": "Barcelona", + "players": [ + { "id": 1 }, + { "id": 2 } + ] + } + ''') + + when: 'We render an object with deep argument and child ids' player1.id = 1L player2.id = 2L result = viewHelper.render(team, [deep: true]) - then:"The result is correct" - result.toString() == '{"name":"Barcelona","players":[{"id":1,"name":"Iniesta"},{"id":2,"name":"Messi"}]}' + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "name": "Barcelona", + "players": [ + { "id": 1, "name": "Iniesta" }, + { "id": 2, "name":"Messi" } + ] + } + ''') } - void "test jsonapi render toMany association"() { - given:"A view helper" + void 'test jsonapi render toMany association'() { + given: 'A view helper' mappingContext.addPersistentEntities(Player, Team) - def player1 = new Player(name: "Iniesta") + def player1 = new Player(name: 'Iniesta') player1.id = 1 - def player2 = new Player(name: "Messi") + def player2 = new Player(name: 'Messi') player2.id = 2 - def team = new Team(name:"Barcelona", players: [player1, player2]) + def team = new Team(name: 'Barcelona', players: [player1, player2]) team.id = 1 - when:"We render an object without deep argument and no child id" + when: 'We render an object without deep argument and no child id' def renderResult = render(''' - import groovy.transform.* - import grails.plugin.json.view.* - - @Field Team team - - json jsonapi.render(team) + import groovy.transform.* + import grails.plugin.json.view.* + + @Field Team team + + json jsonapi.render(team) ''', [team:team]) - then:"The result is correct" - renderResult.jsonText == '{"data":{"type":"team","id":"1","attributes":{"titles":null,"name":"Barcelona"},"relationships":{"players":{"data":[{"type":"player","id":"1"},{"type":"player","id":"2"}]},"captain":{"data":null}}},"links":{"self":"/team/1"}}' + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "team", + "id": "1", + "attributes": { + "titles": null, + "name": "Barcelona" + }, + "relationships": { + "players": { + "data": [ + { "type": "player", "id": "1" }, + { "type": "player", "id": "2" } + ] + }, + "captain": { "data": null } + } + }, + "links": { "self": "/team/1" } + } + ''') } - void "test render toOne association"() { - given:"A view helper" - DefaultGrailsJsonViewHelper viewHelper = mockViewHelper(Team, Player) + void 'test render toOne association'() { + given: 'A view helper' + def viewHelper = mockViewHelper(Team, Player) - when:"We render an object without deep argument and no child id" - - def player = new Player(name: "Iniesta") - def team = new Team(name:"Barcelona",titles: ['La Liga'], captain: player) + when: 'We render an object without deep argument and no child id' + def player = new Player(name: 'Iniesta') + def team = new Team(name: 'Barcelona',titles: ['La Liga'], captain: player) def result = viewHelper.render(team) - then:"The result is correct" - result.toString() == '{"titles":["La Liga"],"name":"Barcelona"}' - - when:"We render an object with deep argument and no child id" - - result = viewHelper.render(team, [deep:true]) - - then:"The result is correct" - result.toString() == '{"titles":["La Liga"],"name":"Barcelona","captain":{"name":"Iniesta"}}' - - when:"We render an object without deep argument and a child id" + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "titles": [ + "La Liga" + ], + "name":"Barcelona" + } + ''') + + when: 'We render an object with deep argument and no child id' + result = viewHelper.render(team, [deep: true]) + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "titles": [ + "La Liga" + ], + "name": "Barcelona", + "captain": { + "name": "Iniesta" + } + } + ''') + + when: 'We render an object without deep argument and a child id' player.id = 1L result = viewHelper.render(team) - then:"The result is correct" - result.toString() == '{"titles":["La Liga"],"name":"Barcelona","captain":{"id":1}}' - - when:"We render an object with deep argument and a child id" - + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "titles": [ + "La Liga" + ], + "name": "Barcelona", + "captain": { "id": 1 } + } + ''') + + when: 'We render an object with deep argument and a child id' player.id = 1L - result = viewHelper.render(team, [deep:true]) - - then:"The result is correct" - result.toString() == '{"titles":["La Liga"],"name":"Barcelona","captain":{"id":1,"name":"Iniesta"}}' - - when:"We render an object with deep argument and a child id and excludes" + result = viewHelper.render(team, [deep: true]) + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "titles": [ + "La Liga" + ], + "name": "Barcelona", + "captain": { + "id": 1, + "name": "Iniesta" + } + } + ''') + + when: 'We render an object with deep argument and a child id and excludes' player.id = 1L - result = viewHelper.render(team, [deep:true, excludes: ['captain.name']]) - - then:"The result is correct" - result.toString() == '{"titles":["La Liga"],"name":"Barcelona","captain":{"id":1}}' - - when:"We render an object with deep argument and a child id and includes" - + result = viewHelper.render(team, [deep: true, excludes: ['captain.name']]) + + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "titles": [ + "La Liga" + ], + "name": "Barcelona", + "captain": { "id": 1 } + } + ''') + + when: 'We render an object with deep argument and a child id and includes' player.id = 1L - result = viewHelper.render(team, [deep:true, includes: ['captain.name']]) - - then:"The result is correct" - result.toString() == '{"captain":{"name":"Iniesta"}}' + result = viewHelper.render(team, [deep: true, includes: ['captain.name']]) + + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "captain": { + "name": "Iniesta" + } + } + ''') } - void "test includes with json api"() { - given:"A view helper" + void 'test includes with json api'() { + given: 'A view helper' mappingContext.addPersistentEntities(Player, Team) - def player1 = new Player(name: "Iniesta") + def player1 = new Player(name: 'Iniesta') player1.id = 1 - def player2 = new Player(name: "Messi") + def player2 = new Player(name: 'Messi') player2.id = 2 - def team = new Team(name:"Barcelona", players: [player1, player2]) + def team = new Team(name: 'Barcelona', players: [player1, player2]) team.id = 1 - when:"We render an object without deep argument and no child id" + when: 'We render an object without deep argument and no child id' def renderResult = render(''' - import groovy.transform.* - import grails.plugin.json.view.* - - @Field Team team - - json jsonapi.render(team, [includes: ['name']]) + import groovy.transform.* + import grails.plugin.json.view.* + + @Field Team team + + json jsonapi.render(team, [includes: ['name']]) ''', [team:team]) - then:"The result is correct" - renderResult.jsonText == '{"data":{"type":"team","id":"1","attributes":{"name":"Barcelona"},"relationships":{}},"links":{"self":"/team/1"}}' - - when:"We render an object without deep argument and no child id" + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "team", + "id": "1", + "attributes": {"name":"Barcelona"}, + "relationships": {} + }, + "links": { + "self": "/team/1" + } + } + ''') + + when: 'We render an object without deep argument and no child id' renderResult = render(''' - import groovy.transform.* - import grails.plugin.json.view.* - - @Field Team team - - json jsonapi.render(team, [includes: ['name', 'captain']]) + import groovy.transform.* + import grails.plugin.json.view.* + + @Field Team team + + json jsonapi.render(team, [includes: ['name', 'captain']]) ''', [team:team]) - then:"The result is correct" - renderResult.jsonText == '{"data":{"type":"team","id":"1","attributes":{"name":"Barcelona"},"relationships":{"captain":{"data":null}}},"links":{"self":"/team/1"}}' + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "team", + "id": "1", + "attributes": { "name": "Barcelona" }, + "relationships": { + "captain": { "data": null } + } + }, + "links": { "self": "/team/1" } + } + ''') } - void "test excludes with json api"() { - given:"A view helper" + void 'test excludes with json api'() { + given: 'A view helper' mappingContext.addPersistentEntities(Player, Team) - def player1 = new Player(name: "Iniesta") + def player1 = new Player(name: 'Iniesta') player1.id = 1 - def player2 = new Player(name: "Messi") + def player2 = new Player(name: 'Messi') player2.id = 2 - def team = new Team(name:"Barcelona", players: [player1, player2]) + def team = new Team(name: 'Barcelona', players: [player1, player2]) team.id = 1 - when:"We render an object with multiple excludes" + when: 'We render an object with multiple excludes' def renderResult = render(''' - import groovy.transform.* - import grails.plugin.json.view.* - - @Field Team team - - json jsonapi.render(team, [excludes: ['captain', 'players', 'titles']]) + import groovy.transform.* + import grails.plugin.json.view.* + + @Field Team team + + json jsonapi.render(team, [excludes: ['captain', 'players', 'titles']]) ''', [team:team]) - then:"The result is correct" - renderResult.jsonText == '{"data":{"type":"team","id":"1","attributes":{"name":"Barcelona"},"relationships":{}},"links":{"self":"/team/1"}}' - - when:"We render an object with a single excludes" + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "team", + "id": "1", + "attributes": { "name": "Barcelona" }, + "relationships": {} + }, + "links": { "self": "/team/1" } + } + ''') + + when: 'We render an object with a single excludes' renderResult = render(''' - import groovy.transform.* - import grails.plugin.json.view.* - - @Field Team team - - json jsonapi.render(team, [excludes: ['name']]) + import groovy.transform.* + import grails.plugin.json.view.* + + @Field Team team + + json jsonapi.render(team, [excludes: ['name']]) ''', [team:team]) - then:"The result is correct" - renderResult.jsonText == '{"data":{"type":"team","id":"1","attributes":{"titles":null},"relationships":{"players":{"data":[{"type":"player","id":"1"},{"type":"player","id":"2"}]},"captain":{"data":null}}},"links":{"self":"/team/1"}}' - - when:"We expand a relationship" + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "team", + "id": "1", + "attributes": { + "titles": null + }, + "relationships": { + "players": { + "data": [ + {"type": "player", "id":"1" }, + {"type": "player", "id": "2"} + ] + }, + "captain": { "data": null } + } + }, + "links": { "self": "/team/1" } + } + ''') + + when: 'We expand a relationship' renderResult = render(''' - import groovy.transform.* - import grails.plugin.json.view.* - - @Field Team team - - json jsonapi.render(team, [expand: ['players']]) + import groovy.transform.* + import grails.plugin.json.view.* + + @Field Team team + + json jsonapi.render(team, [expand: ['players']]) ''', [team:team]) - then:"The result is correct" - renderResult.jsonText == '{"data":{"type":"team","id":"1","attributes":{"titles":null,"name":"Barcelona"},"relationships":{"players":{"data":[{"type":"player","id":"1"},{"type":"player","id":"2"}]},"captain":{"data":null}}},"links":{"self":"/team/1"},"included":[{"type":"player","id":"1","attributes":{"name":"Iniesta"},"relationships":{"team":{"data":null}},"links":{"self":"/player/1"}},{"type":"player","id":"2","attributes":{"name":"Messi"},"relationships":{"team":{"data":null}},"links":{"self":"/player/2"}}]}' - - when:"We expand a relationship and exclude a nested property" - team.captain = new Player(name: "Captain Hook") + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "team", + "id": "1", + "attributes": { + "titles": null, + "name": "Barcelona" + }, + "relationships": { + "players": { + "data": [ + { "type": "player", "id": "1" }, + { "type": "player", "id": "2" } + ] + }, + "captain": { "data": null } + } + }, + "links": { "self": "/team/1" }, + "included": [ + { + "type": "player", + "id": "1", + "attributes": { "name": "Iniesta" }, + "relationships": { + "team": { "data": null } + }, + "links": { "self": "/player/1" } + }, + { + "type": "player", + "id": "2", + "attributes": { "name": "Messi" }, + "relationships": { + "team": { "data": null } + }, + "links": { "self": "/player/2" } + } + ] + } + ''') + + when: 'We expand a relationship and exclude a nested property' + team.captain = new Player(name: 'Captain Hook') team.captain.id = 10 renderResult = render(''' - import groovy.transform.* - import grails.plugin.json.view.* - - @Field Team team - - json jsonapi.render(team, [expand: ['captain'], excludes: ['captain.name']]) - ''', [team:team]) - - then:"The result is correct" - renderResult.jsonText == '{"data":{"type":"team","id":"1","attributes":{"titles":null,"name":"Barcelona"},"relationships":{"players":{"data":[{"type":"player","id":"1"},{"type":"player","id":"2"}]},"captain":{"links":{"self":"/player/10"},"data":{"type":"player","id":"10"}}}},"links":{"self":"/team/1"},"included":[{"type":"player","id":"10","attributes":{},"relationships":{"team":{"data":null}},"links":{"self":"/player/10"}}]}' - - when:"We expand a relationship and exclude a nested property" - team.captain = new Player(name: "Captain Hook") + import groovy.transform.* + import grails.plugin.json.view.* + + @Field Team team + + json jsonapi.render(team, [expand: ['captain'], excludes: ['captain.name']]) + ''', [team: team]) + + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "team", + "id": "1", + "attributes": { + "titles": null, + "name": "Barcelona" + }, + "relationships": { + "players": { + "data": [ + { "type": "player", "id": "1" }, + { "type": "player", "id": "2" } + ] + }, + "captain": { + "links": { "self": "/player/10" }, + "data": { "type": "player", "id": "10" } + } + } + }, + "links": { "self": "/team/1" }, + "included": [ + { + "type": "player", + "id": "10", + "attributes": {}, + "relationships": { + "team": { "data": null } + }, + "links": { "self": "/player/10" } + } + ] + } + ''') + + when: 'We expand a relationship and exclude a nested property' + team.captain = new Player(name: 'Captain Hook') team.captain.id = 10 renderResult = render(''' - import groovy.transform.* - import grails.plugin.json.view.* - - @Field Team team - - json jsonapi.render(team, [expand: ['players'], excludes: ['players.name']]) - ''', [team:team]) - - then:"The result is correct" - renderResult.jsonText == '{"data":{"type":"team","id":"1","attributes":{"titles":null,"name":"Barcelona"},"relationships":{"players":{"data":[{"type":"player","id":"1"},{"type":"player","id":"2"}]},"captain":{"links":{"self":"/player/10"},"data":{"type":"player","id":"10"}}}},"links":{"self":"/team/1"},"included":[{"type":"player","id":"1","attributes":{},"relationships":{"team":{"data":null}},"links":{"self":"/player/1"}},{"type":"player","id":"2","attributes":{},"relationships":{"team":{"data":null}},"links":{"self":"/player/2"}}]}' + import groovy.transform.* + import grails.plugin.json.view.* + + @Field Team team + + json jsonapi.render(team, [expand: ['players'], excludes: ['players.name']]) + ''', [team: team]) + + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "team", + "id": "1", + "attributes": { + "titles": null, + "name": "Barcelona" + }, + "relationships": { + "players": { + "data": [ + { "type": "player", "id": "1" }, + { "type": "player", "id": "2" } + ] + }, + "captain": { + "links": { "self": "/player/10" }, + "data": { "type": "player", "id": "10" } + } + } + }, + "links": { "self": "/team/1" }, + "included": [ + { + "type": "player", + "id": "1", + "attributes": {}, + "relationships": { + "team": { "data": null } + }, + "links": { "self": "/player/1" } + }, + { + "type": "player", + "id": "2", + "attributes": {}, + "relationships": { + "team": { "data": null } + }, + "links": { "self": "/player/2" } + } + ] + } + ''') } - void "Test render object method with customizer"() { - given:"A view helper" - DefaultGrailsJsonViewHelper viewHelper = mockViewHelper(Test) - - when:"We render an object" + void 'Test render object method with customizer'() { + given: 'A view helper' + def viewHelper = mockViewHelper(Test) - def test = new Test(title: "The Stand", author: new TestAuthor(name: "Stephen King")) + when: 'We render an object' + def test = new Test(title: 'The Stand', author: new TestAuthor(name: 'Stephen King')) test.id = 1L def result = viewHelper.render(test) { pages 1000 } - then:"The result is correct" - result.toString() == '{"id":1,"title":"The Stand","author":{"name":"Stephen King"},"pages":1000}' + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "id": 1, + "title": "The Stand", + "author": { + "name": "Stephen King" + }, + "pages": 1000 + } + ''') } - void "Test render object method with customizer when not configured as a domain"() { - given:"A view helper" - DefaultGrailsJsonViewHelper viewHelper = mockViewHelper() - - when:"We render an object" + void 'Test render object method with customizer when not configured as a domain'() { + given: 'A view helper' + def viewHelper = mockViewHelper() - def test = new Test(title: "The Stand", author: new TestAuthor(name: "Stephen King")) + when: 'We render an object' + def test = new Test(title: 'The Stand', author: new TestAuthor(name: 'Stephen King')) test.id = 1L def result = viewHelper.render(test) { pages 1000 } - then:"The result is correct" - result.toString() == '{"author":{"name":"Stephen King"},"id":1,"title":"The Stand","pages":1000}' + + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "author": { + "name": "Stephen King" + }, + "id": 1, + "title": "The Stand", + "pages": 1000 + } + ''') } - void "Test render object method"() { - given:"A view helper" + void 'Test render object method'() { + given: 'A view helper' def viewHelper = mockViewHelper(Test) - when:"We render an object" - - def test = new Test(title: "The Stand", author: new TestAuthor(name: "Stephen King")) + when: 'We render an object' + def test = new Test(title: 'The Stand', author: new TestAuthor(name: 'Stephen King')) test.id = 1L def result = viewHelper.render(test) - then:"The result is correct" - result.toString() == '{"id":1,"title":"The Stand","author":{"name":"Stephen King"}}' - when:"We render an object" - result = viewHelper.render(new Test(title:"The Stand", author:new TestAuthor(name:"Stephen King")), [excludes:['author']]) - then:"The result is correct" - result.toString() == '{"title":"The Stand"}' + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "id": 1, + "title": "The Stand", + "author": { + "name": "Stephen King" + } + } + ''') + + when: 'We render an object' + result = viewHelper.render( + new Test(title: 'The Stand', author: new TestAuthor(name: 'Stephen King')), [excludes: ['author']] + ) + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree('{"title":"The Stand"}') } - void "Test render object method with plain object"() { - given:"A view helper" + void 'Test render object method with plain object'() { + given: 'A view helper' def viewHelper = mockViewHelper(Test) - when:"We render an object" - def result = viewHelper.render(new Test2(title:"The Stand", author:"Stephen King")) - then:"The result is correct" - result.toString() == '{"author":"Stephen King","title":"The Stand"}' - - when:"We render an object" - result = viewHelper.render(new Test2(title:"The Stand", author:"Stephen King"), [excludes:['author']]) - then:"The result is correct" - result.toString() == '{"title":"The Stand"}' + when: 'We render an object' + def result = viewHelper.render(new Test2(title: 'The Stand', author: 'Stephen King')) + + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree(''' + { + "author": "Stephen King", + "title": "The Stand" + } + ''') + + when: 'We render an object' + result = viewHelper.render(new Test2(title: 'The Stand', author: 'Stephen King'), [excludes: ['author']]) + then: 'The result is correct' + objectMapper.readTree(result.toString()) == objectMapper.readTree('{"title":"The Stand"}') } - void "Test render collection as null produces empty list"() { - given:"A view helper" + void 'Test render collection as null produces empty list'() { + given: 'A view helper' def viewHelper = mockViewHelper() when: def result = viewHelper.render(collection: null, template: 'child', var: 'age') - then:"The result is correct" + then: 'The result is correct' result.toString() == '[]' when: result = viewHelper.render(collection: [], template: 'child', var: 'age') - then:"The result is correct" + then: 'The result is correct' result.toString() == '[]' } - protected DefaultGrailsJsonViewHelper mockViewHelper(Class...classes) { - def jsonView = Mock(JsonView) - jsonView.getParams() >> new EmptyParameters() + protected DefaultGrailsJsonViewHelper mockViewHelper(Class... classes) { - KeyValueMappingContext mappingContext = new KeyValueMappingContext("test") + def mappingContext = new KeyValueMappingContext('test') mappingContext.addPersistentEntities(classes) + def jsonView = Mock(JsonView) + jsonView.getParams() >> new EmptyParameters() jsonView.getMappingContext() >> mappingContext - - def viewHelper = new DefaultGrailsJsonViewHelper(jsonView) - - def binding = new Binding() - jsonView.getBinding() >> binding - + jsonView.getBinding() >> new Binding() jsonView.getTemplateEngine() >> templateEngine - jsonView.getViewTemplate() >> new GrailsViewTemplate(JsonView) - jsonView.getProxyHandler() >> Mock(ProxyHandler) { isProxy(_) >> false } - viewHelper + return new DefaultGrailsJsonViewHelper(jsonView) } } @@ -372,13 +662,15 @@ class Team { Player captain List players List titles - static hasMany = [players:Player] + @SuppressWarnings('unused') + static hasMany = [players: Player] } @Entity class Player { Long version String name - static belongsTo = [team:Team] + @SuppressWarnings('unused') + static belongsTo = [team: Team] } @Entity @@ -396,7 +688,7 @@ class Circular { class Test { String title TestAuthor author - + @SuppressWarnings('unused') static embedded = ['author'] } @@ -407,4 +699,4 @@ class TestAuthor { class Test2 { String title String author -} +} \ No newline at end of file diff --git a/json/src/test/groovy/grails/plugin/json/view/JsonViewTemplateResolverSpec.groovy b/json/src/test/groovy/grails/plugin/json/view/JsonViewTemplateResolverSpec.groovy index bbe830f77..a4dd7ae3f 100644 --- a/json/src/test/groovy/grails/plugin/json/view/JsonViewTemplateResolverSpec.groovy +++ b/json/src/test/groovy/grails/plugin/json/view/JsonViewTemplateResolverSpec.groovy @@ -15,8 +15,8 @@ import org.springframework.web.context.request.RequestContextHolder import spock.lang.Issue import spock.lang.Specification -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse /** * Created by graemerocher on 24/08/15. diff --git a/json/src/test/groovy/grails/plugin/json/view/MapRenderSpec.groovy b/json/src/test/groovy/grails/plugin/json/view/MapRenderSpec.groovy index 3b63d7364..c898f506f 100644 --- a/json/src/test/groovy/grails/plugin/json/view/MapRenderSpec.groovy +++ b/json/src/test/groovy/grails/plugin/json/view/MapRenderSpec.groovy @@ -1,8 +1,10 @@ package grails.plugin.json.view +import com.fasterxml.jackson.databind.ObjectMapper import grails.plugin.json.view.test.JsonViewTest import grails.testing.gorm.DataTest import grails.validation.Validateable +import spock.lang.Shared import spock.lang.Specification /** @@ -10,109 +12,122 @@ import spock.lang.Specification */ class MapRenderSpec extends Specification implements JsonViewTest, DataTest { + @Shared + ObjectMapper objectMapper = new ObjectMapper() + @Override Class[] getDomainClassesToMock() { return [Team, Player] } - void "Test property version is not excluded"() { - - when: "An exception is rendered" + void 'Test property version is not excluded'() { + when: 'An exception is rendered' def templateText = ''' -model { - Map map -} - -json g.render(map) -''' - def renderResult = render(templateText, [map: [foo: 'bar', version: "one"]]) - - then: "The exception is rendered" + model { + Map map + } + + json g.render(map) + ''' + def renderResult = render(templateText, [map: [foo: 'bar', version: 'one']]) + + then: 'The exception is rendered' renderResult.json.foo == 'bar' renderResult.json.version == 'one' } - void "Test property errors is not excluded for Map"() { - - when: "An exception is rendered" + void 'Test property errors is not excluded for Map'() { + when: 'An exception is rendered' def templateText = ''' -model { - Map map -} - -json g.render(map) -''' - def renderResult = render(templateText, [map: [foo: 'bar', version: "one", "errors": ["test1"]]]) - - then: "The exception is rendered" + model { + Map map + } + + json g.render(map) + ''' + def renderResult = render(templateText, [map: [foo: 'bar', version: 'one', 'errors': ['test1']]]) + + then: 'The exception is rendered' renderResult.json.foo == 'bar' renderResult.json.version == 'one' - renderResult.json.errors == ["test1"] + renderResult.json.errors == ['test1'] } - void "Test property errors is not excluded for a non validateable"() { - - setup: "An exception is rendered" + void 'Test property errors is not excluded for a non validateable'() { + setup: 'An exception is rendered' def templateText = ''' -model { - Map map -} + model { + Map map + } + + json g.render(map) + ''' -json g.render(map) -''' when: - TeamCO team = new TeamCO(name: "Test", errors: ["co-ordination", "team-work"]) + TeamCO team = new TeamCO(name: 'Test', errors: ['co-ordination', 'team-work']) def renderResult = render(templateText, [map: [team: team]]) - then: "The exception is rendered" + then: 'The exception is rendered' renderResult.json.team renderResult.json.team.name == 'Test' - renderResult.json.team.errors == ["co-ordination", "team-work"] + renderResult.json.team.errors == ['co-ordination', 'team-work'] } - void "Test property errors is excluded for domain"() { - + void 'Test property errors is excluded for domain'() { setup: def templateText = ''' -model { - Map map -} - -json g.render(map) -''' - when: "An entity is used in a map" + model { + Map map + } + + json g.render(map) + ''' + + when: 'An entity is used in a map' mappingContext.addPersistentEntity(Player) - Player player1 = new Player(name: "Cantona") - Player player2 = new Player() + def player1 = new Player(name: 'Cantona') + def player2 = new Player() player2.validate() then: player2.hasErrors() when: - Team team = new Team(name: "Test", captain: player1) + def team = new Team(name: 'Test', captain: player1) team.addToPlayers(player1) team.addToPlayers(player2) team.save(validate: false) player2.version = 1l def renderResult = render(templateText, [map: [player1: player1, player2: player2]]) - then: "The result is correct" - renderResult.jsonText == '{"player1":{"id":1,"team":{"id":1},"name":"Cantona"},"player2":{"id":2,"team":{"id":1}}}' + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "player1": { + "id": 1, + "team": { "id": 1 }, + "name": "Cantona" + }, + "player2": { + "id": 2, + "team": { "id": 1 } + } + } + ''') } - void "Test property errors is excluded for command objects"() { - + void 'Test property errors is excluded for command objects'() { setup: def templateText = ''' -model { - Map map -} - -json g.render(map) -''' - when: "An entity is used in a map" - PlayerCO player1 = new PlayerCO(name: "Cantona") + model { + Map map + } + + json g.render(map) + ''' + + when: 'An entity is used in a map' + def player1 = new PlayerCO(name: 'Cantona') player1.validate() then: @@ -121,161 +136,241 @@ json g.render(map) when: def renderResult = render(templateText, [map: [player1: player1]]) - then: "The result is correct" - renderResult.jsonText == '{"player1":{"name":"Cantona"}}' + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "player1": { + "name": "Cantona" + } + } + ''') } - void "Test property version is excluded for domain"() { - + void 'Test property version is excluded for domain'() { setup: def templateText = ''' -model { - Map map -} - -json g.render(map) -''' - when: "An entity is used in a map" + model { + Map map + } + + json g.render(map) + ''' + + when: 'An entity is used in a map' mappingContext.addPersistentEntity(Player) - Player player1 = new Player(name: "Cantona") - Player player2 = new Player(name: "Giggs") - Team team = new Team(name: "Test", captain: player1) + def player1 = new Player(name: 'Cantona') + def player2 = new Player(name: 'Giggs') + def team = new Team(name: 'Test', captain: player1) team.addToPlayers(player1) team.addToPlayers(player2) team.save() player2.version = 1l def renderResult = render(templateText, [map: [player1: player1, player2: player2]]) - then: "The result is correct" - renderResult.jsonText == '{"player1":{"id":1,"team":{"id":1},"name":"Cantona"},"player2":{"id":2,"team":{"id":1},"name":"Giggs"}}' + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "player1": { + "id": 1, + "team": { "id": 1 }, + "name": "Cantona" + }, + "player2": { + "id": 2, + "team": { "id": 1 }, + "name": "Giggs" + } + } + ''') } - void "Test render a map type"() { - - when:"An exception is rendered" + void 'Test render a map type'() { + given: def templateText = ''' -model { - Map map -} + model { + Map map + } + + json g.render(map) + ''' -json g.render(map) -''' - def renderResult = render(templateText, [map:[foo:'bar']]) + when: 'An exception is rendered' + def renderResult = render(templateText, [map: [foo: 'bar']]) - then:"The exception is rendered" + then: 'The exception is rendered' renderResult.json.foo == 'bar' - when:"An entity is used in a map" + when: 'An entity is used in a map' mappingContext.addPersistentEntity(Player) - renderResult = render(templateText, [map:[player1:new Player(name: "Cantona"), player2: new Player(name: "Giggs")]]) - - then:"The result is correct" - renderResult.jsonText == '{"player1":{"name":"Cantona"},"player2":{"name":"Giggs"}}' + renderResult = render(templateText, [map: [player1: new Player(name: 'Cantona'), player2: new Player(name: 'Giggs')]]) + + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "player1": { + "name": "Cantona" + }, + "player2": { + "name": "Giggs" + } + } + ''') } - void "Test render a map type with excludes"() { + void 'Test render a map type with excludes'() { + given: def templateText = ''' -model { - Map map -} - -json g.render(map, [excludes: ['player1','player2.name']]) -''' - - when:"An entity is used in a map" + model { + Map map + } + + json g.render(map, [excludes: ['player1','player2.name']]) + ''' + + when: 'An entity is used in a map' mappingContext.addPersistentEntity(PlayerWithAge) - def renderResult = render(templateText, [map:[player1:new PlayerWithAge(name: "Cantona", age: 22), player2: new PlayerWithAge(name: "Giggs", age: 33)]]) - - then:"The result is correct" - renderResult.jsonText == '{"player2":{"age":33}}' - + def renderResult = render( + templateText, + [ + map: [ + player1: new PlayerWithAge(name: 'Cantona', age: 22), + player2: new PlayerWithAge(name: 'Giggs', age: 33) + ] + ] + ) + + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "player2": { + "age": 33 + } + } + ''') } - void "Test render a map type with excludes on a collection"() { + void 'Test render a map type with excludes on a collection'() { + given: def templateText = ''' -model { - Map map -} - -json g.render(map, [excludes: ['players.name']]) -''' - - when:"An entity is used in a map" + model { + Map map + } + + json g.render(map, [excludes: ['players.name']]) + ''' + + when: 'An entity is used in a map' mappingContext.addPersistentEntity(PlayerWithAge) - def renderResult = render(templateText, [map:[players:[new PlayerWithAge(name: "Cantona", age: 22), new PlayerWithAge(name: "Giggs", age: 33)]]]) - - then:"The result is correct" - renderResult.jsonText == '{"players":[{"age":22},{"age":33}]}' + def renderResult = render( + templateText, + [ + map: [ + players: [ + new PlayerWithAge(name: 'Cantona', age: 22), + new PlayerWithAge(name: 'Giggs', age: 33) + ] + ] + ] + ) + + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "players": [ + { "age": 22 }, + { "age": 33 } + ] + } + ''') } - void "Test render a map type with a simple array"() { - - when:"A map is rendered" + void 'Test render a map type with a simple array'() { + given: def templateText = ''' -model { - Map map -} - -json g.render(map) -''' - def renderResult = render(templateText, [map:[foo:'bar', bar: ['A','B']]]) - - then:"The result is correct" - renderResult.jsonText == '{"foo":"bar","bar":["A","B"]}' - + model { + Map map + } + + json g.render(map) + ''' + + when: 'A map is rendered' + def renderResult = render(templateText, [map: [foo: 'bar', bar: ['A', 'B']]]) + + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + { + "foo": "bar", + "bar": ["A", "B"] + } + ''') } - void "Test render a list of maps"() { - when: + void 'Test render a list of maps'() { + given: def templateText = ''' -model { - List list -} + model { + List list + } + + json g.render(list) + ''' -json g.render(list) -''' - def renderResult = render(templateText, [list:[[foo:'bar', bar: ['A','B']], [x:'y']]]) - - then:"The result is correct" - renderResult.jsonText == '[{"foo":"bar","bar":["A","B"]},{"x":"y"}]' + when: + def renderResult = render(templateText, [list: [[foo: 'bar', bar: ['A', 'B']], [x: 'y']]]) + + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree(''' + [ + { + "foo": "bar", + "bar": ["A", "B"] + }, + { + "x": "y" + } + ] + ''') } - - void "Test render a map with includes"() { - when:"A map is rendered" + void 'Test render a map with includes'() { + given: def templateText = ''' -model { - Map map -} + model { + Map map + } + + json g.render(map, [includes: ['a', 'b']]) + ''' -json g.render(map, [includes: ['a', 'b']]) -''' - def renderResult = render(templateText, [map:[a: "1", b: "2", c: "3"]]) + when: 'A map is rendered' + def renderResult = render(templateText, [map: [a: '1', b: '2', c: '3']]) - then:"The result is correct" - renderResult.jsonText == '{"a":"1","b":"2"}' + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree('{ "a": "1","b": "2" }') - when:"A map is rendered" + when: 'A map is rendered' templateText = ''' -model { - Map map -} - -json g.render(map, [includes: ['a', 'd']]) -''' - renderResult = render(templateText, [map:[a: "1", b: "2", c: "3", d: "4"]]) - - then:"The result is correct" - renderResult.jsonText == '{"a":"1","d":"4"}' + model { + Map map + } + + json g.render(map, [includes: ['a', 'd']]) + ''' + renderResult = render(templateText, [map: [a: '1', b: '2', c: '3', d: '4']]) + + then: 'The result is correct' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree('{ "a": "1", "d": "4" }') } static class PlayerCO implements Validateable { String name String teamName + @SuppressWarnings('unused') static constraints = { - name nullable: false, blank: false - teamName nullable: false, blank: false + name(nullable: false, blank: false) + teamName(nullable: false, blank: false) } } @@ -283,7 +378,4 @@ json g.render(map, [includes: ['a', 'd']]) String name List errors } - - -} - +} \ No newline at end of file diff --git a/json/src/test/groovy/grails/plugin/json/view/NullRenderingSpec.groovy b/json/src/test/groovy/grails/plugin/json/view/NullRenderingSpec.groovy index a28d4914f..ae9c99ba1 100644 --- a/json/src/test/groovy/grails/plugin/json/view/NullRenderingSpec.groovy +++ b/json/src/test/groovy/grails/plugin/json/view/NullRenderingSpec.groovy @@ -1,101 +1,106 @@ package grails.plugin.json.view +import com.fasterxml.jackson.databind.ObjectMapper import grails.plugin.json.view.test.JsonViewTest +import spock.lang.Shared import spock.lang.Specification class NullRenderingSpec extends Specification implements JsonViewTest { - void "test rendering nulls with a domain"() { + @Shared + ObjectMapper objectMapper = new ObjectMapper() + + void 'test rendering nulls with a domain'() { given: def templateText = ''' -import grails.plugin.json.view.* - -model { - Player player -} - -json g.render(player) -''' + import grails.plugin.json.view.* + + model { + Player player + } + + json g.render(player) + ''' when: mappingContext.addPersistentEntity(Player) def renderResult = render(templateText, [player: new Player()]) - then:"No fields are rendered because they are null" + then: 'No fields are rendered because they are null' renderResult.jsonText == '{}' } - void "test rendering nulls with a domain (renderNulls = true)"() { + void 'test rendering nulls with a domain (renderNulls = true)'() { given: def templateText = ''' -import grails.plugin.json.view.* - -model { - Player player -} - -json g.render(player, [renderNulls: true]) -''' + import grails.plugin.json.view.* + + model { + Player player + } + + json g.render(player, [renderNulls: true]) + ''' when: mappingContext.addPersistentEntity(Player) def renderResult = render(templateText, [player: new Player()]) - then:"No fields are rendered because they are null" - renderResult.jsonText == '{"team":null,"name":null}' + then: 'No fields are rendered because they are null' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree('{ "team": null, "name": null}') } - void "test rendering nulls with a map"() { + void 'test rendering nulls with a map'() { given: def templateText = ''' -model { - Map map -} - -json g.render(map) -''' + model { + Map map + } + + json g.render(map) + ''' when: mappingContext.addPersistentEntity(Player) def renderResult = render(templateText, [map: [foo: null, bar: null]]) - then:"Maps with nulls are rendered by default" - renderResult.jsonText == '{"foo":null,"bar":null}' + then: 'Maps with nulls are rendered by default' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree('{"foo": null,"bar": null}') } - void "test rendering nulls with a pogo"() { + void 'test rendering nulls with a pogo'() { given: def templateText = ''' -model { - Object obj -} - -json g.render(obj) -''' + model { + Object obj + } + + json g.render(obj) + ''' when: mappingContext.addPersistentEntity(Player) def renderResult = render(templateText, [obj: new Child2()]) - then:"No fields are rendered because they are null" + then: 'No fields are rendered because they are null' renderResult.jsonText == '{}' } - void "test rendering nulls with a pogo (renderNulls = true)"() { + void 'test rendering nulls with a pogo (renderNulls = true)'() { given: def templateText = ''' -model { - Object obj -} - -json g.render(obj, [renderNulls: true]) -''' + model { + Object obj + } + + json g.render(obj, [renderNulls: true]) + ''' when: mappingContext.addPersistentEntity(Player) def renderResult = render(templateText, [obj: new Child2()]) then: - renderResult.jsonText == '{"name":null,"parent":null}' + objectMapper.readTree(renderResult.jsonText) == objectMapper.readTree('{"name": null, "parent": null}') } -} +} \ No newline at end of file diff --git a/json/src/test/groovy/grails/plugin/json/view/api/JsonApiSpec.groovy b/json/src/test/groovy/grails/plugin/json/view/api/JsonApiSpec.groovy index ccd67095e..e52af88b5 100644 --- a/json/src/test/groovy/grails/plugin/json/view/api/JsonApiSpec.groovy +++ b/json/src/test/groovy/grails/plugin/json/view/api/JsonApiSpec.groovy @@ -1,69 +1,111 @@ package grails.plugin.json.view.api +import com.fasterxml.jackson.databind.ObjectMapper import grails.persistence.Entity import grails.plugin.json.view.test.JsonRenderResult import grails.plugin.json.view.test.JsonViewTest import grails.validation.Validateable -import grails.validation.ValidationErrors import org.grails.testing.GrailsUnitTest +import spock.lang.Shared import spock.lang.Specification class JsonApiSpec extends Specification implements JsonViewTest, GrailsUnitTest { + @Shared + ObjectMapper objectMapper = new ObjectMapper() + void setup() { mappingContext.addPersistentEntities(Widget, Author, Book, ResearchPaper) } void 'test simple case'() { given: - Widget theWidget = new Widget(name: 'One', width: 4, height: 7) - theWidget.id = 5 + def theWidget = new Widget(name: 'One', width: 4, height: 7) + theWidget.id = 5 when: - def result = render(''' -import grails.plugin.json.view.api.Widget -model { - Widget widget -} - -json jsonapi.render(widget) -''', [widget: theWidget]) + def result = render(''' + import grails.plugin.json.view.api.Widget + model { + Widget widget + } + + json jsonapi.render(widget) + ''', [widget: theWidget]) then: - result.jsonText == '''{"data":{"type":"widget","id":"5","attributes":{"width":4,"height":7,"name":"One"}},"links":{"self":"/widget/5"}}''' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "widget", + "id": "5", + "attributes": { + "width": 4, + "height": 7, + "name": "One" + } + }, + "links": { + "self": "/widget/5" + } + } + ''') } void 'test Relationships - hasOne'() { given: - Book returnOfTheKing = new Book( - title: 'The Return of the King', - author: new Author(name: "J.R.R. Tolkien") - ) - returnOfTheKing.id = 3 - returnOfTheKing.author.id = 9 - + Book returnOfTheKing = new Book( + title: 'The Return of the King', + author: new Author(name: 'J.R.R. Tolkien') + ) + returnOfTheKing.id = 3 + returnOfTheKing.author.id = 9 when: - JsonRenderResult result = render(''' -import grails.plugin.json.view.api.Book -model { - Book book -} - -json jsonapi.render(book) -''', [book: returnOfTheKing]) + def result = render(''' + import grails.plugin.json.view.api.Book + model { + Book book + } + + json jsonapi.render(book) + ''', [book: returnOfTheKing]) then: 'The JSON relationships are in place' - result.jsonText == '{"data":{"type":"book","id":"3","attributes":{"title":"The Return of the King"},"relationships":{"author":{"links":{"self":"/author/9"},"data":{"type":"author","id":"9"}}}},"links":{"self":"/book/3"}}' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "book", + "id": "3", + "attributes": { + "title": "The Return of the King" + }, + "relationships": { + "author": { + "links": { + "self": "/author/9" + }, + "data": { + "type": "author", + "id": "9" + } + } + } + }, + "links": { + "self": "/book/3" + } + } + ''') } void 'test Relationships - multiple'() { given: ResearchPaper returnOfTheKing = new ResearchPaper( title: 'The Return of the King', - leadAuthor: new Author(name: "J.R.R. Tolkien"), - coAuthor: new Author(name: "Sally Jones"), - subAuthors: [new Author(name: "Will"), new Author(name: "Smith")] + leadAuthor: new Author(name: 'J.R.R. Tolkien'), + coAuthor: new Author(name: 'Sally Jones'), + subAuthors: [new Author(name: 'Will'), new Author(name: 'Smith')] ) returnOfTheKing.id = 3 returnOfTheKing.leadAuthor.id = 9 @@ -71,134 +113,290 @@ json jsonapi.render(book) returnOfTheKing.subAuthors[0].id = 12 returnOfTheKing.subAuthors[1].id = 13 - when: JsonRenderResult result = render(''' -import grails.plugin.json.view.api.ResearchPaper -model { - ResearchPaper researchPaper -} - -json jsonapi.render(researchPaper) -''', [researchPaper: returnOfTheKing]) + import grails.plugin.json.view.api.ResearchPaper + model { + ResearchPaper researchPaper + } + + json jsonapi.render(researchPaper) + ''', [researchPaper: returnOfTheKing]) then: 'The JSON relationships are in place' - result.jsonText == '{"data":{"type":"researchPaper","id":"3","attributes":{"title":"The Return of the King"},"relationships":{"subAuthors":{"data":[{"type":"author","id":"12"},{"type":"author","id":"13"}]},"leadAuthor":{"links":{"self":"/author/9"},"data":{"type":"author","id":"9"}},"coAuthor":{"links":{"self":"/author/10"},"data":{"type":"author","id":"10"}}}},"links":{"self":"/researchPaper/3"}}' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "researchPaper", + "id": "3", + "attributes": { + "title": "The Return of the King" + }, + "relationships": { + "subAuthors": { + "data": [ + { "type": "author", "id": "12" }, + { "type": "author", "id": "13" } + ] + }, + "leadAuthor": { + "links": { + "self": "/author/9" + }, + "data": { + "type": "author", + "id": "9" + } + }, + "coAuthor": { + "links": { + "self": "/author/10" + }, + "data": { + "type": "author", + "id": "10" + } + } + } + }, + "links": { + "self": "/researchPaper/3" + } + } + ''') } void 'test errors'() { given: - SuperHero mutepool = new SuperHero() - mutepool.name = "" - mutepool.validate() + def mutepool = new SuperHero() + mutepool.name = "" + mutepool.validate() when: - def result = render(''' -import grails.plugin.json.view.api.SuperHero -model { - SuperHero hero -} - -json jsonapi.render(hero) -''', [hero: mutepool]) + def result = render(''' + import grails.plugin.json.view.api.SuperHero + model { + SuperHero hero + } + + json jsonapi.render(hero) + ''', [hero: mutepool]) then: - result.jsonText == '''{"errors":[{"code":"blank","detail":"Property [name] of class [class grails.plugin.json.view.api.SuperHero] cannot be blank","source":{"object":"grails.plugin.json.view.api.SuperHero","field":"name","rejectedValue":"","bindingError":false}}]}''' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "errors": [ + { + "code": "blank", + "detail": "Property [name] of class [class grails.plugin.json.view.api.SuperHero] cannot be blank", + "source": { + "object": "grails.plugin.json.view.api.SuperHero", + "field": "name", + "rejectedValue": "", + "bindingError": false + } + } + ] + } + ''') } void 'test jsonapi object'() { given: - Widget theWidget = new Widget(name: 'One', width: 4, height: 7) - theWidget.id = 5 + def theWidget = new Widget(name: 'One', width: 4, height: 7) + theWidget.id = 5 when: - def result = render(''' -import grails.plugin.json.view.api.Widget -model { - Widget widget -} - -json jsonapi.render(widget, [jsonApiObject: true]) -''', [widget: theWidget]) + def result = render(''' + import grails.plugin.json.view.api.Widget + model { + Widget widget + } + + json jsonapi.render(widget, [jsonApiObject: true]) + ''', [widget: theWidget]) then: - result.jsonText == '''{"jsonapi":{"version":"1.0"},"data":{"type":"widget","id":"5","attributes":{"width":4,"height":7,"name":"One"}},"links":{"self":"/widget/5"}}''' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "jsonapi": { + "version": "1.0" + }, + "data": { + "type": "widget", + "id": "5", + "attributes": { + "width": 4, + "height": 7, + "name": "One" + } + }, + "links": { + "self": "/widget/5" + } + } + ''') } void 'test compound documents object'() { given: - Book returnOfTheKing = new Book( - title: 'The Return of the King', - author: new Author(name: "J.R.R. Tolkien") - ) - returnOfTheKing.id = 3 - returnOfTheKing.author.id = 9 - + def returnOfTheKing = new Book( + title: 'The Return of the King', + author: new Author(name: 'J.R.R. Tolkien') + ) + returnOfTheKing.id = 3 + returnOfTheKing.author.id = 9 when: - JsonRenderResult result = render(''' -import grails.plugin.json.view.api.Book -model { - Book book -} - -json jsonapi.render(book, [expand: 'author']) -''', [book: returnOfTheKing]) + def result = render(''' + import grails.plugin.json.view.api.Book + model { + Book book + } + + json jsonapi.render(book, [expand: 'author']) + ''', [book: returnOfTheKing]) then: 'The JSON relationships are in place' - result.jsonText == '{"data":{"type":"book","id":"3","attributes":{"title":"The Return of the King"},"relationships":{"author":{"links":{"self":"/author/9"},"data":{"type":"author","id":"9"}}}},"links":{"self":"/book/3"},"included":[{"type":"author","id":"9","attributes":{"name":"J.R.R. Tolkien"},"links":{"self":"/author/9"}}]}' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "data": { + "type": "book", + "id": "3", + "attributes": { + "title": "The Return of the King" + }, + "relationships": { + "author": { + "links": { + "self": "/author/9" + }, + "data": { + "type": "author", + "id": "9" + } + } + } + }, + "links": { + "self": "/book/3" + }, + "included": [ + { + "type": "author", + "id": "9", + "attributes": { + "name": "J.R.R. Tolkien" + }, + "links": { + "self": "/author/9" + } + } + ] + } + ''') } - void "test meta object rendering with jsonApiObject"() { + void 'test meta object rendering with jsonApiObject'() { given: - Widget theWidget = new Widget(name: 'One', width: 4, height: 7) + def theWidget = new Widget(name: 'One', width: 4, height: 7) theWidget.id = 5 - def meta = [copyright: "Copyright 2015 Example Corp.", - authors: [ - "Yehuda Katz", - "Steve Klabnik" - ]] + def meta = [ + copyright: 'Copyright 2015 Example Corp.', + authors: [ + 'Yehuda Katz', + 'Steve Klabnik' + ] + ] when: def result = render(''' -import grails.plugin.json.view.api.Widget -model { - Widget widget - Object meta -} - -json jsonapi.render(widget, [jsonApiObject: true, meta: meta]) -''', [widget: theWidget, meta: meta]) + import grails.plugin.json.view.api.Widget + model { + Widget widget + Object meta + } + + json jsonapi.render(widget, [jsonApiObject: true, meta: meta]) + ''', [widget: theWidget, meta: meta]) then: - result.jsonText == '''{"jsonapi":{"version":"1.0","meta":{"copyright":"Copyright 2015 Example Corp.","authors":["Yehuda Katz","Steve Klabnik"]}},"data":{"type":"widget","id":"5","attributes":{"width":4,"height":7,"name":"One"}},"links":{"self":"/widget/5"}}''' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "jsonapi": { + "version": "1.0", + "meta": { + "copyright": "Copyright 2015 Example Corp.", + "authors": [ + "Yehuda Katz", + "Steve Klabnik" + ] + } + }, + "data": { + "type": "widget", + "id": "5", + "attributes": { + "width": 4, + "height": 7, + "name": "One" + } + }, + "links": { + "self": "/widget/5" + } + } + ''') } - void "test meta object rendering without jsonApiObject"() { + void 'test meta object rendering without jsonApiObject'() { given: - Widget theWidget = new Widget(name: 'One', width: 4, height: 7) + def theWidget = new Widget(name: 'One', width: 4, height: 7) theWidget.id = 5 - def meta = [copyright: "Copyright 2015 Example Corp.", - authors: [ - "Yehuda Katz", - "Steve Klabnik" - ]] + def meta = [ + copyright: 'Copyright 2015 Example Corp.', + authors: [ + 'Yehuda Katz', + 'Steve Klabnik' + ] + ] when: def result = render(''' -import grails.plugin.json.view.api.Widget -model { - Widget widget - Object meta -} - -json jsonapi.render(widget, [meta: meta]) -''', [widget: theWidget, meta: meta]) + import grails.plugin.json.view.api.Widget + model { + Widget widget + Object meta + } + + json jsonapi.render(widget, [meta: meta]) + ''', [widget: theWidget, meta: meta]) then: - result.jsonText == '''{"meta":{"copyright":"Copyright 2015 Example Corp.","authors":["Yehuda Katz","Steve Klabnik"]},"data":{"type":"widget","id":"5","attributes":{"width":4,"height":7,"name":"One"}},"links":{"self":"/widget/5"}}''' + objectMapper.readTree(result.jsonText) == objectMapper.readTree(''' + { + "meta": { + "copyright": "Copyright 2015 Example Corp.", + "authors": [ + "Yehuda Katz", + "Steve Klabnik" + ] + }, + "data": { + "type": "widget", + "id": "5", + "attributes": { + "width": 4, + "height": 7, + "name": "One" + } + }, + "links": { + "self": "/widget/5" + } + } + ''') } - } @Entity @@ -217,6 +415,8 @@ class Book { @Entity class ResearchPaper { String title + + @SuppressWarnings('unused') static hasMany = [subAuthors: Author] Author leadAuthor Author coAuthor @@ -230,8 +430,8 @@ class Author { class SuperHero implements Validateable { String name + @SuppressWarnings('unused') static constraints = { name(blank: false) } -} - +} \ No newline at end of file diff --git a/markup/build.gradle b/markup/build.gradle index a4f4d40ff..6ae5b08cb 100644 --- a/markup/build.gradle +++ b/markup/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation libs.spring.beans implementation libs.spring.boot // For @ConfigurationProperties - compileOnly libs.javax.annotation.api // Provided + compileOnly libs.jakarta.annotation.api // Provided testImplementation libs.grails.web.urlmappings testImplementation libs.spock.core diff --git a/markup/src/main/groovy/grails/plugin/markup/view/mvc/MarkupViewResolver.groovy b/markup/src/main/groovy/grails/plugin/markup/view/mvc/MarkupViewResolver.groovy index 04ee5c696..669516dda 100644 --- a/markup/src/main/groovy/grails/plugin/markup/view/mvc/MarkupViewResolver.groovy +++ b/markup/src/main/groovy/grails/plugin/markup/view/mvc/MarkupViewResolver.groovy @@ -10,7 +10,7 @@ import grails.views.mvc.SmartViewResolver import grails.web.mime.MimeType import groovy.transform.CompileStatic import org.springframework.beans.factory.annotation.Autowired -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct /** * @author Graeme Rocher