Merge branch 'master' into add-metrics-corrupted-signals

Author: halakaraki

build.gradle

@@ -37,7 +37,7 @@ googleJavaFormat {
 }
 
 group = 'com.uber.cadence'
-version = '1.0.1'
+version = '1.0.3'
 
 description = """Uber Cadence Java Client"""
 

src/main/java/com/uber/cadence/converter/JsonDataConverter.java

@@ -76,6 +76,7 @@ public final class JsonDataConverter implements DataConverter {
   private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
   public static final String TYPE_FIELD_NAME = "type";
   public static final String JSON_CONVERTER_TYPE = "JSON";
+  public static final String CLASS_NAME_FIELD_NAME = "className";
   private final Gson gson;
   private final JsonParser parser = new JsonParser();
 
@@ -195,7 +196,7 @@ public void write(JsonWriter out, T value) throws IOException {
           @SuppressWarnings("unchecked")
           public T read(JsonReader in) throws IOException {
             in.beginObject();
-            if (!in.nextName().equals("type")) {
+            if (!in.nextName().equals(TYPE_FIELD_NAME)) {
               throw new IOException("Cannot deserialize DataConverter. Missing type field");
             }
             String value = in.nextString();
@@ -208,6 +209,35 @@ public T read(JsonReader in) throws IOException {
           }
         };
       }
+      if (Class.class.isAssignableFrom(typeToken.getRawType())) {
+        return new TypeAdapter<T>() {
+          @Override
+          public void write(JsonWriter out, T value) throws IOException {
+            out.beginObject();
+            String className = ((Class) value).getName();
+            out.name(CLASS_NAME_FIELD_NAME).value(className);
+            out.endObject();
+          }
+
+          @Override
+          public T read(JsonReader in) throws IOException {
+            in.beginObject();
+            if (!in.nextName().equals(CLASS_NAME_FIELD_NAME)) {
+              throw new IOException(
+                  "Cannot deserialize class. Missing " + CLASS_NAME_FIELD_NAME + " field");
+            }
+            String className = in.nextString();
+            try {
+              @SuppressWarnings("unchecked")
+              T result = (T) Class.forName(className);
+              in.endObject();
+              return result;
+            } catch (ClassNotFoundException e) {
+              throw new RuntimeException(e);
+            }
+          }
+        };
+      }
       if (!Throwable.class.isAssignableFrom(typeToken.getRawType())) {
         return null; // this class only serializes 'Throwable' and its subtypes
       }

src/main/java/com/uber/cadence/serviceclient/WorkflowServiceTChannel.java

@@ -80,6 +80,7 @@
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -370,8 +371,10 @@ private <T> ThriftRequest<T> buildThriftRequest(String apiName, T body) {
   private <T> ThriftRequest<T> buildThriftRequest(String apiName, T body, Long rpcTimeoutOverride) {
     String endpoint = getEndpoint(INTERFACE_NAME, apiName);
     ThriftRequest.Builder<T> builder =
-        new ThriftRequest.Builder<T>(options.getServiceName(), endpoint);
-    builder.setHeaders(thriftHeaders);
+        new ThriftRequest.Builder<>(options.getServiceName(), endpoint);
+    // Create a mutable hashmap for headers, as tchannel.tracing.PrefixedHeadersCarrier assumes
+    // that it can call put directly to add new stuffs (e.g. traces).
+    builder.setHeaders(new HashMap<>(thriftHeaders));
     if (rpcTimeoutOverride != null) {
       builder.setTimeout(rpcTimeoutOverride);
     } else {

src/test/java/com/uber/cadence/converter/JsonDataConverterTest.java

@@ -74,4 +74,13 @@ public void testUUIDList() throws NoSuchMethodException {
     List<UUID> result = (List<UUID>) converter.fromDataArray(data, arg)[0];
     assertEquals(result.toString(), list, result);
   }
+
+  @Test
+  public void testClass() {
+    DataConverter converter = JsonDataConverter.getInstance();
+    byte[] data = converter.toData(this.getClass());
+    @SuppressWarnings("unchecked")
+    Class result = converter.fromData(data, Class.class, Class.class);
+    assertEquals(result.toString(), this.getClass(), result);
+  }
 }

src/test/java/com/uber/cadence/workflow/WorkflowTest.java

@@ -560,6 +560,7 @@ public String execute(String taskList) {
                 .setMinimumAttempts(1)
                 .setMaximumInterval(Duration.ofSeconds(1))
                 .setInitialInterval(Duration.ofSeconds(1))
+                .setDoNotRetry(NullPointerException.class)
                 .setMaximumAttempts(3)
                 .build());
       } else {
@@ -569,6 +570,7 @@ public String execute(String taskList) {
                 .setMaximumInterval(Duration.ofSeconds(1))
                 .setInitialInterval(Duration.ofSeconds(1))
                 .setMaximumAttempts(2)
+                .setDoNotRetry(NullPointerException.class)
                 .build());
       }
       this.activities = Workflow.newActivityStub(TestActivities.class, options.build());