cleanup

temporal-serviceclient/src/main/java/io/temporal/serviceclient/SystemInfoInterceptor.java

@@ -102,15 +102,16 @@ public static Capabilities getServerCapabilitiesWithRetryOrThrow(
         capabilities = future.getNow(null);
         if (capabilities == null) {
           if (deadline == null) {
-            deadline = Deadline.after(10, TimeUnit.MINUTES);
+            deadline = Deadline.after(30, TimeUnit.SECONDS);
           }
           Deadline computedDeadline = deadline;
           RpcRetryOptions rpcRetryOptions =
               RpcRetryOptions.newBuilder()
                   .setExpiration(
                       Duration.ofMillis(computedDeadline.timeRemaining(TimeUnit.MILLISECONDS)))
                   .validateBuildWithDefaults();
-          GrpcRetryerOptions grpcRetryerOptions = new GrpcRetryerOptions(rpcRetryOptions, deadline);
+          GrpcRetryerOptions grpcRetryerOptions =
+              new GrpcRetryerOptions(rpcRetryOptions, computedDeadline);
           capabilities =
               new GrpcRetryer(Capabilities::getDefaultInstance)
                   .retryWithResult(

temporal-serviceclient/src/main/java/io/temporal/serviceclient/WorkflowServiceStubsOptions.java

@@ -37,8 +37,6 @@ public final class WorkflowServiceStubsOptions extends ServiceStubsOptions {
   /** Default RPC timeout for workflow queries */
   public static final Duration DEFAULT_QUERY_RPC_TIMEOUT = Duration.ofSeconds(10);
 
-  public static final Duration DEFAULT_SYSTEM_INFO_TIMEOUT = Duration.ofSeconds(5);
-
   private static final WorkflowServiceStubsOptions DEFAULT_INSTANCE =
       newBuilder().validateAndBuildWithDefaults();
 
@@ -56,8 +54,6 @@ public final class WorkflowServiceStubsOptions extends ServiceStubsOptions {
 
   /** Retry options for outgoing RPC calls */
   private final RpcRetryOptions rpcRetryOptions;
-  /** Timeout for the RPC made by the client to fetch server capabilities. */
-  private final Duration systemInfoTimeout;
 
   public static Builder newBuilder() {
     return new Builder();
@@ -76,13 +72,11 @@ private WorkflowServiceStubsOptions(
       boolean disableHealthCheck,
       Duration rpcLongPollTimeout,
       Duration rpcQueryTimeout,
-      Duration systemInfoTimeout,
       RpcRetryOptions rpcRetryOptions) {
     super(serviceStubsOptions);
     this.disableHealthCheck = disableHealthCheck;
     this.rpcLongPollTimeout = rpcLongPollTimeout;
     this.rpcQueryTimeout = rpcQueryTimeout;
-    this.systemInfoTimeout = systemInfoTimeout;
     this.rpcRetryOptions = rpcRetryOptions;
   }
 
@@ -121,13 +115,6 @@ public RpcRetryOptions getRpcRetryOptions() {
     return rpcRetryOptions;
   }
 
-  /**
-   * SystemInfoTimeout is the timeout for the RPC made by the client to fetch server capabilities.
-   */
-  public Duration getSystemInfoTimeout() {
-    return systemInfoTimeout;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -136,18 +123,12 @@ public boolean equals(Object o) {
     return disableHealthCheck == that.disableHealthCheck
         && Objects.equals(rpcLongPollTimeout, that.rpcLongPollTimeout)
         && Objects.equals(rpcQueryTimeout, that.rpcQueryTimeout)
-        && Objects.equals(systemInfoTimeout, that.systemInfoTimeout)
         && Objects.equals(rpcRetryOptions, that.rpcRetryOptions);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(
-        disableHealthCheck,
-        rpcLongPollTimeout,
-        rpcQueryTimeout,
-        systemInfoTimeout,
-        rpcRetryOptions);
+    return Objects.hash(disableHealthCheck, rpcLongPollTimeout, rpcQueryTimeout, rpcRetryOptions);
   }
 
   @Override
@@ -159,8 +140,6 @@ public String toString() {
         + rpcLongPollTimeout
         + ", rpcQueryTimeout="
         + rpcQueryTimeout
-        + ", systemInfoTimeout="
-        + systemInfoTimeout
         + ", rpcRetryOptions="
         + rpcRetryOptions
         + '}';
@@ -171,7 +150,6 @@ public static class Builder extends ServiceStubsOptions.Builder<Builder> {
     private boolean disableHealthCheck = true;
     private Duration rpcLongPollTimeout = DEFAULT_POLL_RPC_TIMEOUT;
     private Duration rpcQueryTimeout = DEFAULT_QUERY_RPC_TIMEOUT;
-    private Duration systemInfoTimeout = DEFAULT_SYSTEM_INFO_TIMEOUT;
     private RpcRetryOptions rpcRetryOptions = DefaultStubServiceOperationRpcRetryOptions.INSTANCE;
 
     private Builder() {}
@@ -182,7 +160,6 @@ private Builder(ServiceStubsOptions options) {
         WorkflowServiceStubsOptions castedOptions = (WorkflowServiceStubsOptions) options;
         this.rpcLongPollTimeout = castedOptions.rpcLongPollTimeout;
         this.rpcQueryTimeout = castedOptions.rpcQueryTimeout;
-        this.systemInfoTimeout = castedOptions.systemInfoTimeout;
         this.rpcRetryOptions = castedOptions.rpcRetryOptions;
       }
     }
@@ -256,16 +233,6 @@ public Builder setRpcQueryTimeout(Duration rpcQueryTimeout) {
       return this;
     }
 
-    /**
-     * Sets the rpc timeout value RPC call to fetch server capabilities.
-     *
-     * @param timeout timeout.
-     */
-    public Builder setSystemInfoTimeout(Duration timeout) {
-      this.systemInfoTimeout = Objects.requireNonNull(timeout);
-      return this;
-    }
-
     /**
      * Allows customization of retry options for the outgoing RPC calls to temporal service.
      *
@@ -313,7 +280,6 @@ public WorkflowServiceStubsOptions build() {
           this.disableHealthCheck,
           this.rpcLongPollTimeout,
           this.rpcQueryTimeout,
-          this.systemInfoTimeout,
           this.rpcRetryOptions);
     }
 
@@ -326,7 +292,6 @@ public WorkflowServiceStubsOptions validateAndBuildWithDefaults() {
           this.disableHealthCheck,
           this.rpcLongPollTimeout,
           this.rpcQueryTimeout,
-          this.systemInfoTimeout,
           retryOptions);
     }
   }