Fix MockWebServer Dispatcher return type and RecordedRequest renames#972
Merged
Fix MockWebServer Dispatcher return type and RecordedRequest renames#972
Conversation
Restore the `MockResponse` return type on `Dispatcher.dispatch()` overrides after the blanket `MockResponse` → `MockResponse.Builder` rename, wrapping return expressions with `.build()`. Also rename `RecordedRequest.getPath()` → `getTarget()` and `getRequestUrl()` → `getUrl()` to match mockwebserver3 5.x.
Retarget UpdateMockWebServerDispatcher to match OLD (okhttp3.mockwebserver.*) types and run it before the blanket ChangeType, so dispatch() is pinned to mockwebserver3.MockResponse up front rather than reverted post-hoc.
Drop the manual J.Identifier construction in favor of a JavaTemplate replace, which delegates type attribution to the parser and removes the Tree/Collections imports.
3 tasks
mergify Bot
added a commit
to robfrank/linklift
that referenced
this pull request
May 3, 2026
…rom 3.30.0 to 3.35.2 [skip ci] Bumps [org.openrewrite.recipe:rewrite-testing-frameworks](https://github.com/openrewrite/rewrite-testing-frameworks) from 3.30.0 to 3.35.2. Release notes *Sourced from [org.openrewrite.recipe:rewrite-testing-frameworks's releases](https://github.com/openrewrite/rewrite-testing-frameworks/releases).* > 3.35.2 > ------ > > What's Changed > -------------- > > * OpenRewrite v8.81.0: <openrewrite/rewrite@v8.81.0...main> > > **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.35.1...v3.35.2> > > 3.35.1 > ------ > > What's Changed > -------------- > > * Fix `UpdateMockWebServerDispatcher` classpath lookup by [`@knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-testing-frameworks#975](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/975) > > **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.35.0...v3.35.1> > > 3.35.0 > ------ > > What's Changed > -------------- > > * Skip FieldAccess arguments in AssertThrowsOnLastStatement by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#965](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/965) > * Add MigrateToKafkaNative recipe for Testcontainers ([#568](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/568)) by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#967](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/967) > * Fix ClassCastException in RemoveTimesZeroAndOne by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#969](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/969) > * Fix RemoveTryCatchFailBlocks failing when removing blocks within lambda expressions by [`@sambsnyd`](https://github.com/sambsnyd) in [openrewrite/rewrite-testing-frameworks#970](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/970) > * Use KotlinTypeUtils.isKotlinUnit to match Kotlin void return types by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#971](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/971) > * Fix MockWebServer Dispatcher return type and RecordedRequest renames by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#972](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/972) > * Add [`@MockitoSettings`](https://github.com/MockitoSettings)(strictness = Strictness.WARN) for Mockito migration by [`@bmuschko`](https://github.com/bmuschko) in [openrewrite/rewrite-testing-frameworks#966](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/966) > > **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.34.0...v3.35.0> > > 3.34.0 > ------ > > What's Changed > -------------- > > * Remove empty if blocks after initMocks/openMocks cleanup by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#952](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/952) > * Extend SimplifyMockitoVerifyWhenGiven for more S6068 cases by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#953](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/953) > * Add RemoveDoNothingForDefaultMocks to Mockito1to3Migration by [`@bmuschko`](https://github.com/bmuschko) in [openrewrite/rewrite-testing-frameworks#956](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/956) > * Skip private method stubbing in PowerMockitoDoStubbingToMockito by [`@bmuschko`](https://github.com/bmuschko) in [openrewrite/rewrite-testing-frameworks#957](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/957) > * Fix AssertToAssertionsTest expectations for static imports by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#958](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/958) > * Add ThenThrowCheckedExceptionToRuntimeException recipe by [`@bmuschko`](https://github.com/bmuschko) in [openrewrite/rewrite-testing-frameworks#954](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/954) > * Fix AnyToNullable removing any() import when untyped any() still used by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#960](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/960) > * Rename implicit [`@MethodSource`](https://github.com/MethodSource) methods in RemoveTestPrefix by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#961](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/961) > * Add UpgradeWiremockDependencyVersion recipe by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#963](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/963) > * Support intermediate methods in SimplifyChainedAssertJAssertion by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#962](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/962) > * Add MigrateToOracleFree recipe for Testcontainers by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#964](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/964) > > **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.33.0...v3.34.0> > > 3.33.0 > ------ > > What's Changed > -------------- > > * OpenRewrite recipe best practices by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#949](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/949) > * Add RemoveDoNothingForDefaultMocks recipe by [`@bmuschko`](https://github.com/bmuschko) in [openrewrite/rewrite-testing-frameworks#947](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/947) > * Add PowerMockitoDoStubbingToMockito recipe by [`@bmuschko`](https://github.com/bmuschko) in [openrewrite/rewrite-testing-frameworks#948](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/948) > * Remove [`@SuppressStaticInitializationFor`](https://github.com/SuppressStaticInitializationFor) during PowerMockito migration by [`@bmuschko`](https://github.com/bmuschko) in [openrewrite/rewrite-testing-frameworks#946](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/946) ... (truncated) Commits * [`1302589`](openrewrite/rewrite-testing-frameworks@1302589) Make declarative recipes singletons * [`92de89a`](openrewrite/rewrite-testing-frameworks@92de89a) Fix UpdateMockWebServerDispatcher classpath lookup ([#975](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/975)) * [`64260b8`](openrewrite/rewrite-testing-frameworks@64260b8) Extract documentation examples from tests * [`e09430b`](openrewrite/rewrite-testing-frameworks@e09430b) Add [`@MockitoSettings`](https://github.com/MockitoSettings)(strictness = Strictness.WARN) for Mockito migration ([#966](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/966)) * [`f041383`](openrewrite/rewrite-testing-frameworks@f041383) Fix MockWebServer Dispatcher return type and RecordedRequest renames ([#972](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/972)) * [`13f0a17`](openrewrite/rewrite-testing-frameworks@13f0a17) OpenRewrite recipe best practices * [`83d1f44`](openrewrite/rewrite-testing-frameworks@83d1f44) Use KotlinTypeUtils.isKotlinUnit to match Kotlin void return types ([#971](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/971)) * [`675b57d`](openrewrite/rewrite-testing-frameworks@675b57d) Fix RemoveTryCatchFailBlocks failing when removing blocks within lambda expre... * [`ea72478`](openrewrite/rewrite-testing-frameworks@ea72478) Fix ClassCastException in RemoveTimesZeroAndOne ([#969](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/969)) * [`58bcc12`](openrewrite/rewrite-testing-frameworks@58bcc12) Add MigrateToKafkaNative recipe for Testcontainers ([#568](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/568)) ([#967](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/967)) * Additional commits viewable in [compare view](openrewrite/rewrite-testing-frameworks@v3.30.0...v3.35.2)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
UpdateMockWebServerDispatcherrecipe restores theMockResponsereturn type onDispatcher.dispatch()overrides after the blanketMockResponse→MockResponse.Builderrename, wrapping return expressions with.build().RecordedRequest.getPath()→getTarget()andgetRequestUrl()→getUrl()renames to align with mockwebserver3 5.x.Test plan
dispatcherReturnTypeAndGetPathRenametest inUpdateMockWebServerMockResponseTestcovering the end-to-end migration.