replace thrift with new entities

Author: shijiesheng

build.gradle

@@ -44,7 +44,7 @@ googleJavaFormat {
     exclude '**/generated-sources/*'
 }
 
-tasks.googleJavaFormat.dependsOn 'license'
+tasks.googleJavaFormat.dependsOn 'licenseFormat'
 
 group = 'com.uber.cadence'
 
@@ -89,6 +89,10 @@ dependencies {
     compile group: 'com.google.api.grpc', name: 'proto-google-common-protos', version: '2.10.0'
     compile group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.21.9'
     compile group: 'com.google.oauth-client', name: 'google-oauth-client', version: '1.35.0'
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
+    testCompileOnly 'org.projectlombok:lombok:1.18.30'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.30'
 
     implementation 'io.grpc:grpc-netty-shaded:1.54.2'
     implementation 'io.grpc:grpc-protobuf:1.54.2'
@@ -139,6 +143,7 @@ sourceSets {
         }
         java {
             srcDir 'src/main'
+            srcDir 'src/gen/java'
         }
     }
 }

src/main/java/com/uber/cadence/client/WorkflowClient.java

@@ -17,6 +17,7 @@
 
 package com.uber.cadence.client;
 
+import com.uber.cadence.CadenceError;
 import com.uber.cadence.RefreshWorkflowTasksRequest;
 import com.uber.cadence.WorkflowExecution;
 import com.uber.cadence.activity.Activity;
@@ -35,7 +36,6 @@
 import com.uber.cadence.workflow.WorkflowMethod;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import org.apache.thrift.TException;
 
 /**
  * Client to the Cadence service used to start and query workflows by external processes. Also it
@@ -260,7 +260,7 @@ WorkflowStub newUntypedWorkflowStub(
    * @param refreshWorkflowTasksRequest that contains WorkflowID and RunID of the started workflow.
    */
   void refreshWorkflowTasks(RefreshWorkflowTasksRequest refreshWorkflowTasksRequest)
-      throws TException;
+      throws CadenceError;
 
   /**
    * Executes zero argument workflow with void return type

src/main/java/com/uber/cadence/common/WorkflowExecutionHistory.java

@@ -32,7 +32,6 @@
 import com.uber.cadence.HistoryEvent;
 import com.uber.cadence.WorkflowExecution;
 import java.lang.reflect.Type;
-import java.nio.ByteBuffer;
 import java.util.Base64;
 import java.util.List;
 
@@ -47,7 +46,7 @@ public WorkflowExecutionHistory(List<HistoryEvent> events) {
 
   public static WorkflowExecutionHistory fromJson(String serialized) {
     GsonBuilder gsonBuilder = new GsonBuilder();
-    gsonBuilder.registerTypeAdapter(ByteBuffer.class, new ByteBufferJsonDeserializer());
+    gsonBuilder.registerTypeAdapter(byte[].class, new ByteArrayJsonDeserializer());
     Gson gson = gsonBuilder.create();
     Type eventsType = new TypeToken<List<HistoryEvent>>() {}.getType();
     List<HistoryEvent> events = gson.fromJson(serialized, eventsType);
@@ -85,21 +84,21 @@ public List<HistoryEvent> getEvents() {
     return events;
   }
 
-  private static final class ByteBufferJsonDeserializer
-      implements JsonDeserializer<ByteBuffer>, JsonSerializer<ByteBuffer> {
+  private static final class ByteArrayJsonDeserializer
+      implements JsonDeserializer<byte[]>, JsonSerializer<byte[]> {
 
     @Override
-    public JsonElement serialize(ByteBuffer value, Type type, JsonSerializationContext ctx) {
-      if (value.arrayOffset() > 0) {
-        throw new IllegalArgumentException("non zero value array offset: " + value.arrayOffset());
+    public JsonElement serialize(byte[] value, Type type, JsonSerializationContext ctx) {
+      if (value.length > 0) {
+        throw new IllegalArgumentException("non zero value array offset: " + value.length);
       }
-      return new JsonPrimitive(Base64.getEncoder().encodeToString(value.array()));
+      return new JsonPrimitive(Base64.getEncoder().encodeToString(value));
     }
 
     @Override
-    public ByteBuffer deserialize(JsonElement e, Type type, JsonDeserializationContext ctx)
+    public byte[] deserialize(JsonElement e, Type type, JsonDeserializationContext ctx)
         throws JsonParseException {
-      return ByteBuffer.wrap(Base64.getDecoder().decode(e.getAsString()));
+      return Base64.getDecoder().decode(e.getAsString());
     }
   }
 }

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

@@ -33,12 +33,10 @@
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.function.Function;
-import org.apache.thrift.protocol.TJSONProtocol;
 
 /**
  * Implements conversion through GSON JSON processor. To extend use {@link
- * #JsonDataConverter(Function)} constructor. Thrift structures are converted using {@link
- * TJSONProtocol}. When using thrift only one argument of a method is expected.
+ * #JsonDataConverter(Function)} constructor.
  *
  * @author fateev
  */

src/main/java/com/uber/cadence/internal/common/InternalUtils.java

@@ -27,7 +27,6 @@
 import com.uber.cadence.internal.worker.Shutdownable;
 import com.uber.cadence.workflow.WorkflowMethod;
 import java.lang.reflect.Method;
