Updates due to code gen

Author: garrettjonesgoogle

gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/PublisherApi.java

@@ -213,12 +213,6 @@ public static PublisherApi create(PublisherSettings settings) throws IOException
   protected PublisherApi(PublisherSettings settings) throws IOException {
     this.channel = settings.getChannel();
 
-    for (ApiCallSettings method : settings.allMethods()) {
-      if (method.getExecutor() == null) {
-        method.setExecutor(settings.getExecutor());
-      }
-    }
-
     this.createTopicCallable = settings.createTopicMethod().build(settings);
     this.publishCallable = settings.publishMethod().build(settings);
     this.getTopicCallable = settings.getTopicMethod().build(settings);

gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/PublisherSettings.java

@@ -40,6 +40,7 @@
 import com.google.api.gax.grpc.ApiCallable.ApiCallableBuilder;
 import com.google.api.gax.grpc.ApiCallable.PageStreamingApiCallableBuilder;
 import com.google.api.gax.grpc.PageDescriptor;
+import com.google.api.gax.grpc.ServiceApiSettings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -62,7 +63,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS - see instructions at the top of the file for editing.
 @javax.annotation.Generated("by GAPIC")
-public class PublisherSettings extends ApiCallSettings {
+public class PublisherSettings extends ServiceApiSettings {
 
   // =========
   // Constants
@@ -131,16 +132,62 @@ public class PublisherSettings extends ApiCallSettings {
     RETRY_PARAM_DEFINITIONS = definitions.build();
   }
 
-  private final ApiCallableBuilder<Topic, Topic> createTopicMethod;
-  private final ApiCallableBuilder<PublishRequest, PublishResponse> publishMethod;
-  private final ApiCallableBuilder<GetTopicRequest, Topic> getTopicMethod;
-  private final PageStreamingApiCallableBuilder<ListTopicsRequest, ListTopicsResponse, Topic>
-      listTopicsMethod;
-  private final PageStreamingApiCallableBuilder<
-          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
-      listTopicSubscriptionsMethod;
-  private final ApiCallableBuilder<DeleteTopicRequest, Empty> deleteTopicMethod;
-  private final ImmutableList<? extends ApiCallSettings> allMethods;
+  private static class MethodBuilders {
+    private final ApiCallableBuilder<Topic, Topic> createTopicMethod;
+    private final ApiCallableBuilder<PublishRequest, PublishResponse> publishMethod;
+    private final ApiCallableBuilder<GetTopicRequest, Topic> getTopicMethod;
+    private final PageStreamingApiCallableBuilder<ListTopicsRequest, ListTopicsResponse, Topic>
+        listTopicsMethod;
+    private final PageStreamingApiCallableBuilder<
+            ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
+        listTopicSubscriptionsMethod;
+    private final ApiCallableBuilder<DeleteTopicRequest, Empty> deleteTopicMethod;
+    private final ImmutableList<? extends ApiCallSettings> allMethods;
+
+    public MethodBuilders() {
+      createTopicMethod = new ApiCallableBuilder<>(PublisherGrpc.METHOD_CREATE_TOPIC);
+      createTopicMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
+      createTopicMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      publishMethod = new ApiCallableBuilder<>(PublisherGrpc.METHOD_PUBLISH);
+      publishMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
+      publishMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      getTopicMethod = new ApiCallableBuilder<>(PublisherGrpc.METHOD_GET_TOPIC);
+      getTopicMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
+      getTopicMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      listTopicsMethod =
+          new PageStreamingApiCallableBuilder<>(
+              PublisherGrpc.METHOD_LIST_TOPICS, LIST_TOPICS_PAGE_STR_DESC);
+      listTopicsMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
+      listTopicsMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      listTopicSubscriptionsMethod =
+          new PageStreamingApiCallableBuilder<>(
+              PublisherGrpc.METHOD_LIST_TOPIC_SUBSCRIPTIONS,
+              LIST_TOPIC_SUBSCRIPTIONS_PAGE_STR_DESC);
+      listTopicSubscriptionsMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
+      listTopicSubscriptionsMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      deleteTopicMethod = new ApiCallableBuilder<>(PublisherGrpc.METHOD_DELETE_TOPIC);
+      deleteTopicMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
+      deleteTopicMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      allMethods =
+          ImmutableList.<ApiCallSettings>builder()
+              .add(
+                  createTopicMethod,
+                  publishMethod,
+                  getTopicMethod,
+                  listTopicsMethod,
+                  listTopicSubscriptionsMethod,
+                  deleteTopicMethod)
+              .build();
+    }
+  }
+
+  private final MethodBuilders methods;
 
   // ===============
   // Factory Methods
@@ -153,7 +200,7 @@ public class PublisherSettings extends ApiCallSettings {
    * <!-- end manual edit -->
    */
   public static PublisherSettings create() {
-    PublisherSettings settings = new PublisherSettings();
+    PublisherSettings settings = new PublisherSettings(new MethodBuilders());
     settings.provideChannelWith(
         ConnectionSettings.builder()
             .setServiceAddress(DEFAULT_SERVICE_ADDRESS)
@@ -170,45 +217,9 @@ public static PublisherSettings create() {
    * <!-- manual edit -->
    * <!-- end manual edit -->
    */
-  protected PublisherSettings() {
-    createTopicMethod = new ApiCallableBuilder<>(PublisherGrpc.METHOD_CREATE_TOPIC);
-    createTopicMethod.setRetryDefaults(
-        RETRYABLE_CODE_DEFINITIONS.get("idempotent"), RETRY_PARAM_DEFINITIONS.get("default"));
-
-    publishMethod = new ApiCallableBuilder<>(PublisherGrpc.METHOD_PUBLISH);
-    publishMethod.setRetryDefaults(
-        RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"), RETRY_PARAM_DEFINITIONS.get("default"));
-
-    getTopicMethod = new ApiCallableBuilder<>(PublisherGrpc.METHOD_GET_TOPIC);
-    getTopicMethod.setRetryDefaults(
-        RETRYABLE_CODE_DEFINITIONS.get("idempotent"), RETRY_PARAM_DEFINITIONS.get("default"));
-
-    listTopicsMethod =
-        new PageStreamingApiCallableBuilder<>(
-            PublisherGrpc.METHOD_LIST_TOPICS, LIST_TOPICS_PAGE_STR_DESC);
-    listTopicsMethod.setRetryDefaults(
-        RETRYABLE_CODE_DEFINITIONS.get("idempotent"), RETRY_PARAM_DEFINITIONS.get("default"));
-
-    listTopicSubscriptionsMethod =
-        new PageStreamingApiCallableBuilder<>(
-            PublisherGrpc.METHOD_LIST_TOPIC_SUBSCRIPTIONS, LIST_TOPIC_SUBSCRIPTIONS_PAGE_STR_DESC);
-    listTopicSubscriptionsMethod.setRetryDefaults(
-        RETRYABLE_CODE_DEFINITIONS.get("idempotent"), RETRY_PARAM_DEFINITIONS.get("default"));
-
-    deleteTopicMethod = new ApiCallableBuilder<>(PublisherGrpc.METHOD_DELETE_TOPIC);
-    deleteTopicMethod.setRetryDefaults(
-        RETRYABLE_CODE_DEFINITIONS.get("idempotent"), RETRY_PARAM_DEFINITIONS.get("default"));
-
-    allMethods =
-        ImmutableList.<ApiCallSettings>builder()
-            .add(
-                createTopicMethod,
-                publishMethod,
-                getTopicMethod,
-                listTopicsMethod,
-                listTopicSubscriptionsMethod,
-                deleteTopicMethod)
-            .build();
+  protected PublisherSettings(MethodBuilders methods) {
+    super(methods.allMethods);
+    this.methods = methods;
   }
 
   /**
@@ -218,7 +229,7 @@ protected PublisherSettings() {
    * <!-- end manual edit -->
    */
   public ApiCallableBuilder<Topic, Topic> createTopicMethod() {
-    return createTopicMethod;
+    return methods.createTopicMethod;
   }
 
   /**
@@ -228,7 +239,7 @@ public ApiCallableBuilder<Topic, Topic> createTopicMethod() {
    * <!-- end manual edit -->
    */
   public ApiCallableBuilder<PublishRequest, PublishResponse> publishMethod() {
-    return publishMethod;
+    return methods.publishMethod;
   }
 
   /**
@@ -238,7 +249,7 @@ public ApiCallableBuilder<PublishRequest, PublishResponse> publishMethod() {
    * <!-- end manual edit -->
    */
   public ApiCallableBuilder<GetTopicRequest, Topic> getTopicMethod() {
-    return getTopicMethod;
+    return methods.getTopicMethod;
   }
 
   /**
@@ -249,7 +260,7 @@ public ApiCallableBuilder<GetTopicRequest, Topic> getTopicMethod() {
    */
   public PageStreamingApiCallableBuilder<ListTopicsRequest, ListTopicsResponse, Topic>
       listTopicsMethod() {
-    return listTopicsMethod;
+    return methods.listTopicsMethod;
   }
 
   /**
@@ -261,7 +272,7 @@ public ApiCallableBuilder<GetTopicRequest, Topic> getTopicMethod() {
   public PageStreamingApiCallableBuilder<
           ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
       listTopicSubscriptionsMethod() {
-    return listTopicSubscriptionsMethod;
+    return methods.listTopicSubscriptionsMethod;
   }
 
   /**
@@ -271,11 +282,7 @@ public ApiCallableBuilder<GetTopicRequest, Topic> getTopicMethod() {
    * <!-- end manual edit -->
    */
   public ApiCallableBuilder<DeleteTopicRequest, Empty> deleteTopicMethod() {
-    return deleteTopicMethod;
-  }
-
-  public ImmutableList<? extends ApiCallSettings> allMethods() {
-    return allMethods;
+    return methods.deleteTopicMethod;
   }
 
   private static PageDescriptor<ListTopicsRequest, ListTopicsResponse, Topic>

gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/SubscriberApi.java

@@ -216,12 +216,6 @@ public static SubscriberApi create(SubscriberSettings settings) throws IOExcepti
   protected SubscriberApi(SubscriberSettings settings) throws IOException {
     this.channel = settings.getChannel();
 
-    for (ApiCallSettings method : settings.allMethods()) {
-      if (method.getExecutor() == null) {
-        method.setExecutor(settings.getExecutor());
-      }
-    }
-
     this.createSubscriptionCallable = settings.createSubscriptionMethod().build(settings);
     this.getSubscriptionCallable = settings.getSubscriptionMethod().build(settings);
     this.listSubscriptionsCallable = settings.listSubscriptionsMethod().build(settings);