Remove non-null upper bound for OutputT. #49
Merged
Conversation
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
workflow-core/src/main/java/com/squareup/workflow/WorkflowAction.kt
Outdated
Show resolved
Hide resolved
rjrjr
approved these changes
Jun 26, 2020
workflow-runtime/src/main/java/com/squareup/workflow/internal/WorkflowNode.kt
Outdated
Show resolved
Hide resolved
workflow-testing/src/main/java/com/squareup/workflow/testing/RenderTestResult.kt
Outdated
Show resolved
Hide resolved
workflow-runtime/src/main/java/com/squareup/workflow/internal/NoOutput.kt
Outdated
Show resolved
Hide resolved
zach-klippenstein
force-pushed
the
zachklipp/nullable-output
branch
3 times, most recently
from
5241a14 to
9216a69
Compare
Collaborator
Author
|
Discussed testing and |
rjrjr
approved these changes
Jun 27, 2020
| * If this is already a [CancellationException], returns it as-is, otherwise wraps it in one with | ||
| * the given message. | ||
| */ | ||
| private inline fun Throwable?.toCancellationException(message: () -> String) = when (this) { |
Collaborator
Author
There was a problem hiding this comment.
Yea, it stopped being used in an earlier PR but the deletion got left out of a rebase. I'm not sure why ktlint/compiler warnings for unused code didn't catch this actually.
workflow-runtime/src/main/java/com/squareup/workflow/internal/MaybeOutput.kt
Show resolved
Hide resolved
workflow-runtime/src/main/java/com/squareup/workflow/internal/MaybeOutput.kt
Show resolved
Hide resolved
| snapshotCache: Map<WorkflowNodeId, TreeSnapshot>, | ||
| private val contextForChildren: CoroutineContext, | ||
| private val emitActionToParent: (WorkflowAction<StateT, OutputT>) -> Any?, | ||
| private val emitActionToParent: (WorkflowAction<StateT, OutputT>) -> MaybeOutput<Any?>, |
Collaborator
There was a problem hiding this comment.
Do we really need both MaybeOutput and OutputHolder? No strong feelings about it, just surprised.
Collaborator
Author
There was a problem hiding this comment.
They're both internal to their modules. To share them, we'd have to make one of them public, and I don't want to do that.
zach-klippenstein
force-pushed
the
zachklipp/nullable-output
branch
from
7efe64a to
e49357e
Compare
zach-klippenstein
added a commit
that referenced
this pull request
Jun 29, 2020
After #49 made outputs nullable, and introduced new `RenderTestResult` methods to handle nullable outputs (`verifyActionState`, `verifyActionOutput`, and `verifyNoActionOutput`), #64 came along and introduced a dedicated type for nullable outputs, `WorkflowOutput`. This type means that we can revert the `RenderTestResult` changes made in #49 and return to the simpler API with only `verifyAction` and `verifyActionResult` methods. This change does exactly that.
zach-klippenstein
added a commit
that referenced
this pull request
Jun 29, 2020
After #49 made outputs nullable, and introduced new `RenderTestResult` methods to handle nullable outputs (`verifyActionState`, `verifyActionOutput`, and `verifyNoActionOutput`), #64 came along and introduced a dedicated type for nullable outputs, `WorkflowOutput`. This type means that we can revert the `RenderTestResult` changes made in #49 and return to the simpler API with only `verifyAction` and `verifyActionResult` methods. This change does exactly that.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This should be the last unblocker for GUWT workers.
Fixes #59.