Regenerating (fixing style issues)

googleapis · Mar 22, 2016 · e369b3c · e369b3c
1 parent 95a1f90
commit e369b3c
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 113 deletions.
diff --git a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java
@@ -66,9 +66,25 @@
  */
 @javax.annotation.Generated("by GAPIC")
 public class PublisherApi implements AutoCloseable {
+  // ========
+  // Members
+  // ========
+
+  private final ManagedChannel channel;
+  private final List<AutoCloseable> closeables = new ArrayList<>();
+
+  private final ApiCallable<Topic, Topic> createTopicCallable;
+  private final ApiCallable<PublishRequest, PublishResponse> publishCallable;
+  private final ApiCallable<GetTopicRequest, Topic> getTopicCallable;
+  private final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable;
+  private final ApiCallable<ListTopicsRequest, Iterable<Topic>> listTopicsIterableCallable;
+  private final ApiCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
+      listTopicSubscriptionsCallable;
+  private final ApiCallable<ListTopicSubscriptionsRequest, Iterable<String>>
+      listTopicSubscriptionsIterableCallable;
+  private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
 
   public static class ResourceNames {
-    private ResourceNames() {}
 
     // =======================
     // ResourceNames Constants
@@ -94,6 +110,8 @@ private ResourceNames() {}
     private static final PathTemplate TOPIC_PATH_TEMPLATE =
         PathTemplate.create("projects/{project}/topics/{topic}");
 
+    private ResourceNames() {}
+
     // ==============================
     // Resource Name Helper Functions
     // ==============================
@@ -154,24 +172,6 @@ public static final String parseTopicFromTopicPath(String topicPath) {
     }
   }
 
-  // ========
-  // Members
-  // ========
-
-  private final ManagedChannel channel;
-  private final List<AutoCloseable> closeables = new ArrayList<>();
-
-  private final ApiCallable<Topic, Topic> createTopicCallable;
-  private final ApiCallable<PublishRequest, PublishResponse> publishCallable;
-  private final ApiCallable<GetTopicRequest, Topic> getTopicCallable;
-  private final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable;
-  private final ApiCallable<ListTopicsRequest, Iterable<Topic>> listTopicsIterableCallable;
-  private final ApiCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
-      listTopicSubscriptionsCallable;
-  private final ApiCallable<ListTopicSubscriptionsRequest, Iterable<String>>
-      listTopicSubscriptionsIterableCallable;
-  private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
-
   // ===============
   // Factory Methods
   // ===============
@@ -187,8 +187,9 @@ public static PublisherApi create() throws IOException {
   }
 
   /**
-   * Constructs an instance of PublisherApi, using the given settings. The channels are created based
-   * on the settings passed in, or defaults for any settings that are not set.
+   * Constructs an instance of PublisherApi, using the given settings.
+   * The channels are created based on the settings passed in, or defaults for any
+   * settings that are not set.
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->
@@ -198,8 +199,9 @@ public static PublisherApi create(PublisherSettings settings) throws IOException
   }
 
   /**
-   * Constructs an instance of PublisherApi, using the given settings. This is protected so that it
-   * easy to make a subclass, but otherwise, the static factory methods should be preferred.
+   * Constructs an instance of PublisherApi, using the given settings.
+   * This is protected so that it easy to make a subclass, but otherwise, the static
+   * factory methods should be preferred.
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->

diff --git a/...java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java b/...java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java
@@ -139,6 +139,8 @@ public class PublisherSettings extends ServiceApiSettings {
     RETRY_PARAM_DEFINITIONS = definitions.build();
   }
 
+  private final MethodBuilders methods;
+
   private static class MethodBuilders {
     private final ApiCallableBuilder<Topic, Topic> createTopicMethod;
     private final BundlableApiCallableBuilder<PublishRequest, PublishResponse> publishMethod;
@@ -195,8 +197,6 @@ public MethodBuilders() {
     }
   }
 
-  private final MethodBuilders methods;
-
   // ===============
   // Factory Methods
   // ===============
@@ -219,8 +219,9 @@ public static PublisherSettings create() {
   }
 
   /**
-   * Constructs an instance of PublisherSettings with default settings. This is protected so that it
-   * easy to make a subclass, but otherwise, the static factory methods should be preferred.
+   * Constructs an instance of PublisherSettings with default settings. This is protected
+   * so that it easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->

diff --git a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java
@@ -65,9 +65,26 @@
  */
 @javax.annotation.Generated("by GAPIC")
 public class SubscriberApi implements AutoCloseable {
+  // ========
+  // Members
+  // ========
+
+  private final ManagedChannel channel;
+  private final List<AutoCloseable> closeables = new ArrayList<>();
+
+  private final ApiCallable<Subscription, Subscription> createSubscriptionCallable;
+  private final ApiCallable<GetSubscriptionRequest, Subscription> getSubscriptionCallable;
+  private final ApiCallable<ListSubscriptionsRequest, ListSubscriptionsResponse>
+      listSubscriptionsCallable;
+  private final ApiCallable<ListSubscriptionsRequest, Iterable<Subscription>>
+      listSubscriptionsIterableCallable;
+  private final ApiCallable<DeleteSubscriptionRequest, Empty> deleteSubscriptionCallable;
+  private final ApiCallable<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineCallable;
+  private final ApiCallable<AcknowledgeRequest, Empty> acknowledgeCallable;
+  private final ApiCallable<PullRequest, PullResponse> pullCallable;
+  private final ApiCallable<ModifyPushConfigRequest, Empty> modifyPushConfigCallable;
 
   public static class ResourceNames {
-    private ResourceNames() {}
 
     // =======================
     // ResourceNames Constants
@@ -93,6 +110,8 @@ private ResourceNames() {}
     private static final PathTemplate SUBSCRIPTION_PATH_TEMPLATE =
         PathTemplate.create("projects/{project}/subscriptions/{subscription}");
 
+    private ResourceNames() {}
+
     // ==============================
     // Resource Name Helper Functions
     // ==============================
@@ -154,25 +173,6 @@ public static final String parseSubscriptionFromSubscriptionPath(String subscrip
     }
   }
 
-  // ========
-  // Members
-  // ========
-
-  private final ManagedChannel channel;
-  private final List<AutoCloseable> closeables = new ArrayList<>();
-
-  private final ApiCallable<Subscription, Subscription> createSubscriptionCallable;
-  private final ApiCallable<GetSubscriptionRequest, Subscription> getSubscriptionCallable;
-  private final ApiCallable<ListSubscriptionsRequest, ListSubscriptionsResponse>
-      listSubscriptionsCallable;
-  private final ApiCallable<ListSubscriptionsRequest, Iterable<Subscription>>
-      listSubscriptionsIterableCallable;
-  private final ApiCallable<DeleteSubscriptionRequest, Empty> deleteSubscriptionCallable;
-  private final ApiCallable<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineCallable;
-  private final ApiCallable<AcknowledgeRequest, Empty> acknowledgeCallable;
-  private final ApiCallable<PullRequest, PullResponse> pullCallable;
-  private final ApiCallable<ModifyPushConfigRequest, Empty> modifyPushConfigCallable;
-
   // ===============
   // Factory Methods
   // ===============
@@ -188,8 +188,9 @@ public static SubscriberApi create() throws IOException {
   }
 
   /**
-   * Constructs an instance of SubscriberApi, using the given settings. The channels are created based
-   * on the settings passed in, or defaults for any settings that are not set.
+   * Constructs an instance of SubscriberApi, using the given settings.
+   * The channels are created based on the settings passed in, or defaults for any
+   * settings that are not set.
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->
@@ -199,8 +200,9 @@ public static SubscriberApi create(SubscriberSettings settings) throws IOExcepti
   }
 
   /**
-   * Constructs an instance of SubscriberApi, using the given settings. This is protected so that it
-   * easy to make a subclass, but otherwise, the static factory methods should be preferred.
+   * Constructs an instance of SubscriberApi, using the given settings.
+   * This is protected so that it easy to make a subclass, but otherwise, the static
+   * factory methods should be preferred.
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->

diff --git a/...ava-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java b/...ava-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java
@@ -133,6 +133,8 @@ public class SubscriberSettings extends ServiceApiSettings {
     RETRY_PARAM_DEFINITIONS = definitions.build();
   }
 
+  private final MethodBuilders methods;
+
   private static class MethodBuilders {
     private final ApiCallableBuilder<Subscription, Subscription> createSubscriptionMethod;
     private final ApiCallableBuilder<GetSubscriptionRequest, Subscription> getSubscriptionMethod;
@@ -198,8 +200,6 @@ public MethodBuilders() {
     }
   }
 
-  private final MethodBuilders methods;
-
   // ===============
   // Factory Methods
   // ===============
@@ -222,8 +222,9 @@ public static SubscriberSettings create() {
   }
 
   /**
-   * Constructs an instance of SubscriberSettings with default settings. This is protected so that it
-   * easy to make a subclass, but otherwise, the static factory methods should be preferred.
+   * Constructs an instance of SubscriberSettings with default settings. This is protected
+   * so that it easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->

diff --git a/gcloud-java-pubsub/pom.xml b/gcloud-java-pubsub/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
-      <version>0.0.5-SNAPSHOT</version>
+      <version>0.0.5</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>

diff --git a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java
@@ -66,9 +66,25 @@
  */
 @javax.annotation.Generated("by GAPIC")
 public class PublisherApi implements AutoCloseable {
+  // ========
+  // Members
+  // ========
+
+  private final ManagedChannel channel;
+  private final List<AutoCloseable> closeables = new ArrayList<>();
+
+  private final ApiCallable<Topic, Topic> createTopicCallable;
+  private final ApiCallable<PublishRequest, PublishResponse> publishCallable;
+  private final ApiCallable<GetTopicRequest, Topic> getTopicCallable;
+  private final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable;
+  private final ApiCallable<ListTopicsRequest, Iterable<Topic>> listTopicsIterableCallable;
+  private final ApiCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
+      listTopicSubscriptionsCallable;
+  private final ApiCallable<ListTopicSubscriptionsRequest, Iterable<String>>
+      listTopicSubscriptionsIterableCallable;
+  private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
 
   public static class ResourceNames {
-    private ResourceNames() {}
 
     // =======================
     // ResourceNames Constants
@@ -94,6 +110,8 @@ private ResourceNames() {}
     private static final PathTemplate TOPIC_PATH_TEMPLATE =
         PathTemplate.create("projects/{project}/topics/{topic}");
 
+    private ResourceNames() {}
+
     // ==============================
     // Resource Name Helper Functions
     // ==============================
@@ -154,24 +172,6 @@ public static final String parseTopicFromTopicPath(String topicPath) {
     }
   }
 
-  // ========
-  // Members
-  // ========
-
-  private final ManagedChannel channel;
-  private final List<AutoCloseable> closeables = new ArrayList<>();
-
-  private final ApiCallable<Topic, Topic> createTopicCallable;
-  private final ApiCallable<PublishRequest, PublishResponse> publishCallable;
-  private final ApiCallable<GetTopicRequest, Topic> getTopicCallable;
-  private final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable;
-  private final ApiCallable<ListTopicsRequest, Iterable<Topic>> listTopicsIterableCallable;
-  private final ApiCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
-      listTopicSubscriptionsCallable;
-  private final ApiCallable<ListTopicSubscriptionsRequest, Iterable<String>>
-      listTopicSubscriptionsIterableCallable;
-  private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
-
   // ===============
   // Factory Methods
   // ===============
@@ -187,8 +187,9 @@ public static PublisherApi create() throws IOException {
   }
 
   /**
-   * Constructs an instance of PublisherApi, using the given settings. The channels are created based
-   * on the settings passed in, or defaults for any settings that are not set.
+   * Constructs an instance of PublisherApi, using the given settings.
+   * The channels are created based on the settings passed in, or defaults for any
+   * settings that are not set.
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->
@@ -198,8 +199,9 @@ public static PublisherApi create(PublisherSettings settings) throws IOException
   }
 
   /**
-   * Constructs an instance of PublisherApi, using the given settings. This is protected so that it
-   * easy to make a subclass, but otherwise, the static factory methods should be preferred.
+   * Constructs an instance of PublisherApi, using the given settings.
+   * This is protected so that it easy to make a subclass, but otherwise, the static
+   * factory methods should be preferred.
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->

diff --git a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java
@@ -139,6 +139,8 @@ public class PublisherSettings extends ServiceApiSettings {
     RETRY_PARAM_DEFINITIONS = definitions.build();
   }
 
+  private final MethodBuilders methods;
+
   private static class MethodBuilders {
     private final ApiCallableBuilder<Topic, Topic> createTopicMethod;
     private final BundlableApiCallableBuilder<PublishRequest, PublishResponse> publishMethod;
@@ -195,8 +197,6 @@ public MethodBuilders() {
     }
   }
 
-  private final MethodBuilders methods;
-
   // ===============
   // Factory Methods
   // ===============
@@ -219,8 +219,9 @@ public static PublisherSettings create() {
   }
 
   /**
-   * Constructs an instance of PublisherSettings with default settings. This is protected so that it
-   * easy to make a subclass, but otherwise, the static factory methods should be preferred.
+   * Constructs an instance of PublisherSettings with default settings. This is protected
+   * so that it easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->