Skip to content

Add ReturnActual recipe for AssertJ#891

Merged
timtebeek merged 8 commits intomainfrom
collapse-assertthat-and-return-actual
Jan 24, 2026
Merged

Add ReturnActual recipe for AssertJ#891
timtebeek merged 8 commits intomainfrom
collapse-assertthat-and-return-actual

Conversation

@timtebeek
Copy link
Member

@timtebeek timtebeek commented Jan 24, 2026

Summary

  • Adds a new recipe that collapses an assertThat statement immediately followed by a return of the same object into a single return assertThat(...).assertions().actual() statement
  • Only matches immediately adjacent assertion + return pairs (conservative, avoids side-effect issues)
  • Rejects chains that change the assertion type (e.g., extracting()), method-call arguments, and non-matching return variables

Example

// Before
assertThat(object).isNotNull().hasSize(3);
return object;

// After
return assertThat(object).isNotNull().hasSize(3).actual();

Test plan

  • Single assertion + return → collapsed with .actual()
  • Chained assertions + return → collapsed
  • String type with .isEqualTo() → collapsed
  • No-op: return of a different variable
  • No-op: statements between assertion and return
  • No-op: assertThat argument is a method call
  • No-op: chain changes assertion type (e.g., extracting())
  • No-op: void return (no expression)

🤖 Generated with Claude Code

@timtebeek @claude
Add CollapseAssertThatAndReturnActual recipe
29ee486 
Collapse an `assertThat` statement immediately followed by a `return` of the
same object into a single `return assertThat(...).assertions().actual()`.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
@github-project-automation github-project-automation bot moved this to In Progress in OpenRewrite Jan 24, 2026
timtebeek and others added 3 commits January 24, 2026 23:19
@timtebeek
Update recipes.csv
e7ed6e0
@timtebeek @claude
Use JavaTemplate for .actual() construction
3396973 
Replace manual LST construction with JavaTemplate using a synthetic cursor
at the assertion level, which properly resolves types from the classpath.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
@timtebeek
Rename and minimize implementation
bb05f09
@timtebeek timtebeek added recipe Recipe request assertj labels Jan 24, 2026
@timtebeek timtebeek changed the title Add CollapseAssertThatAndReturnActual recipe Add ReturnActual recipe for Assertj Jan 24, 2026
@timtebeek timtebeek marked this pull request as ready for review January 24, 2026 23:08
@timtebeek timtebeek changed the title Add ReturnActual recipe for Assertj Add ReturnActual recipe for AssertJ Jan 24, 2026
@timtebeek timtebeek merged commit baa6403 into main Jan 24, 2026
2 checks passed
@timtebeek timtebeek deleted the collapse-assertthat-and-return-actual branch January 24, 2026 23:42
@github-project-automation github-project-automation bot moved this from In Progress to Done in OpenRewrite Jan 24, 2026
mergify bot added a commit to robfrank/linklift that referenced this pull request Feb 14, 2026
@mergify
chore(deps): bump org.openrewrite.recipe:rewrite-testing-frameworks f…
e052594 
…rom 3.26.0 to 3.27.0 [skip ci]

