Upgrade dependencies & code cleanup (temporalio#1355)

Author: Spikhalskiy

build.gradle

@@ -10,12 +10,13 @@ plugins {
     id 'org.cadixdev.licenser' version '0.6.1'
     id 'com.palantir.git-version' version "${palantirGitVersionVersion}" apply false
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
-    id 'com.diffplug.spotless' version '6.9.0' apply false
+    id 'com.diffplug.spotless' version '6.9.1' apply false
     id 'com.github.nbaztec.coveralls-jacoco' version "1.2.14" apply false
 
     //    id 'org.jetbrains.kotlin.jvm' version '1.4.32'
     //    id 'org.jetbrains.kotlin.jvm' version '1.5.32'
-    //    id 'org.jetbrains.kotlin.jvm' version '1.6.20'
+    //    id 'org.jetbrains.kotlin.jvm' version '1.6.21'
+    //    id 'org.jetbrains.kotlin.jvm' version '1.7.10'
     id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}" apply false
     id 'base'
 }
@@ -30,10 +31,10 @@ ext {
     // Platforms
     grpcVersion = '1.48.1' // [1.34.0,)
     jacksonVersion = '2.13.1' // [2.9.0,)
-    micrometerVersion = '1.9.2' // [1.0.0,)
+    micrometerVersion = '1.9.3' // [1.0.0,)
 
     slf4jVersion = '1.7.36' // [1.4.0,)
-    protoVersion = '3.21.4' // [3.10.0,)
+    protoVersion = '3.21.5' // [3.10.0,)
     annotationApiVersion = '1.3.2'
     guavaVersion = '31.1-jre' // [10.0,)
     tallyVersion = '0.11.1' // [0.4.0,)
@@ -44,7 +45,7 @@ ext {
 
     // test scoped
     logbackVersion = '1.2.11'
-    mockitoVersion = '4.6.1'
+    mockitoVersion = '4.7.0'
     junitVersion = '4.13.2'
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -43,7 +43,9 @@
  * ManualActivityCompletionClient}, because they are not intended to be called by our users
  * directly.
  */
-public class ActivityClientHelper {
+public final class ActivityClientHelper {
+  private ActivityClientHelper() {}
+
   public static RecordActivityTaskHeartbeatResponse sendHeartbeatRequest(
       WorkflowServiceStubs service,
       String namespace,

temporal-sdk/src/main/java/io/temporal/internal/client/ActivityClientHelper.java

@@ -42,6 +42,8 @@
 
 /** This class encapsulates sync long poll logic of {@link RootWorkflowClientInvoker} */
 final class WorkflowClientLongPollHelper {
+  private WorkflowClientLongPollHelper() {}
+
   /**
    * Returns result of a workflow instance execution or throws an exception if workflow did not
    * complete successfully. Will wait for continue-as-new executions of the original workflow
@@ -69,26 +71,6 @@ static Optional<Payloads> getWorkflowExecutionResult(
         workflowExecution, workflowType, closeEvent, converter);
   }
 
-  /**
-   * Waits up to specified timeout for workflow instance completion.
-   *
-   * @param workflowExecution workflowId and optional runId
-   * @param timeout maximum time to wait for completion. 0 means wait forever.
-   * @return instance close status
-   */
-  static WorkflowExecutionStatus waitForWorkflowInstanceCompletion(
-      GenericWorkflowClient genericClient,
-      WorkflowClientRequestFactory workflowClientHelper,
-      @Nonnull WorkflowExecution workflowExecution,
-      long timeout,
-      TimeUnit unit)
-      throws TimeoutException {
-    HistoryEvent closeEvent =
-        getInstanceCloseEvent(
-            genericClient, workflowClientHelper, workflowExecution, timeout, unit);
-    return WorkflowExecutionUtils.getCloseStatus(closeEvent);
-  }
-
   /**
    * @param timeout timeout to retrieve InstanceCloseEvent in {@code unit} units. If 0 - MAX_INTEGER
    *     will be used

temporal-sdk/src/main/java/io/temporal/internal/client/WorkflowClientLongPollHelper.java

@@ -25,6 +25,7 @@
 import io.temporal.api.common.v1.WorkflowExecution;
 import io.temporal.common.converter.DataConverter;
 import io.temporal.serviceclient.WorkflowServiceStubs;
+import javax.annotation.Nonnull;
 
 public interface ManualActivityCompletionClientFactory {
 
@@ -33,16 +34,16 @@ public interface ManualActivityCompletionClientFactory {
    * ManualActivityCompletionClientImpl} implementations
    */
   static ManualActivityCompletionClientFactory newFactory(
-      WorkflowServiceStubs service,
-      String namespace,
-      String identity,
-      DataConverter dataConverter) {
+      @Nonnull WorkflowServiceStubs service,
+      @Nonnull String namespace,
+      @Nonnull String identity,
+      @Nonnull DataConverter dataConverter) {
     return new ManualActivityCompletionClientFactoryImpl(
         service, namespace, identity, dataConverter);
   }
 
-  ManualActivityCompletionClient getClient(byte[] taskToken, Scope metricsScope);
+  ManualActivityCompletionClient getClient(@Nonnull byte[] taskToken, Scope metricsScope);
 
   ManualActivityCompletionClient getClient(
-      WorkflowExecution execution, String activityId, Scope metricsScope);
+      @Nonnull WorkflowExecution execution, @Nonnull String activityId, Scope metricsScope);
 }

temporal-sdk/src/main/java/io/temporal/internal/client/external/ManualActivityCompletionClientFactory.java

@@ -20,68 +20,45 @@
 
 package io.temporal.internal.client.external;
 
+import com.google.common.base.Preconditions;
 import com.uber.m3.tally.Scope;
 import io.temporal.activity.ManualActivityCompletionClient;
 import io.temporal.api.common.v1.WorkflowExecution;
 import io.temporal.common.converter.DataConverter;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import java.util.Objects;
+import javax.annotation.Nonnull;
 
 class ManualActivityCompletionClientFactoryImpl implements ManualActivityCompletionClientFactory {
-
   private final WorkflowServiceStubs service;
   private final DataConverter dataConverter;
   private final String namespace;
   private final String identity;
 
-  public ManualActivityCompletionClientFactoryImpl(
-      WorkflowServiceStubs service,
-      String namespace,
-      String identity,
-      DataConverter dataConverter) {
+  ManualActivityCompletionClientFactoryImpl(
+      @Nonnull WorkflowServiceStubs service,
+      @Nonnull String namespace,
+      @Nonnull String identity,
+      @Nonnull DataConverter dataConverter) {
     this.service = Objects.requireNonNull(service);
     this.namespace = Objects.requireNonNull(namespace);
     this.identity = Objects.requireNonNull(identity);
     this.dataConverter = Objects.requireNonNull(dataConverter);
   }
 
-  public WorkflowServiceStubs getService() {
-    return service;
-  }
-
-  public DataConverter getDataConverter() {
-    return dataConverter;
-  }
-
   @Override
-  public ManualActivityCompletionClient getClient(byte[] taskToken, Scope metricsScope) {
-    //    Map<String, String> tags =
-    //        new ImmutableMap.Builder<String, String>(1).put(MetricsTag.NAMESPACE,
-    // namespace).build();
-    //    this.metricsScope = metricsScope.tagged(tags);
-
-    if (service == null) {
-      throw new IllegalStateException("required property service is null");
-    }
-    if (dataConverter == null) {
-      throw new IllegalStateException("required property dataConverter is null");
-    }
-    if (taskToken == null || taskToken.length == 0) {
-      throw new IllegalArgumentException("null or empty task token");
-    }
+  public ManualActivityCompletionClient getClient(@Nonnull byte[] taskToken, Scope metricsScope) {
+    Preconditions.checkArgument(
+        taskToken != null && taskToken.length > 0, "null or empty task token");
     return new ManualActivityCompletionClientImpl(
         service, namespace, identity, taskToken, dataConverter, metricsScope);
   }
 
   @Override
   public ManualActivityCompletionClient getClient(
-      WorkflowExecution execution, String activityId, Scope metricsScope) {
-    if (execution == null) {
-      throw new IllegalArgumentException("null execution");
-    }
-    if (activityId == null) {
-      throw new IllegalArgumentException("null activityId");
-    }
+      @Nonnull WorkflowExecution execution, @Nonnull String activityId, Scope metricsScope) {
+    Preconditions.checkArgument(execution != null, "null execution");
+    Preconditions.checkArgument(activityId != null, "null activityId");
     return new ManualActivityCompletionClientImpl(
         service, namespace, identity, execution, activityId, dataConverter, metricsScope);
   }

temporal-sdk/src/main/java/io/temporal/internal/client/external/ManualActivityCompletionClientFactoryImpl.java

@@ -115,7 +115,7 @@ public String getCronSchedule() {
 
   @Override
   public String toString() {
-    return "ActivityInfo{"
+    return "WorkflowInfo{"
         + "namespace="
         + getNamespace()
         + ", workflowId="

temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowInfoImpl.java

@@ -20,6 +20,7 @@
 
 package io.temporal.internal.sync;
 
+import com.google.common.base.Preconditions;
 import io.temporal.workflow.CancellationScope;
 import io.temporal.workflow.Functions;
 import io.temporal.workflow.QueueConsumer;
@@ -34,9 +35,7 @@ final class WorkflowQueueImpl<E> implements WorkflowQueue<E> {
   private final int capacity;
 
   public WorkflowQueueImpl(int capacity) {
-    if (capacity < 1) {
-      throw new IllegalArgumentException("Capacity less than 1: " + capacity);
-    }
+    Preconditions.checkState(capacity > 0, "capacity must be > 0");
     this.capacity = capacity;
   }
 

temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowQueueImpl.java

@@ -20,6 +20,7 @@
 
 package io.temporal.internal.sync;
 
+import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import io.temporal.internal.common.DebugModeUtils;
 import io.temporal.workflow.Functions;
@@ -71,9 +72,7 @@ public void initialYield() {
     if (status == Status.DONE) {
       throw new DestroyWorkflowThreadError("done in initialYield");
     }
-    if (status != Status.RUNNING) {
-      throw new IllegalStateException("not in RUNNING but in " + status + " state");
-    }
+    Preconditions.checkState(status == Status.RUNNING, "threadContext not in RUNNING state");
     this.yield("created", () -> true);
   }
 
@@ -143,9 +142,7 @@ private void maybeEvaluateLocked(String reason) {
   public void evaluateInCoroutineContext(Functions.Proc1<String> function) {
     lock.lock();
     try {
-      if (function == null) {
-        throw new IllegalArgumentException("null function");
-      }
+      Preconditions.checkArgument(function != null, "null function");
       if (status != Status.YIELDED && status != Status.RUNNING) {
         throw new IllegalStateException("Not in yielded status: " + status);
       }
@@ -160,9 +157,7 @@ public void evaluateInCoroutineContext(Functions.Proc1<String> function) {
         // A more explicit solution may be implemented using a separate lock for evaluate calls.
         throw new IllegalStateException("Already evaluating");
       }
-      if (inRunUntilBlocked) {
-        throw new IllegalStateException("Running runUntilBlocked");
-      }
+      Preconditions.checkState(!inRunUntilBlocked, "Running runUntilBlocked");
       evaluationFunction = function;
       status = Status.EVALUATING;
       yieldCondition.signal();
@@ -249,9 +244,8 @@ public boolean runUntilBlocked(long deadlockDetectionTimeoutMs) {
       if (status == Status.DONE) {
         return false;
       }
-      if (evaluationFunction != null) {
-        throw new IllegalStateException("Cannot runUntilBlocked while evaluating");
-      }
+      Preconditions.checkState(
+          evaluationFunction == null, "Cannot runUntilBlocked while evaluating");
       inRunUntilBlocked = true;
       if (status == Status.YIELDED) {
         // we have to swap it here to allow potentialProgressStatesLocked to start returning true
@@ -279,9 +273,8 @@ && potentialProgressStatesLocked()) {
             throw new PotentialDeadlockException("UnknownThread", this, detectionTimestamp);
           }
         }
-        if (evaluationFunction != null) {
-          throw new IllegalStateException("Cannot runUntilBlocked while evaluating");
-        }
+        Preconditions.checkState(
+            evaluationFunction == null, "Cannot runUntilBlocked while evaluating");
       }
       return !remainedBlocked;
     } catch (InterruptedException e) {
@@ -342,17 +335,6 @@ void initiateDestroy() {
     }
   }
 
-  /** To be called only from a workflow thread. */
-  public void exit() {
-    lock.lock();
-    try {
-      destroyRequested = true;
-    } finally {
-      lock.unlock();
-    }
-    throw new DestroyWorkflowThreadError();
-  }
-
   public void initializeCurrentThread(Thread currentThread) {
     lock.lock();
     try {