Skip to content

Commit 7840605

Browse files
shinfanshinfan
committed
Update gapic clients with latest toolkit
1 parent a47d5a0 commit 7840605

14 files changed

Lines changed: 169 additions & 70 deletions

File tree

‎google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
* </code>
6767
* </pre>
6868
*/
69-
@Generated("by GAPIC")
69+
@Generated("by GAPIC v0.0.5")
7070
@ExperimentalApi
7171
public class ErrorGroupServiceSettings extends ClientSettings {
7272
/** The default address of the service. */
@@ -79,8 +79,8 @@ public class ErrorGroupServiceSettings extends ClientSettings {
7979
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
8080
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
8181

82-
private static final String DEFAULT_GENERATOR_NAME = "gapic";
83-
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
82+
private static final String DEFAULT_GAPIC_NAME = "gapic";
83+
private static final String DEFAULT_GAPIC_VERSION = "";
8484

8585
private final SimpleCallSettings<GetGroupRequest, ErrorGroup> getGroupSettings;
8686
private final SimpleCallSettings<UpdateGroupRequest, ErrorGroup> updateGroupSettings;
@@ -125,10 +125,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
125125
return InstantiatingChannelProvider.newBuilder()
126126
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
127127
.setPort(DEFAULT_SERVICE_PORT)
128-
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
128+
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
129129
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
130130
}
131131

132+
private static String getGapicVersion() {
133+
String packageVersion = ErrorGroupServiceSettings.class.getPackage().getImplementationVersion();
134+
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
135+
}
136+
132137
/** Returns a builder for this class with recommended defaults. */
133138
public static Builder defaultBuilder() {
134139
return Builder.createDefault();
@@ -167,7 +172,9 @@ public static class Builder extends ClientSettings.Builder {
167172
Sets.immutableEnumSet(
168173
Lists.<Status.Code>newArrayList(
169174
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
170-
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
175+
definitions.put(
176+
"non_idempotent",
177+
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
171178
RETRYABLE_CODE_DEFINITIONS = definitions.build();
172179
}
173180

‎google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
* </code>
8080
* </pre>
8181
*/
82-
@Generated("by GAPIC")
82+
@Generated("by GAPIC v0.0.5")
8383
@ExperimentalApi
8484
public class ErrorStatsServiceSettings extends ClientSettings {
8585
/** The default address of the service. */
@@ -92,8 +92,8 @@ public class ErrorStatsServiceSettings extends ClientSettings {
9292
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
9393
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
9494

95-
private static final String DEFAULT_GENERATOR_NAME = "gapic";
96-
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
95+
private static final String DEFAULT_GAPIC_NAME = "gapic";
96+
private static final String DEFAULT_GAPIC_VERSION = "";
9797

9898
private final PagedCallSettings<
9999
ListGroupStatsRequest, ListGroupStatsResponse, ListGroupStatsPagedResponse>
@@ -150,10 +150,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
150150
return InstantiatingChannelProvider.newBuilder()
151151
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
152152
.setPort(DEFAULT_SERVICE_PORT)
153-
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
153+
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
154154
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
155155
}
156156

157+
private static String getGapicVersion() {
158+
String packageVersion = ErrorStatsServiceSettings.class.getPackage().getImplementationVersion();
159+
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
160+
}
161+
157162
/** Returns a builder for this class with recommended defaults. */
158163
public static Builder defaultBuilder() {
159164
return Builder.createDefault();
@@ -300,7 +305,9 @@ public static class Builder extends ClientSettings.Builder {
300305
Sets.immutableEnumSet(
301306
Lists.<Status.Code>newArrayList(
302307
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
303-
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
308+
definitions.put(
309+
"non_idempotent",
310+
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
304311
RETRYABLE_CODE_DEFINITIONS = definitions.build();
305312
}
306313

‎google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
* </code>
6666
* </pre>
6767
*/
68-
@Generated("by GAPIC")
68+
@Generated("by GAPIC v0.0.5")
6969
@ExperimentalApi
7070
public class ReportErrorsServiceSettings extends ClientSettings {
7171
/** The default address of the service. */
@@ -78,8 +78,8 @@ public class ReportErrorsServiceSettings extends ClientSettings {
7878
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
7979
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
8080

81-
private static final String DEFAULT_GENERATOR_NAME = "gapic";
82-
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
81+
private static final String DEFAULT_GAPIC_NAME = "gapic";
82+
private static final String DEFAULT_GAPIC_VERSION = "";
8383

8484
private final SimpleCallSettings<ReportErrorEventRequest, ReportErrorEventResponse>
8585
reportErrorEventSettings;
@@ -120,10 +120,16 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
120120
return InstantiatingChannelProvider.newBuilder()
121121
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
122122
.setPort(DEFAULT_SERVICE_PORT)
123-
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
123+
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
124124
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
125125
}
126126

127+
private static String getGapicVersion() {
128+
String packageVersion =
129+
ReportErrorsServiceSettings.class.getPackage().getImplementationVersion();
130+
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
131+
}
132+
127133
/** Returns a builder for this class with recommended defaults. */
128134
public static Builder defaultBuilder() {
129135
return Builder.createDefault();
@@ -161,7 +167,9 @@ public static class Builder extends ClientSettings.Builder {
161167
Sets.immutableEnumSet(
162168
Lists.<Status.Code>newArrayList(
163169
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
164-
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
170+
definitions.put(
171+
"non_idempotent",
172+
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
165173
RETRYABLE_CODE_DEFINITIONS = definitions.build();
166174
}
167175

‎google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
* </code>
7171
* </pre>
7272
*/
73-
@Generated("by GAPIC")
73+
@Generated("by GAPIC v0.0.5")
7474
@ExperimentalApi
7575
public class LanguageServiceSettings extends ClientSettings {
7676
/** The default address of the service. */
@@ -83,8 +83,8 @@ public class LanguageServiceSettings extends ClientSettings {
8383
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
8484
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
8585

86-
private static final String DEFAULT_GENERATOR_NAME = "gapic";
87-
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
86+
private static final String DEFAULT_GAPIC_NAME = "gapic";
87+
private static final String DEFAULT_GAPIC_VERSION = "";
8888

8989
private final SimpleCallSettings<AnalyzeSentimentRequest, AnalyzeSentimentResponse>
9090
analyzeSentimentSettings;
@@ -146,10 +146,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
146146
return InstantiatingChannelProvider.newBuilder()
147147
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
148148
.setPort(DEFAULT_SERVICE_PORT)
149-
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
149+
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
150150
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
151151
}
152152

153+
private static String getGapicVersion() {
154+
String packageVersion = LanguageServiceSettings.class.getPackage().getImplementationVersion();
155+
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
156+
}
157+
153158
/** Returns a builder for this class with recommended defaults. */
154159
public static Builder defaultBuilder() {
155160
return Builder.createDefault();
@@ -196,7 +201,9 @@ public static class Builder extends ClientSettings.Builder {
196201
Sets.immutableEnumSet(
197202
Lists.<Status.Code>newArrayList(
198203
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
199-
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
204+
definitions.put(
205+
"non_idempotent",
206+
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
200207
RETRYABLE_CODE_DEFINITIONS = definitions.build();
201208
}
202209

‎google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigServiceV2Settings.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
* </code>
7878
* </pre>
7979
*/
80-
@Generated("by GAPIC")
80+
@Generated("by GAPIC v0.0.5")
8181
@ExperimentalApi
8282
public class ConfigServiceV2Settings extends ClientSettings {
8383
/** The default address of the service. */
@@ -96,8 +96,8 @@ public class ConfigServiceV2Settings extends ClientSettings {
9696
.add("https://www.googleapis.com/auth/logging.write")
9797
.build();
9898

99-
private static final String DEFAULT_GENERATOR_NAME = "gapic";
100-
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
99+
private static final String DEFAULT_GAPIC_NAME = "gapic";
100+
private static final String DEFAULT_GAPIC_VERSION = "";
101101

102102
private final PagedCallSettings<ListSinksRequest, ListSinksResponse, ListSinksPagedResponse>
103103
listSinksSettings;
@@ -162,10 +162,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
162162
return InstantiatingChannelProvider.newBuilder()
163163
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
164164
.setPort(DEFAULT_SERVICE_PORT)
165-
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
165+
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
166166
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
167167
}
168168

169+
private static String getGapicVersion() {
170+
String packageVersion = ConfigServiceV2Settings.class.getPackage().getImplementationVersion();
171+
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
172+
}
173+
169174
/** Returns a builder for this class with recommended defaults. */
170175
public static Builder defaultBuilder() {
171176
return Builder.createDefault();
@@ -261,7 +266,9 @@ public static class Builder extends ClientSettings.Builder {
261266
Sets.immutableEnumSet(
262267
Lists.<Status.Code>newArrayList(
263268
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
264-
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
269+
definitions.put(
270+
"non_idempotent",
271+
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
265272
RETRYABLE_CODE_DEFINITIONS = definitions.build();
266273
}
267274

‎google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Settings.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
* </code>
9191
* </pre>
9292
*/
93-
@Generated("by GAPIC")
93+
@Generated("by GAPIC v0.0.5")
9494
@ExperimentalApi
9595
public class LoggingServiceV2Settings extends ClientSettings {
9696
/** The default address of the service. */
@@ -109,8 +109,8 @@ public class LoggingServiceV2Settings extends ClientSettings {
109109
.add("https://www.googleapis.com/auth/logging.write")
110110
.build();
111111

112-
private static final String DEFAULT_GENERATOR_NAME = "gapic";
113-
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
112+
private static final String DEFAULT_GAPIC_NAME = "gapic";
113+
private static final String DEFAULT_GAPIC_VERSION = "";
114114

115115
private final SimpleCallSettings<DeleteLogRequest, Empty> deleteLogSettings;
116116
private final BundlingCallSettings<WriteLogEntriesRequest, WriteLogEntriesResponse>
@@ -187,10 +187,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
187187
return InstantiatingChannelProvider.newBuilder()
188188
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
189189
.setPort(DEFAULT_SERVICE_PORT)
190-
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
190+
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
191191
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
192192
}
193193

194+
private static String getGapicVersion() {
195+
String packageVersion = LoggingServiceV2Settings.class.getPackage().getImplementationVersion();
196+
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
197+
}
198+
194199
/** Returns a builder for this class with recommended defaults. */
195200
public static Builder defaultBuilder() {
196201
return Builder.createDefault();
@@ -474,7 +479,9 @@ public static class Builder extends ClientSettings.Builder {
474479
Sets.immutableEnumSet(
475480
Lists.<Status.Code>newArrayList(
476481
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
477-
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
482+
definitions.put(
483+
"non_idempotent",
484+
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
478485
RETRYABLE_CODE_DEFINITIONS = definitions.build();
479486
}
480487

‎google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsServiceV2Settings.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
* </code>
7878
* </pre>
7979
*/
80-
@Generated("by GAPIC")
80+
@Generated("by GAPIC v0.0.5")
8181
@ExperimentalApi
8282
public class MetricsServiceV2Settings extends ClientSettings {
8383
/** The default address of the service. */
@@ -96,8 +96,8 @@ public class MetricsServiceV2Settings extends ClientSettings {
9696
.add("https://www.googleapis.com/auth/logging.write")
9797
.build();
9898

99-
private static final String DEFAULT_GENERATOR_NAME = "gapic";
100-
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
99+
private static final String DEFAULT_GAPIC_NAME = "gapic";
100+
private static final String DEFAULT_GAPIC_VERSION = "";
101101

102102
private final PagedCallSettings<
103103
ListLogMetricsRequest, ListLogMetricsResponse, ListLogMetricsPagedResponse>
@@ -164,10 +164,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
164164
return InstantiatingChannelProvider.newBuilder()
165165
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
166166
.setPort(DEFAULT_SERVICE_PORT)
167-
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
167+
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
168168
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
169169
}
170170

171+
private static String getGapicVersion() {
172+
String packageVersion = MetricsServiceV2Settings.class.getPackage().getImplementationVersion();
173+
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
174+
}
175+
171176
/** Returns a builder for this class with recommended defaults. */
172177
public static Builder defaultBuilder() {
173178
return Builder.createDefault();
@@ -266,7 +271,9 @@ public static class Builder extends ClientSettings.Builder {
266271
Sets.immutableEnumSet(
267272
Lists.<Status.Code>newArrayList(
268273
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
269-
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
274+
definitions.put(
275+
"non_idempotent",
276+
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
270277
RETRYABLE_CODE_DEFINITIONS = definitions.build();
271278
}
272279

‎google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
* </code>
8282
* </pre>
8383
*/
84-
@Generated("by GAPIC")
84+
@Generated("by GAPIC v0.0.5")
8585
@ExperimentalApi
8686
public class GroupServiceSettings extends ClientSettings {
8787
/** The default address of the service. */
@@ -99,8 +99,8 @@ public class GroupServiceSettings extends ClientSettings {
9999
.add("https://www.googleapis.com/auth/monitoring.write")
100100
.build();
101101

102-
private static final String DEFAULT_GENERATOR_NAME = "gapic";
103-
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
102+
private static final String DEFAULT_GAPIC_NAME = "gapic";
103+
private static final String DEFAULT_GAPIC_VERSION = "";
104104

105105
private final PagedCallSettings<ListGroupsRequest, ListGroupsResponse, ListGroupsPagedResponse>
106106
listGroupsSettings;
@@ -175,10 +175,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
175175
return InstantiatingChannelProvider.newBuilder()
176176
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
177177
.setPort(DEFAULT_SERVICE_PORT)
178-
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
178+
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
179179
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
180180
}
181181

182+
private static String getGapicVersion() {
183+
String packageVersion = GroupServiceSettings.class.getPackage().getImplementationVersion();
184+
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
185+
}
186+
182187
/** Returns a builder for this class with recommended defaults. */
183188
public static Builder defaultBuilder() {
184189
return Builder.createDefault();
@@ -333,7 +338,9 @@ public static class Builder extends ClientSettings.Builder {
333338
Sets.immutableEnumSet(
334339
Lists.<Status.Code>newArrayList(
335340
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
336-
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
341+
definitions.put(
342+
"non_idempotent",
343+
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
337344
RETRYABLE_CODE_DEFINITIONS = definitions.build();
338345
}
339346

0 commit comments

Comments
 (0)