Bumps [org.openrewrite.recipe:rewrite-testing-frameworks](https://github.com/openrewrite/rewrite-testing-frameworks) from 3.26.0 to 3.27.0.
Release notes

*Sourced from [org.openrewrite.recipe:rewrite-testing-frameworks's releases](https://github.com/openrewrite/rewrite-testing-frameworks/releases).*

> 3.27.0
> ------
>
> What's Changed
> --------------
>
> * Correcting MockWebServer migration for OkHttp by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-testing-frameworks#849](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/849)
> * Add `ReturnActual` recipe for AssertJ by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#891](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/891)
> * Add `MockConstructionToTryWithResources` recipe by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-testing-frameworks#892](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/892)
> * Add CleanupKotlinJUnit5AssertionImports recipe by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-testing-frameworks#893](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/893)
> * Skip Kotlin files in PowerMockitoMockStaticToMockito by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-testing-frameworks#894](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/894)
> * Add test cases for `MockedConstruction` pattern by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-testing-frameworks#895](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/895)
> * Update byte buddy to a Java 25 compatible version by [`@​Laurens-W`](https://github.com/Laurens-W) in [openrewrite/rewrite-testing-frameworks#897](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/897)
> * Followup after the formatting merge by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-testing-frameworks#900](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/900)
> * Skip TemporaryFolder conversion when used in RuleChain. by [`@​motlin`](https://github.com/motlin) in [openrewrite/rewrite-testing-frameworks#898](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/898)
> * Add JUnit 4 to JUnit 5 exception class migrations. by [`@​motlin`](https://github.com/motlin) in [openrewrite/rewrite-testing-frameworks#902](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/902)
> * Make declarative recipes singletons by [`@​sambsnyd`](https://github.com/sambsnyd) in [openrewrite/rewrite-testing-frameworks#905](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/905)
> * Handle method references in JUnit Assert to Assertions migration. by [`@​motlin`](https://github.com/motlin) in [openrewrite/rewrite-testing-frameworks#901](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/901)
> * Add explicit test scope to AssertJ dependency additions by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-testing-frameworks#903](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/903)
> * Skip SimplifyChainedAssertJAssertion when actual type has wildcard type parameters by [`@​knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-testing-frameworks#906](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/906)
> * Revert "Add explicit test scope to AssertJ dependency additions ([#903](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/903))" by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-testing-frameworks#907](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/907)
> * Fix AssertThrowsOnLastStatement to preserve parameterized types when extracting arguments. by [`@​motlin`](https://github.com/motlin) in [openrewrite/rewrite-testing-frameworks#908](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/908)
> * Enhance RemoveInitMocksIfRunnersSpecified to also remove openMocks by [`@​dsgrieve`](https://github.com/dsgrieve) in [openrewrite/rewrite-testing-frameworks#904](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/904)
> * `RemoveInitMocksIfRunnersSpecified` (or any recipe) should not have a mutable static field by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-testing-frameworks#910](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/910)
>
> New Contributors
> ----------------
>
> * [`@​motlin`](https://github.com/motlin) made their first contribution in [openrewrite/rewrite-testing-frameworks#898](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/898)
> * [`@​dsgrieve`](https://github.com/dsgrieve) made their first contribution in [openrewrite/rewrite-testing-frameworks#904](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/904)
>
> **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.26.0...v3.27.0>


Commits

* [`41e6b42`](openrewrite/rewrite-testing-frameworks@41e6b42) Extract documentation examples from tests
* [`403dd48`](openrewrite/rewrite-testing-frameworks@403dd48) review comment ([#910](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/910))
* [`e6c383b`](openrewrite/rewrite-testing-frameworks@e6c383b) Delete files
* [`cf78c5a`](openrewrite/rewrite-testing-frameworks@cf78c5a) Enhance RemoveInitMocksIfRunnersSpecified to also remove openMocks ([#904](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/904))
* [`75c12cd`](openrewrite/rewrite-testing-frameworks@75c12cd) Fix AssertThrowsOnLastStatement to preserve parameterized types when extracti...
* [`07b43cd`](openrewrite/rewrite-testing-frameworks@07b43cd) Revert "Add explicit test scope to AssertJ dependency additions ([#903](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/903))" ([#907](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/907))
* [`3a67bb9`](openrewrite/rewrite-testing-frameworks@3a67bb9) Skip SimplifyChainedAssertJAssertion when actual type has wildcard type param...
* [`02eba0f`](openrewrite/rewrite-testing-frameworks@02eba0f) Add explicit test scope to AssertJ dependency additions ([#903](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/903))
* [`4e79908`](openrewrite/rewrite-testing-frameworks@4e79908) Handle method references in JUnit Assert to Assertions migration. ([#901](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/901))
* [`35409b0`](openrewrite/rewrite-testing-frameworks@35409b0) Make declarative recipes singletons ([#905](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/905))
* Additional commits viewable in [compare view](openrewrite/rewrite-testing-frameworks@v3.26.0...v3.27.0)
  
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility\_score?dependency-name=org.openrewrite.recipe:rewrite-testing-frameworks&package-manager=maven&previous-version=3.26.0&new-version=3.27.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
  
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

Assignees

@timtebeek timtebeek

Labels

assertj recipe Recipe request

Projects

OpenRewrite
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@timtebeek