Merging from upstream master

Author: sdwr98

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

@@ -24,11 +24,8 @@
 import com.uber.cadence.RespondActivityTaskFailedRequest;
 import com.uber.cadence.WorkflowExecution;
 import com.uber.cadence.context.ContextPropagator;
-
 import com.uber.cadence.context.OpenTracingContextPropagator;
-
 import com.uber.cadence.internal.common.RpcRetryer;
-
 import com.uber.cadence.internal.logging.LoggerTag;
 import com.uber.cadence.internal.metrics.MetricsTag;
 import com.uber.cadence.internal.metrics.MetricsType;

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

@@ -35,7 +35,6 @@
 import com.uber.cadence.workflow.WorkflowMethod;
 import com.uber.m3.tally.Scope;
 import com.uber.m3.util.ImmutableMap;
-
 import java.time.Duration;
 import java.util.List;
 import java.util.Objects;

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

@@ -22,6 +22,7 @@
 import com.uber.cadence.activity.ActivityMethod;
 import com.uber.cadence.activity.ActivityOptions;
 import com.uber.cadence.client.WorkflowClient;
+import com.uber.cadence.client.WorkflowClientOptions;
 import com.uber.cadence.client.WorkflowException;
 import com.uber.cadence.client.WorkflowOptions;
 import com.uber.cadence.internal.testing.WorkflowTestingTest.ChildWorkflow;
@@ -81,13 +82,14 @@ protected void failed(Throwable e, Description description) {
   public void setUp() {
     TestEnvironmentOptions options =
         new TestEnvironmentOptions.Builder()
-            .setFactoryOptions(
-                new Worker.FactoryOptions.Builder()
+            .setWorkflowClientOptions(
+                WorkflowClientOptions.newBuilder()
                     .setContextPropagators(
                         Arrays.asList(
                             new TestContextPropagator(), new OpenTracingContextPropagator()))
                     .build())
             .build();
+
     testEnvironment = TestWorkflowEnvironment.newInstance(options);
     GlobalTracer.registerIfAbsent(mockTracer);
   }

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

@@ -17,6 +17,11 @@
 
 package com.uber.cadence.internal.testing;
 
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import com.uber.cadence.EventType;
 import com.uber.cadence.GetWorkflowExecutionHistoryRequest;
 import com.uber.cadence.History;
@@ -49,6 +54,13 @@
 import com.uber.cadence.workflow.SignalMethod;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import org.apache.thrift.TException;
 import org.junit.After;
 import org.junit.Before;
@@ -60,19 +72,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class WorkflowTestingTest {
   private static final Logger log = LoggerFactory.getLogger(WorkflowTestingTest.class);
 
@@ -95,9 +94,7 @@ protected void failed(Throwable e, Description description) {
   public void setUp() {
     TestEnvironmentOptions options =
         new TestEnvironmentOptions.Builder()
-            .setWorkflowClientOptions(
-                WorkflowClientOptions.newBuilder()
-                    .build())
+            .setWorkflowClientOptions(WorkflowClientOptions.newBuilder().build())
             .build();
     testEnvironment = TestWorkflowEnvironment.newInstance(options);
   }