Skip to content

Polish #1001 #1003

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.

Sign up for GitHub

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 2 commits into from
Jan 25, 2022
Merged

Polish #1001 #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
379f41f
Polish #1001
Spikhalskiy Jan 25, 2022
2b23921
Apply suggestions from code review
Spikhalskiy Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions temporal-sdk/src/main/java/io/temporal/internal/common/ActivityOptionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright (C) 2020 Temporal Technologies, Inc. All Rights Reserved.
*
* Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Modifications copyright (C) 2017 Uber Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You may not
* use this file except in compliance with the License. A copy of the License is
* located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/

package io.temporal.internal.common;

import io.temporal.activity.ActivityOptions;
import io.temporal.activity.LocalActivityOptions;
import java.util.Map;
import javax.annotation.Nonnull;

public class ActivityOptionUtils {
public static void mergePredefinedActivityOptions(
@Nonnull Map<String, ActivityOptions> mergeTo,
@Nonnull Map<String, ActivityOptions> override) {
override.forEach(
(key, value) ->
mergeTo.merge(key, value, (o1, o2) -> o1.toBuilder().mergeActivityOptions(o2).build()));
}

public static void mergePredefinedLocalActivityOptions(
@Nonnull Map<String, LocalActivityOptions> mergeTo,
@Nonnull Map<String, LocalActivityOptions> override) {
override.forEach(
(key, value) ->
mergeTo.merge(key, value, (o1, o2) -> o1.toBuilder().mergeActivityOptions(o2).build()));
}
}
55 changes: 25 additions & 30 deletions temporal-sdk/src/main/java/io/temporal/internal/sync/SyncWorkflowContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import io.temporal.failure.ChildWorkflowFailure;
import io.temporal.failure.FailureConverter;
import io.temporal.failure.TemporalFailure;
import io.temporal.internal.common.ActivityOptionUtils;
import io.temporal.internal.common.InternalUtils;
import io.temporal.internal.common.OptionsUtils;
import io.temporal.internal.common.ProtobufTimeUtils;
Expand All @@ -73,17 +74,12 @@
import io.temporal.workflow.Workflow;
import java.lang.reflect.Type;
import java.time.Duration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Random;
import java.util.UUID;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiPredicate;
import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

