Skip to content

Commit 4886f34

Browse files
garrettjonesgooglemziccard
garrettjonesgoogle
authored and
mziccard
committed
---
yaml --- r: 3399 b: refs/heads/master c: 3c2b7f5 h: refs/heads/master i: 3397: bf2fd87 3395: 28b6162 3391: be36209
1 parent 49a9927 commit 4886f34

11 files changed

Lines changed: 128 additions & 114 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: bece1d4f34c96ef0ebaa6cc3dd8232dc3663a73f
2+
refs/heads/master: 3c2b7f51a7e34cf7c6cb30b0a903f37d03557611
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,25 @@
6666
*/
6767
@javax.annotation.Generated("by GAPIC")
6868
public class PublisherApi implements AutoCloseable {
69+
// ========
70+
// Members
71+
// ========
72+
73+
private final ManagedChannel channel;
74+
private final List<AutoCloseable> closeables = new ArrayList<>();
75+
76+
private final ApiCallable<Topic, Topic> createTopicCallable;
77+
private final ApiCallable<PublishRequest, PublishResponse> publishCallable;
78+
private final ApiCallable<GetTopicRequest, Topic> getTopicCallable;
79+
private final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable;
80+
private final ApiCallable<ListTopicsRequest, Iterable<Topic>> listTopicsIterableCallable;
81+
private final ApiCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
82+
listTopicSubscriptionsCallable;
83+
private final ApiCallable<ListTopicSubscriptionsRequest, Iterable<String>>
84+
listTopicSubscriptionsIterableCallable;
85+
private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
6986

7087
public static class ResourceNames {
71-
private ResourceNames() {}
7288

7389
// =======================
7490
// ResourceNames Constants
@@ -94,6 +110,8 @@ private ResourceNames() {}
94110
private static final PathTemplate TOPIC_PATH_TEMPLATE =
95111
PathTemplate.create("projects/{project}/topics/{topic}");
96112

113+
private ResourceNames() {}
114+
97115
// ==============================
98116
// Resource Name Helper Functions
99117
// ==============================
@@ -154,24 +172,6 @@ public static final String parseTopicFromTopicPath(String topicPath) {
154172
}
155173
}
156174

157-
// ========
158-
// Members
159-
// ========
160-
161-
private final ManagedChannel channel;
162-
private final List<AutoCloseable> closeables = new ArrayList<>();
163-
164-
private final ApiCallable<Topic, Topic> createTopicCallable;
165-
private final ApiCallable<PublishRequest, PublishResponse> publishCallable;
166-
private final ApiCallable<GetTopicRequest, Topic> getTopicCallable;
167-
private final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable;
168-
private final ApiCallable<ListTopicsRequest, Iterable<Topic>> listTopicsIterableCallable;
169-
private final ApiCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
170-
listTopicSubscriptionsCallable;
171-
private final ApiCallable<ListTopicSubscriptionsRequest, Iterable<String>>
172-
listTopicSubscriptionsIterableCallable;
173-
private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
174-
175175
// ===============
176176
// Factory Methods
177177
// ===============
@@ -187,8 +187,9 @@ public static PublisherApi create() throws IOException {
187187
}
188188

189189
/**
190-
* Constructs an instance of PublisherApi, using the given settings. The channels are created based
191-
* on the settings passed in, or defaults for any settings that are not set.
190+
* Constructs an instance of PublisherApi, using the given settings.
191+
* The channels are created based on the settings passed in, or defaults for any
192+
* settings that are not set.
192193
*
193194
* <!-- manual edit -->
194195
* <!-- end manual edit -->
@@ -198,8 +199,9 @@ public static PublisherApi create(PublisherSettings settings) throws IOException
198199
}
199200

200201
/**
201-
* Constructs an instance of PublisherApi, using the given settings. This is protected so that it
202-
* easy to make a subclass, but otherwise, the static factory methods should be preferred.
202+
* Constructs an instance of PublisherApi, using the given settings.
203+
* This is protected so that it easy to make a subclass, but otherwise, the static
204+
* factory methods should be preferred.
203205
*
204206
* <!-- manual edit -->
205207
* <!-- end manual edit -->

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@ public class PublisherSettings extends ServiceApiSettings {
139139
RETRY_PARAM_DEFINITIONS = definitions.build();
140140
}
141141

142+
private final MethodBuilders methods;
143+
142144
private static class MethodBuilders {
143145
private final ApiCallableBuilder<Topic, Topic> createTopicMethod;
144146
private final BundlableApiCallableBuilder<PublishRequest, PublishResponse> publishMethod;
@@ -195,8 +197,6 @@ public MethodBuilders() {
195197
}
196198
}
197199

198-
private final MethodBuilders methods;
199-
200200
// ===============
201201
// Factory Methods
202202
// ===============
@@ -219,8 +219,9 @@ public static PublisherSettings create() {
219219
}
220220

221221
/**
222-
* Constructs an instance of PublisherSettings with default settings. This is protected so that it
223-
* easy to make a subclass, but otherwise, the static factory methods should be preferred.
222+
* Constructs an instance of PublisherSettings with default settings. This is protected
223+
* so that it easy to make a subclass, but otherwise, the static factory methods should be
224+
* preferred.
224225
*
225226
* <!-- manual edit -->
226227
* <!-- end manual edit -->

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,26 @@
6565
*/
6666
@javax.annotation.Generated("by GAPIC")
6767
public class SubscriberApi implements AutoCloseable {
68+
// ========
69+
// Members
70+
// ========
71+
72+
private final ManagedChannel channel;
73+
private final List<AutoCloseable> closeables = new ArrayList<>();
74+
75+
private final ApiCallable<Subscription, Subscription> createSubscriptionCallable;
76+
private final ApiCallable<GetSubscriptionRequest, Subscription> getSubscriptionCallable;
77+
private final ApiCallable<ListSubscriptionsRequest, ListSubscriptionsResponse>
78+
listSubscriptionsCallable;
79+
private final ApiCallable<ListSubscriptionsRequest, Iterable<Subscription>>
80+
listSubscriptionsIterableCallable;
81+
private final ApiCallable<DeleteSubscriptionRequest, Empty> deleteSubscriptionCallable;
82+
private final ApiCallable<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineCallable;
83+
private final ApiCallable<AcknowledgeRequest, Empty> acknowledgeCallable;
84+
private final ApiCallable<PullRequest, PullResponse> pullCallable;
85+
private final ApiCallable<ModifyPushConfigRequest, Empty> modifyPushConfigCallable;
6886

6987
public static class ResourceNames {
70-
private ResourceNames() {}
7188

7289
// =======================
7390
// ResourceNames Constants
@@ -93,6 +110,8 @@ private ResourceNames() {}
93110
private static final PathTemplate SUBSCRIPTION_PATH_TEMPLATE =
94111
PathTemplate.create("projects/{project}/subscriptions/{subscription}");
95112

113+
private ResourceNames() {}
114+
96115
// ==============================
97116
// Resource Name Helper Functions
98117
// ==============================
@@ -154,25 +173,6 @@ public static final String parseSubscriptionFromSubscriptionPath(String subscrip
154173
}
155174
}
156175

157-
// ========
158-
// Members
159-
// ========
160-
161-
private final ManagedChannel channel;
162-
private final List<AutoCloseable> closeables = new ArrayList<>();
163-
164-
private final ApiCallable<Subscription, Subscription> createSubscriptionCallable;
165-
private final ApiCallable<GetSubscriptionRequest, Subscription> getSubscriptionCallable;
166-
private final ApiCallable<ListSubscriptionsRequest, ListSubscriptionsResponse>
167-
listSubscriptionsCallable;
168-
private final ApiCallable<ListSubscriptionsRequest, Iterable<Subscription>>
169-
listSubscriptionsIterableCallable;
170-
private final ApiCallable<DeleteSubscriptionRequest, Empty> deleteSubscriptionCallable;
171-
private final ApiCallable<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineCallable;
172-
private final ApiCallable<AcknowledgeRequest, Empty> acknowledgeCallable;
173-
private final ApiCallable<PullRequest, PullResponse> pullCallable;
174-
private final ApiCallable<ModifyPushConfigRequest, Empty> modifyPushConfigCallable;
175-
176176
// ===============
177177
// Factory Methods
178178
// ===============
@@ -188,8 +188,9 @@ public static SubscriberApi create() throws IOException {
188188
}
189189

190190
/**
191-
* Constructs an instance of SubscriberApi, using the given settings. The channels are created based
192-
* on the settings passed in, or defaults for any settings that are not set.
191+
* Constructs an instance of SubscriberApi, using the given settings.
192+
* The channels are created based on the settings passed in, or defaults for any
193+
* settings that are not set.
193194
*
194195
* <!-- manual edit -->
195196
* <!-- end manual edit -->
@@ -199,8 +200,9 @@ public static SubscriberApi create(SubscriberSettings settings) throws IOExcepti
199200
}
200201

201202
/**
202-
* Constructs an instance of SubscriberApi, using the given settings. This is protected so that it
203-
* easy to make a subclass, but otherwise, the static factory methods should be preferred.
203+
* Constructs an instance of SubscriberApi, using the given settings.
204+
* This is protected so that it easy to make a subclass, but otherwise, the static
205+
* factory methods should be preferred.
204206
*
205207
* <!-- manual edit -->
206208
* <!-- end manual edit -->

‎trunk/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ public class SubscriberSettings extends ServiceApiSettings {
133133
RETRY_PARAM_DEFINITIONS = definitions.build();
134134
}
135135

136+
private final MethodBuilders methods;
137+
136138
private static class MethodBuilders {
137139
private final ApiCallableBuilder<Subscription, Subscription> createSubscriptionMethod;
138140
private final ApiCallableBuilder<GetSubscriptionRequest, Subscription> getSubscriptionMethod;
@@ -198,8 +200,6 @@ public MethodBuilders() {
198200
}
199201
}
200202

201-
private final MethodBuilders methods;
202-
203203
// ===============
204204
// Factory Methods
205205
// ===============
@@ -222,8 +222,9 @@ public static SubscriberSettings create() {
222222
}
223223

224224
/**
225-
* Constructs an instance of SubscriberSettings with default settings. This is protected so that it
226-
* easy to make a subclass, but otherwise, the static factory methods should be preferred.
225+
* Constructs an instance of SubscriberSettings with default settings. This is protected
226+
* so that it easy to make a subclass, but otherwise, the static factory methods should be
227+
* preferred.
227228
*
228229
* <!-- manual edit -->
229230
* <!-- end manual edit -->

‎trunk/gcloud-java-pubsub/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>com.google.api</groupId>
2121
<artifactId>gax</artifactId>
22-
<version>0.0.5-SNAPSHOT</version>
22+
<version>0.0.5</version>
2323
</dependency>
2424
<dependency>
2525
<groupId>com.google.api.grpc</groupId>

‎trunk/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,25 @@
6666
*/
6767
@javax.annotation.Generated("by GAPIC")
6868
public class PublisherApi implements AutoCloseable {
69+
// ========
70+
// Members
71+
// ========
72+
73+
private final ManagedChannel channel;
74+
private final List<AutoCloseable> closeables = new ArrayList<>();
75+
76+
private final ApiCallable<Topic, Topic> createTopicCallable;
77+
private final ApiCallable<PublishRequest, PublishResponse> publishCallable;
78+
private final ApiCallable<GetTopicRequest, Topic> getTopicCallable;
79+
private final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable;
80+
private final ApiCallable<ListTopicsRequest, Iterable<Topic>> listTopicsIterableCallable;
81+
private final ApiCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
82+
listTopicSubscriptionsCallable;
83+
private final ApiCallable<ListTopicSubscriptionsRequest, Iterable<String>>
84+
listTopicSubscriptionsIterableCallable;
85+
private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
6986

7087
public static class ResourceNames {
71-
private ResourceNames() {}
7288

7389
// =======================
7490
// ResourceNames Constants
@@ -94,6 +110,8 @@ private ResourceNames() {}
94110
private static final PathTemplate TOPIC_PATH_TEMPLATE =
95111
PathTemplate.create("projects/{project}/topics/{topic}");
96112

113+
private ResourceNames() {}
114+
97115
// ==============================
98116
// Resource Name Helper Functions
99117
// ==============================
@@ -154,24 +172,6 @@ public static final String parseTopicFromTopicPath(String topicPath) {
154172
}
155173
}
156174

157-
// ========
158-
// Members
159-
// ========
160-
161-
private final ManagedChannel channel;
162-
private final List<AutoCloseable> closeables = new ArrayList<>();
163-
164-
private final ApiCallable<Topic, Topic> createTopicCallable;
165-
private final ApiCallable<PublishRequest, PublishResponse> publishCallable;
166-
private final ApiCallable<GetTopicRequest, Topic> getTopicCallable;
167-
private final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable;
168-
private final ApiCallable<ListTopicsRequest, Iterable<Topic>> listTopicsIterableCallable;
169-
private final ApiCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
170-
listTopicSubscriptionsCallable;
171-
private final ApiCallable<ListTopicSubscriptionsRequest, Iterable<String>>
172-
listTopicSubscriptionsIterableCallable;
173-
private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
174-
175175
// ===============
176176
// Factory Methods
177177
// ===============
@@ -187,8 +187,9 @@ public static PublisherApi create() throws IOException {
187187
}
188188

189189
/**
190-
* Constructs an instance of PublisherApi, using the given settings. The channels are created based
191-
* on the settings passed in, or defaults for any settings that are not set.
190+
* Constructs an instance of PublisherApi, using the given settings.
191+
* The channels are created based on the settings passed in, or defaults for any
192+
* settings that are not set.
192193
*
193194
* <!-- manual edit -->
194195
* <!-- end manual edit -->
@@ -198,8 +199,9 @@ public static PublisherApi create(PublisherSettings settings) throws IOException
198199
}
199200

200201
/**
201-
* Constructs an instance of PublisherApi, using the given settings. This is protected so that it
202-
* easy to make a subclass, but otherwise, the static factory methods should be preferred.
202+
* Constructs an instance of PublisherApi, using the given settings.
203+
* This is protected so that it easy to make a subclass, but otherwise, the static
204+
* factory methods should be preferred.
203205
*
204206
* <!-- manual edit -->
205207
* <!-- end manual edit -->

‎trunk/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@ public class PublisherSettings extends ServiceApiSettings {
139139
RETRY_PARAM_DEFINITIONS = definitions.build();
140140
}
141141

142+
private final MethodBuilders methods;
143+
142144
private static class MethodBuilders {
143145
private final ApiCallableBuilder<Topic, Topic> createTopicMethod;
144146
private final BundlableApiCallableBuilder<PublishRequest, PublishResponse> publishMethod;
@@ -195,8 +197,6 @@ public MethodBuilders() {
195197
}
196198
}
197199

198-
private final MethodBuilders methods;
199-
200200
// ===============
201201
// Factory Methods
202202
// ===============
@@ -219,8 +219,9 @@ public static PublisherSettings create() {
219219
}
220220

221221
/**
222-
* Constructs an instance of PublisherSettings with default settings. This is protected so that it
223-
* easy to make a subclass, but otherwise, the static factory methods should be preferred.
222+
* Constructs an instance of PublisherSettings with default settings. This is protected
223+
* so that it easy to make a subclass, but otherwise, the static factory methods should be
224+
* preferred.
224225
*
225226
* <!-- manual edit -->
226227
* <!-- end manual edit -->

0 commit comments

Comments
 (0)