fixed the mappers

Author: shijiesheng

src/main/java/com/uber/cadence/internal/compatibility/proto/mappers/ErrorMapper.java

@@ -60,6 +60,13 @@ public static CadenceError Error(StatusRuntimeException e) {
         case NOT_FOUND:
           if (detail.is(com.uber.cadence.api.v1.WorkflowExecutionAlreadyCompletedError.class)) {
             return new WorkflowExecutionAlreadyCompletedError(e);
+          } else if (detail.is(com.uber.cadence.api.v1.EntityNotExistsError.class)
+              && status
+                  .getMessage()
+                  .contains(
+                      "Workflow execution already completed.")) {
+            // old server returns EntityNotExistsError with message Workflow is alredy completed
+            return new WorkflowExecutionAlreadyCompletedError(e);
           } else {
             return new EntityNotExistsError(e);
           }

src/main/java/com/uber/cadence/internal/compatibility/proto/mappers/RequestMapper.java

@@ -200,7 +200,7 @@ public static ResetWorkflowExecutionRequest resetWorkflowExecutionRequest(
     return ResetWorkflowExecutionRequest.newBuilder()
         .setDomain(t.getDomain())
         .setWorkflowExecution(workflowExecution(t.getWorkflowExecution()))
-        .setReason(t.getReason())
+        .setReason(t.getReason() != null ? t.getReason() : "")
         .setDecisionFinishEventId(t.getDecisionFinishEventId())
         .setRequestId(t.getRequestId())
         .setSkipSignalReapply(t.isSkipSignalReapply())
@@ -568,7 +568,7 @@ public static TerminateWorkflowExecutionRequest terminateWorkflowExecutionReques
         TerminateWorkflowExecutionRequest.newBuilder()
             .setDomain(t.getDomain())
             .setWorkflowExecution(workflowExecution(t.getWorkflowExecution()))
-            .setReason(t.getReason())
+            .setReason(t.getReason() != null ? t.getReason() : "")
             .setDetails(payload(t.getDetails()));
     if (t.getIdentity() != null) {
       builder.setIdentity(t.getIdentity());
@@ -758,8 +758,8 @@ public static RestartWorkflowExecutionRequest restartWorkflowExecutionRequest(
     return RestartWorkflowExecutionRequest.newBuilder()
         .setDomain(t.getDomain())
         .setWorkflowExecution(workflowExecution(t.getWorkflowExecution()))
-        .setReason(t.getReason())
-        .setIdentity(t.getIdentity())
+        .setReason(t.getReason() != null ? t.getReason() : "")
+        .setIdentity(t.getIdentity() != null ? t.getIdentity() : "")
         .build();
   }
 
@@ -908,7 +908,7 @@ public static RespondActivityTaskFailedByIDRequest respondActivityTaskFailedByID
                 TypeMapper.workflowRunPair(failRequest.getWorkflowID(), failRequest.getRunID()))
             .setActivityId(failRequest.getActivityID())
             .setFailure(failure(failRequest.getReason(), failRequest.getDetails()))
-            .setIdentity(failRequest.getIdentity());
+            .setIdentity(failRequest.getIdentity() != null ? failRequest.getIdentity() : "");
     return request.build();
   }
 
@@ -925,7 +925,7 @@ public static RespondActivityTaskCompletedByIDRequest respondActivityTaskComplet
                     completeRequest.getWorkflowID(), completeRequest.getRunID()))
             .setActivityId(completeRequest.getActivityID())
             .setResult(payload(completeRequest.getResult()))
-            .setIdentity(completeRequest.getIdentity());
+            .setIdentity(completeRequest.getIdentity() != null ? completeRequest.getIdentity() : "");
     return request.build();
   }
 
@@ -942,7 +942,7 @@ public static RecordActivityTaskHeartbeatByIDRequest recordActivityTaskHeartbeat
                     heartbeatRequest.getWorkflowID(), heartbeatRequest.getRunID()))
             .setActivityId(heartbeatRequest.getActivityID())
             .setDetails(payload(heartbeatRequest.getDetails()))
-            .setIdentity(heartbeatRequest.getIdentity());
+            .setIdentity(heartbeatRequest.getIdentity() != null ? heartbeatRequest.getIdentity() : "");
     return request.build();
   }
 
@@ -959,7 +959,7 @@ public static RespondActivityTaskCanceledByIDRequest respondActivityTaskCanceled
                     canceledRequest.getWorkflowID(), canceledRequest.getRunID()))
             .setActivityId(canceledRequest.getActivityID())
             .setDetails(payload(canceledRequest.getDetails()))
-            .setIdentity(canceledRequest.getIdentity());
+            .setIdentity(canceledRequest.getIdentity() != null ? canceledRequest.getIdentity() : "");
     return request.build();
   }