final class SyncWorkflowContext implements WorkflowOutboundCallsInterceptor {
Expand All @@ -100,9 +96,9 @@ final class SyncWorkflowContext implements WorkflowOutboundCallsInterceptor {
private DeterministicRunner runner;

private ActivityOptions defaultActivityOptions = null;
private Map<String, ActivityOptions> activityOptionsMap = new HashMap<>();
private Map<String, ActivityOptions> activityOptionsMap;
private LocalActivityOptions defaultLocalActivityOptions = null;
private Map<String, LocalActivityOptions> localActivityOptionsMap = new HashMap<>();
private Map<String, LocalActivityOptions> localActivityOptionsMap;

public SyncWorkflowContext(
ReplayWorkflowContext context,
Expand All @@ -129,10 +125,11 @@ public SyncWorkflowContext(
this.queryDispatcher = new QueryDispatcher(converter);
if (workflowImplementationOptions != null) {
this.defaultActivityOptions = workflowImplementationOptions.getDefaultActivityOptions();
this.activityOptionsMap = workflowImplementationOptions.getActivityOptions();
this.activityOptionsMap = new HashMap<>(workflowImplementationOptions.getActivityOptions());
this.defaultLocalActivityOptions =
workflowImplementationOptions.getDefaultLocalActivityOptions();
this.localActivityOptionsMap = workflowImplementationOptions.getLocalActivityOptions();
this.localActivityOptionsMap =
new HashMap<>(workflowImplementationOptions.getLocalActivityOptions());
}
// initial values for headInboundInterceptor and headOutboundInterceptor until they initialized
// with actual interceptors through #initHeadInboundCallsInterceptor and
Expand Down Expand Up @@ -177,16 +174,20 @@ public ActivityOptions getDefaultActivityOptions() {
return defaultActivityOptions;
}

public Map<String, ActivityOptions> getActivityOptions() {
return activityOptionsMap;
public @Nonnull Map<String, ActivityOptions> getActivityOptions() {
return activityOptionsMap != null
? Collections.unmodifiableMap(activityOptionsMap)
: Collections.emptyMap();
}

public LocalActivityOptions getDefaultLocalActivityOptions() {
return defaultLocalActivityOptions;
}

public Map<String, LocalActivityOptions> getLocalActivityOptions() {
return localActivityOptionsMap;
public @Nonnull Map<String, LocalActivityOptions> getLocalActivityOptions() {
return localActivityOptionsMap != null
? Collections.unmodifiableMap(localActivityOptionsMap)
: Collections.emptyMap();
}

public void setDefaultActivityOptions(ActivityOptions defaultActivityOptions) {
Expand All @@ -199,16 +200,13 @@ public void setDefaultActivityOptions(ActivityOptions defaultActivityOptions) {
.build();
}

public void setActivityOptions(Map<String, ActivityOptions> activityMethodOptions) {
Objects.requireNonNull(activityMethodOptions);
public void applyActivityOptions(Map<String, ActivityOptions> activityTypeToOption) {
Objects.requireNonNull(activityTypeToOption);
if (this.activityOptionsMap == null) {
this.activityOptionsMap = new HashMap<>(activityMethodOptions);
this.activityOptionsMap = new HashMap<>(activityTypeToOption);
return;
}
activityMethodOptions.forEach(
(key, value) ->
this.activityOptionsMap.merge(
key, value, (o1, o2) -> o1.toBuilder().mergeActivityOptions(o2).build()));
ActivityOptionUtils.mergePredefinedActivityOptions(activityOptionsMap, activityTypeToOption);
}

public void setDefaultLocalActivityOptions(LocalActivityOptions defaultLocalActivityOptions) {
Expand All @@ -221,17 +219,14 @@ public void setDefaultLocalActivityOptions(LocalActivityOptions defaultLocalActi
.build();
}

public void setLocalActivityOptions(
Map<String, LocalActivityOptions> localActivityMethodOptions) {
Objects.requireNonNull(localActivityMethodOptions);
public void applyLocalActivityOptions(Map<String, LocalActivityOptions> activityTypeToOption) {
Objects.requireNonNull(activityTypeToOption);
if (this.localActivityOptionsMap == null) {
this.localActivityOptionsMap = new HashMap<>(localActivityMethodOptions);
this.localActivityOptionsMap = new HashMap<>(activityTypeToOption);
return;
}
localActivityMethodOptions.forEach(
(key, value) ->
this.localActivityOptionsMap.merge(
key, value, (o1, o2) -> o1.toBuilder().mergeActivityOptions(o2).build()));
ActivityOptionUtils.mergePredefinedLocalActivityOptions(
localActivityOptionsMap, activityTypeToOption);
}

@Override
Expand Down
77 changes: 44 additions & 33 deletions temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowInternal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static io.temporal.internal.sync.AsyncInternal.AsyncMarker;
import static io.temporal.internal.sync.DeterministicRunnerImpl.currentThreadInternal;

import com.google.common.base.MoreObjects;
import com.uber.m3.tally.Scope;
import io.temporal.activity.ActivityOptions;
import io.temporal.activity.LocalActivityOptions;
Expand All @@ -35,6 +36,7 @@
import io.temporal.common.metadata.POJOWorkflowInterfaceMetadata;
import io.temporal.common.metadata.POJOWorkflowMethodMetadata;
import io.temporal.failure.FailureConverter;
import io.temporal.internal.common.ActivityOptionUtils;
import io.temporal.internal.logging.ReplayAwareLogger;
import io.temporal.serviceclient.CheckedExceptionWrapper;
import io.temporal.workflow.ActivityStub;
Expand All @@ -59,15 +61,10 @@
import java.lang.reflect.Proxy;
import java.lang.reflect.Type;
import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.UUID;
import java.util.*;
import java.util.function.BiPredicate;
import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -197,17 +194,17 @@ public static void setDefaultActivityOptions(ActivityOptions activityOptions) {
getRootWorkflowContext().setDefaultActivityOptions(activityOptions);
}

public static void setActivityOptions(Map<String, ActivityOptions> activityMethodOptions) {
getRootWorkflowContext().setActivityOptions(activityMethodOptions);
public static void applyActivityOptions(Map<String, ActivityOptions> activityTypeToOptions) {
getRootWorkflowContext().applyActivityOptions(activityTypeToOptions);
}

public static void setDefaultLocalActivityOptions(LocalActivityOptions localActivityOptions) {
getRootWorkflowContext().setDefaultLocalActivityOptions(localActivityOptions);
}

public static void setLocalActivityOptions(
Map<String, LocalActivityOptions> localActivityMethodOptions) {
getRootWorkflowContext().setLocalActivityOptions(localActivityMethodOptions);
public static void applyLocalActivityOptions(
Map<String, LocalActivityOptions> activityTypeToOptions) {
getRootWorkflowContext().applyLocalActivityOptions(activityTypeToOptions);
}

/**
Expand All @@ -226,17 +223,23 @@ public static <T> T newActivityStub(
// have received in WorkflowImplementationOptions.
SyncWorkflowContext context = getRootWorkflowContext();
options = (options == null) ? context.getDefaultActivityOptions() : options;
Map<String, ActivityOptions> mergedActivityOptionsMap = new HashMap<>();
Map<String, ActivityOptions> activityOptions = context.getActivityOptions();
if (activityOptions != null) {
mergedActivityOptionsMap.putAll(activityOptions);
}
if (activityMethodOptions != null) {
activityMethodOptions.forEach(
(key, value) ->
mergedActivityOptionsMap.merge(
key, value, (o1, o2) -> o1.toBuilder().mergeActivityOptions(o2).build()));

Map<String, ActivityOptions> mergedActivityOptionsMap;
@Nonnull Map<String, ActivityOptions> predefinedActivityOptions = context.getActivityOptions();
if (activityMethodOptions != null
&& !activityMethodOptions.isEmpty()
&& predefinedActivityOptions.isEmpty()) {
// we need to merge only in this case
mergedActivityOptionsMap = new HashMap<>(predefinedActivityOptions);
ActivityOptionUtils.mergePredefinedActivityOptions(
mergedActivityOptionsMap, activityMethodOptions);
} else {
mergedActivityOptionsMap =
MoreObjects.firstNonNull(
activityMethodOptions,
MoreObjects.firstNonNull(predefinedActivityOptions, Collections.emptyMap()));
}

InvocationHandler invocationHandler =
ActivityInvocationHandler.newInstance(
activityInterface,
Expand All @@ -257,22 +260,30 @@ public static <T> T newActivityStub(
public static <T> T newLocalActivityStub(
Class<T> activityInterface,
LocalActivityOptions options,
Map<String, LocalActivityOptions> activityMethodOptions) {
@Nullable Map<String, LocalActivityOptions> activityMethodOptions) {
// Merge the activity options we may have received from the workflow with the options we may
// have received in WorkflowImplementationOptions.
SyncWorkflowContext context = getRootWorkflowContext();
options = (options == null) ? context.getDefaultLocalActivityOptions() : options;
Map<String, LocalActivityOptions> mergedLocalActivityOptionsMap = new HashMap<>();
Map<String, LocalActivityOptions> localActivityOptions = context.getLocalActivityOptions();
if (localActivityOptions != null) {
mergedLocalActivityOptionsMap.putAll(localActivityOptions);
}
if (activityMethodOptions != null) {
activityMethodOptions.forEach(
(key, value) ->
mergedLocalActivityOptionsMap.merge(
key, value, (o1, o2) -> o1.toBuilder().mergeActivityOptions(o2).build()));

Map<String, LocalActivityOptions> mergedLocalActivityOptionsMap;
@Nonnull
Map<String, LocalActivityOptions> predefinedLocalActivityOptions =
context.getLocalActivityOptions();
if (activityMethodOptions != null
&& !activityMethodOptions.isEmpty()
&& predefinedLocalActivityOptions.isEmpty()) {
// we need to merge only in this case
mergedLocalActivityOptionsMap = new HashMap<>(predefinedLocalActivityOptions);
ActivityOptionUtils.mergePredefinedLocalActivityOptions(
mergedLocalActivityOptionsMap, activityMethodOptions);
} else {
mergedLocalActivityOptionsMap =
MoreObjects.firstNonNull(
activityMethodOptions,
MoreObjects.firstNonNull(predefinedLocalActivityOptions, Collections.emptyMap()));
}

InvocationHandler invocationHandler =
LocalActivityInvocationHandler.newInstance(
activityInterface,
Expand Down
31 changes: 17 additions & 14 deletions temporal-sdk/src/main/java/io/temporal/worker/WorkflowImplementationOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@

import io.temporal.activity.ActivityOptions;
import io.temporal.activity.LocalActivityOptions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

public final class WorkflowImplementationOptions {

Expand Down Expand Up @@ -129,24 +128,24 @@ public Builder setDefaultLocalActivityOptions(
public WorkflowImplementationOptions build() {
return new WorkflowImplementationOptions(
failWorkflowExceptionTypes == null ? new Class[0] : failWorkflowExceptionTypes,
activityOptions == null ? new HashMap<>() : activityOptions,
activityOptions == null ? null : activityOptions,
defaultActivityOptions,
localActivityOptions == null ? new HashMap<>() : localActivityOptions,
localActivityOptions == null ? null : localActivityOptions,
defaultLocalActivityOptions);
}
}

private final Class<? extends Throwable>[] failWorkflowExceptionTypes;
private final Map<String, ActivityOptions> activityOptions;
private final @Nullable Map<String, ActivityOptions> activityOptions;
private final ActivityOptions defaultActivityOptions;
private final Map<String, LocalActivityOptions> localActivityOptions;
private final @Nullable Map<String, LocalActivityOptions> localActivityOptions;
private final LocalActivityOptions defaultLocalActivityOptions;

public WorkflowImplementationOptions(
Class<? extends Throwable>[] failWorkflowExceptionTypes,
Map<String, ActivityOptions> activityOptions,
@Nullable Map<String, ActivityOptions> activityOptions,
ActivityOptions defaultActivityOptions,
Map<String, LocalActivityOptions> localActivityOptions,
@Nullable Map<String, LocalActivityOptions> localActivityOptions,
LocalActivityOptions defaultLocalActivityOptions) {
this.failWorkflowExceptionTypes = failWorkflowExceptionTypes;
this.activityOptions = activityOptions;
Expand All @@ -159,16 +158,20 @@ public Class<? extends Throwable>[] getFailWorkflowExceptionTypes() {
return failWorkflowExceptionTypes;
}

public Map<String, ActivityOptions> getActivityOptions() {
return activityOptions;
public @Nonnull Map<String, ActivityOptions> getActivityOptions() {
return activityOptions != null
? Collections.unmodifiableMap(activityOptions)
: Collections.emptyMap();
}

public ActivityOptions getDefaultActivityOptions() {
return defaultActivityOptions;
}

public Map<String, LocalActivityOptions> getLocalActivityOptions() {
return localActivityOptions;
public @Nonnull Map<String, LocalActivityOptions> getLocalActivityOptions() {
return localActivityOptions != null
? Collections.unmodifiableMap(localActivityOptions)
: Collections.emptyMap();
}

public LocalActivityOptions getDefaultLocalActivityOptions() {
Expand Down
Loading