update

gax/src/main/java/com/google/api/gax/rpc/ClientContext.java

@@ -72,6 +72,10 @@ public abstract class ClientContext {
    */
   public abstract List<BackgroundResource> getBackgroundResources();
 
+  /**
+   * Gets the executor to use for running scheduled API call logic (such as retries and long-running
+   * operations).
+   */
   public abstract ScheduledExecutorService getExecutor();
 
   @Nullable
@@ -301,6 +305,10 @@ public abstract static class Builder {
 
     public abstract Builder setBackgroundResources(List<BackgroundResource> backgroundResources);
 
+    /**
+     * Sets the executor to use for running scheduled API call logic (such as retries and
+     * long-running operations).
+     */
     public abstract Builder setExecutor(ScheduledExecutorService value);
 
     public abstract Builder setCredentials(Credentials value);

gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java

@@ -64,8 +64,8 @@ public final StubSettings getStubSettings() {
     return stubSettings;
   }
 
-  @Deprecated
   /** @deprecated Please use {@link #getBackgroundExecutorProvider()} */
+  @Deprecated
   public final ExecutorProvider getExecutorProvider() {
     return stubSettings.getExecutorProvider();
   }
@@ -264,7 +264,6 @@ public B setWatchdogCheckInterval(@Nullable Duration checkInterval) {
       return self();
     }
 
-    @Deprecated
     /**
      * Gets the ExecutorProvider that was previously set on this Builder. This ExecutorProvider is
      * to use for running asynchronous API call logic (such as retries and long-running operations),
@@ -274,6 +273,7 @@ public B setWatchdogCheckInterval(@Nullable Duration checkInterval) {
      * @deprecated Please use {@link #getBackgroundExecutorProvider()} for getting the executor
      *     provider that's used for running scheduled API call logic.
      */
+    @Deprecated
     public ExecutorProvider getExecutorProvider() {
       return stubSettings.getExecutorProvider();
     }
@@ -347,6 +347,7 @@ protected static void applyToAllUnaryMethods(
     public String toString() {
       return MoreObjects.toStringHelper(this)
           .add("executorProvider", getExecutorProvider())
+          .add("backgroundExecutorProvider", getBackgroundExecutorProvider())
           .add("transportChannelProvider", getTransportChannelProvider())
           .add("credentialsProvider", getCredentialsProvider())
           .add("headerProvider", getHeaderProvider())

gax/src/main/java/com/google/api/gax/rpc/StubSettings.java

@@ -178,7 +178,7 @@ public ApiTracerFactory getTracerFactory() {
   public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("executorProvider", executorProvider)
-        .add("workerExecutorProvider", backgroundExecutorProvider)
+        .add("backgroundExecutorProvider", backgroundExecutorProvider)
         .add("transportChannelProvider", transportChannelProvider)
         .add("credentialsProvider", credentialsProvider)
         .add("headerProvider", headerProvider)

gax/src/test/java/com/google/api/gax/rpc/ClientSettingsTest.java

@@ -110,7 +110,7 @@ public class ClientSettingsTest {
   public void testEmptyBuilder() throws Exception {
     FakeClientSettings.Builder builder = new FakeClientSettings.Builder();
     Truth.assertThat(builder.getExecutorProvider()).isNull();
-    Truth.assertThat(builder.getStubSettings().getBackgroundExecutorProvider())
+    Truth.assertThat(builder.getBackgroundExecutorProvider())
         .isInstanceOf(InstantiatingExecutorProvider.class);
     Truth.assertThat(builder.getTransportChannelProvider()).isNull();
     Truth.assertThat(builder.getCredentialsProvider()).isInstanceOf(NoCredentialsProvider.class);
@@ -125,8 +125,8 @@ public void testEmptyBuilder() throws Exception {
     FakeClientSettings settings = builder.build();
     Truth.assertThat(settings.getExecutorProvider())
         .isSameInstanceAs(builder.getExecutorProvider());
-    Truth.assertThat(settings.getStubSettings().getBackgroundExecutorProvider())
-        .isSameInstanceAs(settings.getBackgroundExecutorProvider());
+    Truth.assertThat(settings.getBackgroundExecutorProvider())
+        .isSameInstanceAs(builder.getBackgroundExecutorProvider());
     Truth.assertThat(settings.getTransportChannelProvider())
         .isSameInstanceAs(builder.getTransportChannelProvider());
     Truth.assertThat(settings.getCredentialsProvider())
@@ -176,9 +176,9 @@ public void testBuilder() throws Exception {
     builder.setWatchdogCheckInterval(watchdogCheckInterval);
     builder.setQuotaProjectId(quotaProjectId);
 
+    // For backward compatibility, backgroundExecutorProvider is set to executorProvider
     Truth.assertThat(builder.getExecutorProvider()).isSameInstanceAs(executorProvider);
-    Truth.assertThat(builder.getStubSettings().getBackgroundExecutorProvider())
-        .isSameInstanceAs(executorProvider);
+    Truth.assertThat(builder.getBackgroundExecutorProvider()).isSameInstanceAs(executorProvider);
     Truth.assertThat(builder.getTransportChannelProvider()).isSameInstanceAs(transportProvider);
     Truth.assertThat(builder.getCredentialsProvider()).isSameInstanceAs(credentialsProvider);
     Truth.assertThat(builder.getClock()).isSameInstanceAs(clock);
@@ -190,6 +190,7 @@ public void testBuilder() throws Exception {
 
     String builderString = builder.toString();
     Truth.assertThat(builderString).contains("executorProvider");
+    Truth.assertThat(builderString).contains("backgroundExecutorProvider");
     Truth.assertThat(builderString).contains("transportChannelProvider");
     Truth.assertThat(builderString).contains("credentialsProvider");
     Truth.assertThat(builderString).contains("clock");
@@ -229,8 +230,10 @@ public void testBuilderFromClientContext() throws Exception {
     FakeClientSettings.Builder builder = new FakeClientSettings.Builder(clientContext);
 
     Truth.assertThat(builder.getExecutorProvider()).isInstanceOf(FixedExecutorProvider.class);
-    Truth.assertThat(builder.getStubSettings().getBackgroundExecutorProvider())
-        .isSameInstanceAs(builder.getExecutorProvider());
+    Truth.assertThat(builder.getBackgroundExecutorProvider())
+        .isInstanceOf(FixedExecutorProvider.class);
+    Truth.assertThat(builder.getExecutorProvider())
+        .isSameInstanceAs(builder.getBackgroundExecutorProvider());
     Truth.assertThat(builder.getTransportChannelProvider())
         .isInstanceOf(FixedTransportChannelProvider.class);
     Truth.assertThat(builder.getCredentialsProvider()).isInstanceOf(FixedCredentialsProvider.class);
@@ -271,8 +274,7 @@ public void testBuilderFromSettings() throws Exception {
     FakeClientSettings.Builder newBuilder = new FakeClientSettings.Builder(settings);
 
     Truth.assertThat(newBuilder.getExecutorProvider()).isSameInstanceAs(executorProvider);
-    Truth.assertThat(newBuilder.getStubSettings().getBackgroundExecutorProvider())
-        .isSameInstanceAs(executorProvider);
+    Truth.assertThat(newBuilder.getBackgroundExecutorProvider()).isSameInstanceAs(executorProvider);
     Truth.assertThat(newBuilder.getTransportChannelProvider()).isSameInstanceAs(transportProvider);
     Truth.assertThat(newBuilder.getCredentialsProvider()).isSameInstanceAs(credentialsProvider);
     Truth.assertThat(newBuilder.getClock()).isSameInstanceAs(clock);