Added thrift serialization to JsonDataConverter (#146)

* Added thrift serialization to JsonDataConverter

* license and minor bug

* Changed ThriftSerializer to create a new instance per request as it is not thread safe

* PR comments

Author: mfateev

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

@@ -38,12 +38,17 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.thrift.TBase;
+import org.apache.thrift.TDeserializer;
+import org.apache.thrift.TSerializer;
+import org.apache.thrift.protocol.TJSONProtocol;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Implements conversion through GSON JSON processor. To extend use {@link
- * JsonDataConverter(Function)} constructor.
+ * JsonDataConverter(Function)} constructor. Thrift structures are converted using {@link
+ * TJSONProtocol}. When using thrift only one argument of a method is expected.
  *
  * @author fateev
  */
@@ -113,7 +118,12 @@ public byte[] toData(Object... values) throws DataConverterException {
     }
     try {
       if (values.length == 1) {
-        String json = gson.toJson(values[0]);
+        Object value = values[0];
+        // Serialize thrift objects using Thrift serializer
+        if (value instanceof TBase) {
+          return newThriftSerializer().toString((TBase) value).getBytes(StandardCharsets.UTF_8);
+        }
+        String json = gson.toJson(value);
         return json.getBytes(StandardCharsets.UTF_8);
       }
       String json = gson.toJson(values);
@@ -129,6 +139,12 @@ public <T> T fromData(byte[] content, Class<T> valueType) throws DataConverterEx
       return null;
     }
     try {
+      // Deserialize thrift values.
+      if (TBase.class.isAssignableFrom(valueType)) {
+        T instance = valueType.getConstructor().newInstance();
+        newThriftDeserializer().deserialize((TBase) instance, content);
+        return instance;
+      }
       return gson.fromJson(new String(content, StandardCharsets.UTF_8), valueType);
     } catch (Exception e) {
       throw new DataConverterException(content, e);
@@ -165,6 +181,7 @@ public Object[] fromDataArray(byte[] content, Class<?>... valueType)
    * <p>Implementation idea is based on https://github.com/google/gson/issues/43
    */
   private static class ThrowableTypeAdapterFactory implements TypeAdapterFactory {
+
     @Override
     public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
       // Special handling of fields of DataConverter type.
@@ -307,4 +324,12 @@ private static StackTraceElement parseStackTraceElement(String line) {
     }
     return new StackTraceElement(declaringClass, methodName, fileName, lineNumber);
   }
+
+  private static TSerializer newThriftSerializer() {
+    return new TSerializer(new TJSONProtocol.Factory());
+  }
+
+  private static TDeserializer newThriftDeserializer() {
+    return new TDeserializer(new TJSONProtocol.Factory());
+  }
 }

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

@@ -0,0 +1,56 @@
+/*
+ *  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 com.uber.cadence.converter;
+
+import static org.junit.Assert.*;
+
+import com.uber.cadence.History;
+import com.uber.cadence.HistoryEvent;
+import com.uber.cadence.TaskList;
+import com.uber.cadence.WorkflowExecutionStartedEventAttributes;
+import com.uber.cadence.WorkflowType;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+
+public class JsonDataConverterTest {
+
+  private final DataConverter converter = JsonDataConverter.getInstance();
+
+  @Test
+  public void testThrift() {
+    List<HistoryEvent> events = new ArrayList<>();
+    WorkflowExecutionStartedEventAttributes started =
+        new WorkflowExecutionStartedEventAttributes()
+            .setExecutionStartToCloseTimeoutSeconds(11)
+            .setIdentity("testIdentity")
+            .setInput("input".getBytes(StandardCharsets.UTF_8))
+            .setWorkflowType(new WorkflowType().setName("workflowType1"))
+            .setTaskList(new TaskList().setName("taskList1"));
+    events.add(
+        new HistoryEvent()
+            .setTimestamp(1234567)
+            .setEventId(321)
+            .setWorkflowExecutionStartedEventAttributes(started));
+    History history = new History().setEvents(events);
+    byte[] converted = converter.toData(history);
+    History fromConverted = converter.fromData(converted, History.class);
+    assertEquals(new String(converted, StandardCharsets.UTF_8), history, fromConverted);
+  }
+}