-
Notifications
You must be signed in to change notification settings - Fork 249
Add support for setting ActivityID #3044
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
112 changes: 112 additions & 0 deletions
112
temporal-sdk/src/main/java/io/temporal/internal/sync/ActivityInvocationInternal.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| package io.temporal.internal.sync; | ||
|
|
||
| import io.temporal.workflow.ActivityInvocationOptions; | ||
| import io.temporal.workflow.Functions; | ||
| import io.temporal.workflow.Promise; | ||
| import java.util.Objects; | ||
|
|
||
| /** Applies options to one typed Activity proxy invocation. */ | ||
| final class ActivityInvocationInternal { | ||
|
|
||
| private static final ThreadLocal<State> invocation = new ThreadLocal<>(); | ||
|
|
||
| private ActivityInvocationInternal() {} | ||
|
|
||
| static <R> R invoke(ActivityInvocationOptions options, Functions.Func<R> invocationFunction) { | ||
| State state = startInvocation(options, false); | ||
| try { | ||
| R result = invocationFunction.apply(); | ||
| state.verifyConsumed(); | ||
| return result; | ||
| } finally { | ||
| invocation.remove(); | ||
| } | ||
| } | ||
|
|
||
| static void invoke(ActivityInvocationOptions options, Functions.Proc invocationFunction) { | ||
| State state = startInvocation(options, false); | ||
| try { | ||
| invocationFunction.apply(); | ||
| state.verifyConsumed(); | ||
| } finally { | ||
| invocation.remove(); | ||
| } | ||
| } | ||
|
|
||
| static <R> Promise<R> invokeAsync( | ||
| ActivityInvocationOptions options, Functions.Proc invocationFunction) { | ||
| State state = startInvocation(options, true); | ||
| try { | ||
| invocationFunction.apply(); | ||
| return state.getResult(); | ||
| } finally { | ||
| invocation.remove(); | ||
| } | ||
| } | ||
|
|
||
| private static State startInvocation(ActivityInvocationOptions options, boolean async) { | ||
| if (invocation.get() != null) { | ||
| throw new IllegalStateException("Already invoking an Activity with invocation options"); | ||
| } | ||
|
|
||
| State state = new State(Objects.requireNonNull(options, "options"), async); | ||
| invocation.set(state); | ||
| return state; | ||
| } | ||
|
|
||
| static ActivityInvocationOptions consumeOptions() { | ||
| State state = invocation.get(); | ||
| if (state == null) { | ||
| return ActivityInvocationOptions.getDefaultInstance(); | ||
| } | ||
| if (state.consumed) { | ||
| throw new IllegalStateException("ActivityInvocationOptions can apply to only one invocation"); | ||
| } | ||
| state.consumed = true; | ||
| return state.options; | ||
| } | ||
|
|
||
| static <R> boolean captureResult(Promise<R> result) { | ||
| State state = invocation.get(); | ||
| if (state == null || !state.async) { | ||
| return false; | ||
| } | ||
| if (state.result != null) { | ||
| throw new IllegalStateException("ActivityInvocationOptions can apply to only one invocation"); | ||
| } | ||
| state.result = Objects.requireNonNull(result, "result"); | ||
| return true; | ||
| } | ||
|
|
||
| private static final class State { | ||
| private final ActivityInvocationOptions options; | ||
| private final boolean async; | ||
| private boolean consumed; | ||
| private Promise<?> result; | ||
|
|
||
| private State(ActivityInvocationOptions options, boolean async) { | ||
| this.options = options; | ||
| this.async = async; | ||
| } | ||
|
|
||
| private void verifyConsumed() { | ||
| if (!consumed) { | ||
| throw invalidInvocation(); | ||
| } | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private <R> Promise<R> getResult() { | ||
| if (!consumed || result == null) { | ||
| throw invalidInvocation(); | ||
| } | ||
| return (Promise<R>) result; | ||
| } | ||
|
|
||
| private IllegalArgumentException invalidInvocation() { | ||
| return new IllegalArgumentException( | ||
| "activityMethod must invoke an Activity stub created through Workflow.newActivityStub " | ||
| + "or Workflow.newLocalActivityStub"); | ||
| } | ||
| } | ||
| } | ||
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When the supplied function is a lambda that transforms the activity result, such as
() -> activities.getNumber() + 1, the proxy captures the underlying ActivityPromisebut returns a default value to the lambda; this call then discards the lambda's computed result and returns the captured promise unchecked. Consequently the example resolves to the raw Activity value rather than the incremented value, and lambdas that dereference object results can throwNullPointerException. Either preserve the function's result semantics or reject anything other than a direct Activity invocation.Useful? React with 👍 / 👎.