Address comments

Author: vancexu

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

@@ -190,13 +190,19 @@ public Builder setCronSchedule(String cronSchedule) {
       return this;
     }
 
-    /** Specifies additional non-indexed information in result of list workflow. */
+    /**
+     * Specifies additional non-indexed information in result of list workflow. The type of value
+     * can be any object that are serializable by {@link com.uber.cadence.converter.DataConverter}
+     */
     public Builder setMemo(Map<String, Object> memo) {
       this.memo = memo;
       return this;
     }
 
-    /** Specifies additional indexed information in result of list workflow. */
+    /**
+     * Specifies additional indexed information in result of list workflow. The type of value should
+     * be basic type such as: String, Integer, Boolean, Double，LocalDateTime
+     */
     public Builder setSearchAttributes(Map<String, Object> searchAttributes) {
       this.searchAttributes = searchAttributes;
       return this;

src/main/java/com/uber/cadence/internal/sync/WorkflowClientInternal.java

@@ -68,7 +68,7 @@ public static WorkflowClient newInstance(String domain) {
    * default port (7933).
    *
    * @param domain domain that worker uses to poll.
-   * @param options Options (like {@link com.uber.cadence.converter.DataConverter}er override) for
+   * @param options Options (like {@link com.uber.cadence.converter.DataConverter} override) for
    *     configuring client.
    */
   public static WorkflowClient newInstance(String domain, WorkflowClientOptions options) {
@@ -95,7 +95,7 @@ public static WorkflowClient newInstance(String host, int port, String domain) {
    * @param host of the Cadence Service endpoint
    * @param port of the Cadence Service endpoint
    * @param domain domain that worker uses to poll.
-   * @param options Options (like {@link com.uber.cadence.converter.DataConverter}er override) for
+   * @param options Options (like {@link com.uber.cadence.converter.DataConverter} override) for
    *     configuring client.
    */
   public static WorkflowClient newInstance(
@@ -118,7 +118,7 @@ public static WorkflowClient newInstance(IWorkflowService service, String domain
    *
    * @param service client to the Cadence Service endpoint.
    * @param domain domain that worker uses to poll.
-   * @param options Options (like {@link com.uber.cadence.converter.DataConverter}er override) for
+   * @param options Options (like {@link com.uber.cadence.converter.DataConverter} override) for
    *     configuring client.
    */
   public static WorkflowClient newInstance(

src/main/java/com/uber/cadence/internal/sync/WorkflowStubImpl.java

@@ -33,6 +33,7 @@
 import com.uber.cadence.client.WorkflowStub;
 import com.uber.cadence.converter.DataConverter;
 import com.uber.cadence.converter.DataConverterException;
+import com.uber.cadence.converter.JsonDataConverter;
 import com.uber.cadence.internal.common.CheckedExceptionWrapper;
 import com.uber.cadence.internal.common.SignalWithStartWorkflowExecutionParameters;
 import com.uber.cadence.internal.common.StartWorkflowExecutionParameters;
@@ -139,12 +140,13 @@ private StartWorkflowExecutionParameters getStartWorkflowExecutionParameters(
     }
     p.setInput(dataConverter.toData(args));
     p.setWorkflowType(new WorkflowType().setName(workflowType.get()));
-    p.setMemo(convertMapFromObjectToBytes(o.getMemo()));
-    p.setSearchAttributes(convertMapFromObjectToBytes(o.getSearchAttributes()));
+    p.setMemo(convertMemoFromObjectToBytes(o.getMemo()));
+    p.setSearchAttributes(convertSearchAttributesFromObjectToBytes(o.getSearchAttributes()));
     return p;
   }
 
-  private Map<String, byte[]> convertMapFromObjectToBytes(Map<String, Object> map) {
+  private Map<String, byte[]> convertMapFromObjectToBytes(
+      Map<String, Object> map, DataConverter dataConverter) {
     if (map == null) {
       return null;
     }
@@ -159,6 +161,14 @@ private Map<String, byte[]> convertMapFromObjectToBytes(Map<String, Object> map)
     return result;
   }
 
+  private Map<String, byte[]> convertMemoFromObjectToBytes(Map<String, Object> map) {
+    return convertMapFromObjectToBytes(map, dataConverter);
+  }
+
+  private Map<String, byte[]> convertSearchAttributesFromObjectToBytes(Map<String, Object> map) {
+    return convertMapFromObjectToBytes(map, JsonDataConverter.getInstance());
+  }
+
   @Override
   public WorkflowExecution start(Object... args) {
     if (!options.isPresent()) {

src/test/java/com/uber/cadence/client/WorkflowOptionsTest.java

@@ -25,6 +25,7 @@
 import com.uber.cadence.workflow.WorkflowMethod;
 import java.lang.reflect.Method;
 import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Assert;
@@ -194,12 +195,17 @@ public void testInvalidCronScheduleAnnotation() throws NoSuchMethodException {
   private Map<String, Object> getTestMemo() {
     Map<String, Object> memo = new HashMap<>();
     memo.put("testKey", "testObject");
+    memo.put("objectKey", new WorkflowOptions.Builder().build());
     return memo;
   }
 
   private Map<String, Object> getTestSearchAttributes() {
     Map<String, Object> searchAttr = new HashMap<>();
     searchAttr.put("CustomKeywordField", "testKey");
+    searchAttr.put("CustomIntField", 1);
+    searchAttr.put("CustomDoubleField", 1.23);
+    searchAttr.put("CustomBoolField", false);
+    searchAttr.put("CustomDatetimeField", LocalDateTime.now());
     return searchAttr;
   }
 }

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

@@ -78,6 +78,7 @@
 import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1393,10 +1394,24 @@ public void testMemo() {
   @Test
   public void testSearchAttributes() {
     if (testEnvironment != null) {
-      String testKey = "CustomKeywordField";
-      String testValue = "testKeyword";
+      String testKeyString = "CustomKeywordField";
+      String testValueString = "testKeyword";
+      String testKeyInteger = "CustomIntField";
+      Integer testValueInteger = 1;
+      String testKeyDateTime = "CustomDateTimeField";
+      LocalDateTime testValueDateTime = LocalDateTime.now();
+      String testKeyBool = "CustomBoolField";
+      Boolean testValueBool = true;
+      String testKeyDouble = "CustomDoubleField";
+      Double testValueDouble = 1.23;
+
+      // add more type to test
       Map<String, Object> searchAttr = new HashMap<>();
-      searchAttr.put(testKey, testValue);
+      searchAttr.put(testKeyString, testValueString);
+      searchAttr.put(testKeyInteger, testValueInteger);
+      searchAttr.put(testKeyDateTime, testValueDateTime);
+      searchAttr.put(testKeyBool, testValueBool);
+      searchAttr.put(testKeyDouble, testValueDouble);
 
       startWorkerFor(TestMultiargsWorkflowsImpl.class);
       WorkflowOptions workflowOptions =
@@ -1411,10 +1426,36 @@ public void testSearchAttributes() {
       HistoryEvent startEvent = historyResp.history.getEvents().get(0);
       SearchAttributes searchAttrFromEvent =
           startEvent.workflowExecutionStartedEventAttributes.getSearchAttributes();
-      byte[] searchAttrBytes = searchAttrFromEvent.getIndexedFields().get(testKey).array();
-      String searchAttrRetrieved =
-          JsonDataConverter.getInstance().fromData(searchAttrBytes, String.class, String.class);
-      assertEquals(testValue, searchAttrRetrieved);
+
+      byte[] searchAttrStringBytes =
+          searchAttrFromEvent.getIndexedFields().get(testKeyString).array();
+      String retrievedString =
+          JsonDataConverter.getInstance()
+              .fromData(searchAttrStringBytes, String.class, String.class);
+      assertEquals(testValueString, retrievedString);
+      byte[] searchAttrIntegerBytes =
+          searchAttrFromEvent.getIndexedFields().get(testKeyInteger).array();
+      Integer retrievedInteger =
+          JsonDataConverter.getInstance()
+              .fromData(searchAttrIntegerBytes, Integer.class, Integer.class);
+      assertEquals(testValueInteger, retrievedInteger);
+      byte[] searchAttrDateTimeBytes =
+          searchAttrFromEvent.getIndexedFields().get(testKeyDateTime).array();
+      LocalDateTime retrievedDateTime =
+          JsonDataConverter.getInstance()
+              .fromData(searchAttrDateTimeBytes, LocalDateTime.class, LocalDateTime.class);
+      assertEquals(testValueDateTime, retrievedDateTime);
+      byte[] searchAttrBoolBytes = searchAttrFromEvent.getIndexedFields().get(testKeyBool).array();
+      Boolean retrievedBool =
+          JsonDataConverter.getInstance()
+              .fromData(searchAttrBoolBytes, Boolean.class, Boolean.class);
+      assertEquals(testValueBool, retrievedBool);
+      byte[] searchAttrDoubleBytes =
+          searchAttrFromEvent.getIndexedFields().get(testKeyDouble).array();
+      Double retrievedDouble =
+          JsonDataConverter.getInstance()
+              .fromData(searchAttrDoubleBytes, Double.class, Double.class);
+      assertEquals(testValueDouble, retrievedDouble);
     }
   }