Rebase patches onto upstream v1.36.0#17
Merged
Merged
Conversation
Upstream v1.36.0 refactored Nexus token handling: WorkflowRunOperationToken was renamed to the generalized OperationToken, and OperationTokenUtil gained a loadOperationToken/loadWorkflowRunOperationToken split. The Jackson-to-Moshi patch targeted the old class and method shape, so it no longer applied. Port patch 0001 to the new layout: - OperationToken: Jackson @JsonProperty/@JsonInclude -> Moshi @JSON(name), drop the now-unused Jackson constructor (Moshi's reflective adapter sets fields directly via OperationTokenTypeAdapter) - OperationTokenUtil: retype adapter to OperationToken, swap ObjectMapper for the Moshi adapter, null-safe enum comparison - WorkflowRunTokenTest: ObjectMapper -> Moshi adapter - Drop the obsolete jackson3Tests Gradle suite (upstream reworked it) Bump .upstream-version to v1.36.0. Patches 0002-0005 are unchanged except for regenerated base commit hashes. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.
Patches failed to apply against upstream v1.36.0. Upstream refactored Nexus token handling —
WorkflowRunOperationTokenwas renamed to the generalizedOperationToken, andOperationTokenUtilgained aloadOperationToken/loadWorkflowRunOperationTokensplit. The Jackson→Moshi patch (0001) targeted the old class and method shape, so three hunks rejected.Resolution
Ported patch 0001 to the v1.36.0 layout:
OperationToken: Jackson@JsonProperty/@JsonInclude→ Moshi@Json(name=…); dropped the now-unused Jackson-annotated constructor, since Moshi's reflective adapter sets fields directly viaOperationTokenTypeAdapter.OperationTokenUtil: retyped the adapter toOperationToken, swappedObjectMapperfor the Moshi adapter, and made the token-type comparison null-safe.WorkflowRunTokenTest:ObjectMapper→ Moshi adapter;new Integer(1)→Integer.valueOf(1).jackson3TestsGradle suite (upstream reworked it).Bumped
.upstream-versiontov1.36.0. Patches 0002–0005 are unchanged apart from regenerated base commit hashes.Verification
git amapplies clean.:temporal-sdk:compileJavasucceeds (Java 21 toolchain).WorkflowRunTokenTestandMoshiJsonPayloadConverterTestpass.Closes #14
Closes #13
🤖 Generated with Claude Code