Skip to content

Commit 238cdbf

Browse files
committed
Merging from upstream master
1 parent dc1834e commit 238cdbf

File tree

4 files changed

+17
-22
lines changed

4 files changed

+17
-22
lines changed

src/main/java/com/uber/cadence/internal/worker/ActivityWorker.java

-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,8 @@
2424
import com.uber.cadence.RespondActivityTaskFailedRequest;
2525
import com.uber.cadence.WorkflowExecution;
2626
import com.uber.cadence.context.ContextPropagator;
27-
2827
import com.uber.cadence.context.OpenTracingContextPropagator;
29-
3028
import com.uber.cadence.internal.common.RpcRetryer;
31-
3229
import com.uber.cadence.internal.logging.LoggerTag;
3330
import com.uber.cadence.internal.metrics.MetricsTag;
3431
import com.uber.cadence.internal.metrics.MetricsType;

src/main/java/com/uber/cadence/worker/Worker.java

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import com.uber.cadence.workflow.WorkflowMethod;
3636
import com.uber.m3.tally.Scope;
3737
import com.uber.m3.util.ImmutableMap;
38-
3938
import java.time.Duration;
4039
import java.util.List;
4140
import java.util.Objects;

src/test/java/com/uber/cadence/context/ContextTests.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.uber.cadence.activity.ActivityMethod;
2323
import com.uber.cadence.activity.ActivityOptions;
2424
import com.uber.cadence.client.WorkflowClient;
25+
import com.uber.cadence.client.WorkflowClientOptions;
2526
import com.uber.cadence.client.WorkflowException;
2627
import com.uber.cadence.client.WorkflowOptions;
2728
import com.uber.cadence.internal.testing.WorkflowTestingTest.ChildWorkflow;
@@ -81,13 +82,14 @@ protected void failed(Throwable e, Description description) {
8182
public void setUp() {
8283
TestEnvironmentOptions options =
8384
new TestEnvironmentOptions.Builder()
84-
.setFactoryOptions(
85-
new Worker.FactoryOptions.Builder()
85+
.setWorkflowClientOptions(
86+
WorkflowClientOptions.newBuilder()
8687
.setContextPropagators(
8788
Arrays.asList(
8889
new TestContextPropagator(), new OpenTracingContextPropagator()))
8990
.build())
9091
.build();
92+
9193
testEnvironment = TestWorkflowEnvironment.newInstance(options);
9294
GlobalTracer.registerIfAbsent(mockTracer);
9395
}

src/test/java/com/uber/cadence/internal/testing/WorkflowTestingTest.java

+13-16
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717

1818
package com.uber.cadence.internal.testing;
1919

20+
import static org.junit.Assert.*;
21+
import static org.mockito.Matchers.anyString;
22+
import static org.mockito.Mockito.mock;
23+
import static org.mockito.Mockito.when;
24+
2025
import com.uber.cadence.EventType;
2126
import com.uber.cadence.GetWorkflowExecutionHistoryRequest;
2227
import com.uber.cadence.History;
@@ -49,6 +54,13 @@
4954
import com.uber.cadence.workflow.SignalMethod;
5055
import com.uber.cadence.workflow.Workflow;
5156
import com.uber.cadence.workflow.WorkflowMethod;
57+
import java.time.Duration;
58+
import java.util.List;
59+
import java.util.Optional;
60+
import java.util.UUID;
61+
import java.util.concurrent.CancellationException;
62+
import java.util.concurrent.CompletableFuture;
63+
import java.util.concurrent.ExecutionException;
5264
import org.apache.thrift.TException;
5365
import org.junit.After;
5466
import org.junit.Before;
@@ -60,19 +72,6 @@
6072
import org.slf4j.Logger;
6173
import org.slf4j.LoggerFactory;
6274

63-
import java.time.Duration;
64-
import java.util.List;
65-
import java.util.Optional;
66-
import java.util.UUID;
67-
import java.util.concurrent.CancellationException;
68-
import java.util.concurrent.CompletableFuture;
69-
import java.util.concurrent.ExecutionException;
70-
71-
import static org.junit.Assert.*;
72-
import static org.mockito.Matchers.anyString;
73-
import static org.mockito.Mockito.mock;
74-
import static org.mockito.Mockito.when;
75-
7675
public class WorkflowTestingTest {
7776
private static final Logger log = LoggerFactory.getLogger(WorkflowTestingTest.class);
7877

@@ -95,9 +94,7 @@ protected void failed(Throwable e, Description description) {
9594
public void setUp() {
9695
TestEnvironmentOptions options =
9796
new TestEnvironmentOptions.Builder()
98-
.setWorkflowClientOptions(
99-
WorkflowClientOptions.newBuilder()
100-
.build())
97+
.setWorkflowClientOptions(WorkflowClientOptions.newBuilder().build())
10198
.build();
10299
testEnvironment = TestWorkflowEnvironment.newInstance(options);
103100
}

0 commit comments

Comments
 (0)