-import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -135,21 +134,21 @@ public static Object getValueOrDefault(Object value, Class<?> valueClass) {
 
   public static Memo convertMapToMemo(Map<String, Object> memo) {
     DataConverter converter = JsonDataConverter.getInstance();
-    Map<String, ByteBuffer> mapOfByteBuffer = new HashMap<>();
+    Map<String, byte[]> mapOfByteBuffer = new HashMap<>();
     memo.forEach(
         (key, value) -> {
-          mapOfByteBuffer.put(key, ByteBuffer.wrap(converter.toData(value)));
+          mapOfByteBuffer.put(key, converter.toData(value));
         });
     return new Memo().setFields(mapOfByteBuffer);
   }
 
   public static SearchAttributes convertMapToSearchAttributes(
       Map<String, Object> searchAttributes) {
     DataConverter converter = JsonDataConverter.getInstance();
-    Map<String, ByteBuffer> mapOfByteBuffer = new HashMap<>();
+    Map<String, byte[]> mapOfByteBuffer = new HashMap<>();
     searchAttributes.forEach(
         (key, value) -> {
-          mapOfByteBuffer.put(key, ByteBuffer.wrap(converter.toData(value)));
+          mapOfByteBuffer.put(key, converter.toData(value));
         });
     return new SearchAttributes().setIndexedFields(mapOfByteBuffer);
   }

src/main/java/com/uber/cadence/internal/common/LocalActivityMarkerData.java

@@ -25,7 +25,6 @@
 import com.uber.cadence.RespondActivityTaskFailedRequest;
 import com.uber.cadence.converter.DataConverter;
 import com.uber.m3.util.ImmutableMap;
-import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 
@@ -190,14 +189,13 @@ public boolean getIsCancelled() {
   public Header getHeader(DataConverter converter) {
     byte[] headerData = converter.toData(headers);
     Header header = new Header();
-    header.setFields(ImmutableMap.of(LOCAL_ACTIVITY_HEADER_KEY, ByteBuffer.wrap(headerData)));
+    header.setFields(ImmutableMap.of(LOCAL_ACTIVITY_HEADER_KEY, headerData));
     return header;
   }
 
   public static LocalActivityMarkerData fromEventAttributes(
       MarkerRecordedEventAttributes attributes, DataConverter converter) {
-    ByteBuffer byteBuffer = attributes.getHeader().getFields().get(LOCAL_ACTIVITY_HEADER_KEY);
-    byte[] bytes = org.apache.thrift.TBaseHelper.byteBufferToByteArray(byteBuffer);
+    byte[] bytes = attributes.getHeader().getFields().get(LOCAL_ACTIVITY_HEADER_KEY);
     LocalActivityMarkerHeader header =
         converter.fromData(bytes, LocalActivityMarkerHeader.class, LocalActivityMarkerHeader.class);
     return new LocalActivityMarkerData(header, attributes.getDetails());

src/main/java/com/uber/cadence/internal/common/WorkflowExecutionUtils.java

@@ -26,27 +26,12 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
-import com.uber.cadence.ActivityType;
-import com.uber.cadence.Decision;
-import com.uber.cadence.DecisionType;
-import com.uber.cadence.EntityNotExistsError;
-import com.uber.cadence.EventType;
-import com.uber.cadence.GetWorkflowExecutionHistoryRequest;
-import com.uber.cadence.GetWorkflowExecutionHistoryResponse;
-import com.uber.cadence.History;
-import com.uber.cadence.HistoryEvent;
-import com.uber.cadence.HistoryEventFilterType;
-import com.uber.cadence.TaskList;
-import com.uber.cadence.WorkflowExecution;
-import com.uber.cadence.WorkflowExecutionCloseStatus;
-import com.uber.cadence.WorkflowExecutionFailedEventAttributes;
-import com.uber.cadence.WorkflowExecutionTerminatedEventAttributes;
-import com.uber.cadence.WorkflowExecutionTimedOutEventAttributes;
-import com.uber.cadence.WorkflowType;
+import com.uber.cadence.*;
 import com.uber.cadence.client.WorkflowTerminatedException;
 import com.uber.cadence.client.WorkflowTimedOutException;
 import com.uber.cadence.common.RetryOptions;
 import com.uber.cadence.common.WorkflowExecutionHistory;
+import com.uber.cadence.serviceclient.AsyncMethodCallback;
 import com.uber.cadence.serviceclient.IWorkflowService;
 import java.io.File;
 import java.io.IOException;
@@ -63,8 +48,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
 
 /**
  * Convenience methods to be used by unit tests and during development.
@@ -200,9 +183,9 @@ private static HistoryEvent getInstanceCloseEvent(
                 retryOptions,
                 () -> service.GetWorkflowExecutionHistoryWithTimeout(r, unit.toMillis(timeout)));
       } catch (EntityNotExistsError e) {
-        if (e.activeCluster != null
-            && e.currentCluster != null
-            && !e.activeCluster.equals(e.currentCluster)) {
+        if (e.getActiveCluster() != null
+            && e.getCurrentCluster() != null
+            && !e.getActiveCluster().equals(e.getCurrentCluster())) {
           // Current cluster is passive cluster. Execution might not exist because of replication
           // lag. If we are still within timeout, wait for a little bit and retry.
           if (timeout != 0
@@ -220,7 +203,7 @@ private static HistoryEvent getInstanceCloseEvent(
           continue;
         }
         throw e;
-      } catch (TException e) {
+      } catch (CadenceError e) {
         throw CheckedExceptionWrapper.wrap(e);
       }
 
@@ -356,7 +339,7 @@ public void onError(Exception exception) {
                   }
                 },
                 unit.toMillis(timeout));
-          } catch (TException e) {
+          } catch (CadenceError e) {
             result.completeExceptionally(e);
           }
           return result;
@@ -425,7 +408,7 @@ public static GetWorkflowExecutionHistoryResponse getHistoryPage(
     GetWorkflowExecutionHistoryResponse history;
     try {
       history = service.GetWorkflowExecutionHistory(getHistoryRequest);
-    } catch (TException e) {
+    } catch (CadenceError e) {
       throw new Error(e);
     }
     if (history == null) {