From 6b28943e5b6b9d14156e7624a31bcc19f66fe317 Mon Sep 17 00:00:00 2001
From: Quanzheng Long <qlong@indeed.com>
Date: Fri, 19 Jul 2024 13:37:23 -0700
Subject: [PATCH 1/3] Fix waitForWorkflow API

---
 src/main/java/io/iworkflow/core/Client.java              | 9 +++++----
 .../java/io/iworkflow/core/WorkflowIdReusePolicy.java    | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/io/iworkflow/core/WorkflowIdReusePolicy.java

diff --git a/src/main/java/io/iworkflow/core/Client.java b/src/main/java/io/iworkflow/core/Client.java
index 2aa73664..bc844612 100644
--- a/src/main/java/io/iworkflow/core/Client.java
+++ b/src/main/java/io/iworkflow/core/Client.java
@@ -260,13 +260,14 @@ private List<SearchAttribute> convertToSearchAttributeList(final Map<String, Sea
      */
     public void waitForWorkflowCompletion(
             final String workflowId) {
-        this.getSimpleWorkflowResultWithWait(Void.class, workflowId);
+        getComplexWorkflowResultWithWait(workflowId);
     }
 
     /**
-     * A long poll API to wait for the workflow completion
-     * For most cases, a workflow only has one result(one completion state).
-     * Use this API to retrieve the output of the state with waiting for the workflow to complete.
+     * A long poll API to wait for the workflow completion and return single result
+     * This only works for a workflow only has one result(one completion state).
+     * If the workflow has multiple completion states, use getComplexWorkflowResultWithWait.
+     * This API to retrieve the output of the state with waiting for the workflow to complete.
      * If the workflow is not COMPLETED, throw the {@link WorkflowUncompletedException}.
      *
      * @param valueClass    required, the type class of the output
diff --git a/src/main/java/io/iworkflow/core/WorkflowIdReusePolicy.java b/src/main/java/io/iworkflow/core/WorkflowIdReusePolicy.java
new file mode 100644
index 00000000..c83c6885
--- /dev/null
+++ b/src/main/java/io/iworkflow/core/WorkflowIdReusePolicy.java
@@ -0,0 +1,4 @@
+package io.iworkflow.core;
+
+public enum WorkflowIdReusePolicy {
+}

From f31f060b8ab49c4495978f376e27028ffbcbffa6 Mon Sep 17 00:00:00 2001
From: Quanzheng Long <qlong@indeed.com>
Date: Fri, 19 Jul 2024 13:38:39 -0700
Subject: [PATCH 2/3] Fix waitForWorkflow API

---
 src/main/java/io/iworkflow/core/WorkflowIdReusePolicy.java | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 src/main/java/io/iworkflow/core/WorkflowIdReusePolicy.java

diff --git a/src/main/java/io/iworkflow/core/WorkflowIdReusePolicy.java b/src/main/java/io/iworkflow/core/WorkflowIdReusePolicy.java
deleted file mode 100644
index c83c6885..00000000
--- a/src/main/java/io/iworkflow/core/WorkflowIdReusePolicy.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package io.iworkflow.core;
-
-public enum WorkflowIdReusePolicy {
-}

From 9b1f23b3f50dd05dcf0b33d6e60d36f45903ff0f Mon Sep 17 00:00:00 2001
From: Quanzheng Long <qlong@indeed.com>
Date: Fri, 19 Jul 2024 13:40:41 -0700
Subject: [PATCH 3/3] Fix waitForWorkflow API

---
 src/main/java/io/iworkflow/core/Client.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/iworkflow/core/Client.java b/src/main/java/io/iworkflow/core/Client.java
index bc844612..9b1516a0 100644
--- a/src/main/java/io/iworkflow/core/Client.java
+++ b/src/main/java/io/iworkflow/core/Client.java
@@ -253,7 +253,9 @@ private List<SearchAttribute> convertToSearchAttributeList(final Map<String, Sea
     }
 
     /**
-     * A long poll API to wait for the workflow completion
+     * A long poll API to wait for the workflow completion.
+     * Due to the limit of REST API, it will only wait for 30 seconds for the workflow to complete.
+     * (configurable in ClientOptions.LongPollApiMaxWaitTimeSeconds)
      * If the workflow is not COMPLETED, throw the {@link WorkflowUncompletedException}.
      *
      * @param workflowId    required, the workflowId