ruthst00 opened a new pull request, #16451: URL: https://github.com/apache/grails-core/pull/16451
## Description <!-- Describe your change and the problem it solves. Link to the related issue(s) if they exist. --> #### `grails-interceptors/src/main/groovy/grails/artefact/Interceptor.groovy` `getModel()` was changed from a simple null-safe `modelAndView?.modelMap` to an explicit if/else that first checks for a `ModelAndView` (existing path), then falls back to reading `GrailsApplicationAttributes.TEMPLATE_MODEL` from the request. This fixes the case where a controller uses `render template: '...', model: [...]`, which stores the model under `TEMPLATE_MODEL` rather than in a `ModelAndView`, causing `interceptor.model` to return `null` in `after()`. #### New test cases in `grails-interceptors/src/test/groovy/grails/artefact/InterceptorSpec.groovy` - Added imports for `GrailsApplicationAttributes` and `ModelAndView`. - Added 4 new Spock feature methods covering every branch of the updated `getModel()`: null when nothing is set, `ModelAndView` path (existing behavior), `TEMPLATE_MODEL` fallback (new behaviour), and `MODEL_AND_VIEW` taking priority when both are present. All tests pass. Since this issue exists on every major release branch from 3.0.x to 9.0.x, this is the first of several identical changes starting with the current stable/active branch `8.0.x`. After these changes are merged to the main branch, the same change should be made to the `8.1.x` and `9.0.x` branches. Fixes [#12081](https://github.com/apache/grails-core/issues/12081) Generated with [Claude Sonnet 4.6](https://www.anthropic.com/claude/sonnet) via [Cline API Provider](https://cline.bot/) ## Contributor Checklist Please review the following checklist before submitting your pull request. Pull requests that do not meet these requirements may be closed without review. ### Issue and Scope - [X] This PR is linked to an existing issue that has been **acknowledged or approved** by the project team. If no approved issue exists, please give background on why this change is necessary. Tickets are preferred for release change log history. - [X] This PR addresses the **complete scope** of the linked issue. Partial implementations or unfinished work should not be submitted for review. - [X] This PR contains a **single, focused change**. Unrelated changes should be submitted as separate pull requests. - [X] This PR targets the **correct branch** for the type of change: - **Patch release branches** (e.g., `7.0.x`): Bug fixes only. No new features or API changes. - **Minor release branches** (e.g., `7.1.x`): New features are welcome, but breaking existing APIs must be avoided. - **Major release branches** (e.g., `8.0.x`): Reserved for major changes. Breaking API changes are permitted. ### Code Quality - [X] I have **added or updated tests** that cover the changes introduced in this PR. All code contributions are expected to include appropriate test coverage. - [X] I have verified that all existing tests pass by running `./gradlew build --rerun-tasks`. - [X] My code follows the project's **code style** guidelines. I have run `./gradlew codeStyle` and resolved any violations. See [Code Style](../CONTRIBUTING.md#code-style) for details. - [X] This PR does **not** include mass reformatting, style-only changes, or large-scale refactoring unless it was **explicitly approved** in the linked issue. Unsolicited reformatting will not be accepted. - [X] If generative AI tooling was used in preparing this contribution, a quality model was used to ensure contributions are **consistent with the project's quality standards**. ### Licensing and Attribution - [X] All contributed code is provided under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0), and new source files include the appropriate **Apache license header**. - [X] I have the necessary rights to submit this contribution and confirm it is my own original work (see [Legal Notice](../CONTRIBUTING.md#i-want-to-contribute)). - [X] If generative AI tooling was used in preparing this contribution, I have followed the [Apache Software Foundation's policy on generative tooling](https://www.apache.org/legal/generative-tooling.html) and have properly attributed its use. ### Documentation - [ ] If this PR introduces user-facing changes, I have included or updated the relevant documentation. - [ ] If this PR adds a new feature, I have updated the **What's New** section of the Grails Guide. - [ ] If this PR introduces breaking changes or changes that require user action during an upgrade, I have updated the **Upgrade Notes** for the corresponding version in the Grails Guide. - [X] The PR description clearly explains **what** was changed and **why**. --- > **First-time contributors:** Please read our [Contributing Guide](../CONTRIBUTING.md) before submitting. > Pull requests that appear to be auto-generated, incomplete, or unrelated to an approved issue may be > closed to help maintainers focus on reviewed and planned work. We appreciate your understanding. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
