Skip to content

Update gapic clients with latest toolkit #1684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shinfan merged 1 commit into from
Mar 2, 2017
Merged

Update gapic clients with latest toolkit #1684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .../src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
* </code>
* </pre>
*/
@Generated("by GAPIC")
@Generated("by GAPIC v0.0.5")
@ExperimentalApi
public class ErrorGroupServiceSettings extends ClientSettings {
/** The default address of the service. */
Expand All @@ -79,8 +79,8 @@ public class ErrorGroupServiceSettings extends ClientSettings {
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();

private static final String DEFAULT_GENERATOR_NAME = "gapic";
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private final SimpleCallSettings<GetGroupRequest, ErrorGroup> getGroupSettings;
private final SimpleCallSettings<UpdateGroupRequest, ErrorGroup> updateGroupSettings;
Expand Down Expand Up @@ -125,10 +125,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
return InstantiatingChannelProvider.newBuilder()
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
.setPort(DEFAULT_SERVICE_PORT)
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
}

private static String getGapicVersion() {
String packageVersion = ErrorGroupServiceSettings.class.getPackage().getImplementationVersion();
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
}

/** Returns a builder for this class with recommended defaults. */
public static Builder defaultBuilder() {
return Builder.createDefault();
Expand Down Expand Up @@ -167,7 +172,9 @@ public static class Builder extends ClientSettings.Builder {
Sets.immutableEnumSet(
Lists.<Status.Code>newArrayList(
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
definitions.put(
"non_idempotent",
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down
17 changes: 12 additions & 5 deletions .../src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
* </code>
* </pre>
*/
@Generated("by GAPIC")
@Generated("by GAPIC v0.0.5")
@ExperimentalApi
public class ErrorStatsServiceSettings extends ClientSettings {
/** The default address of the service. */
Expand All @@ -92,8 +92,8 @@ public class ErrorStatsServiceSettings extends ClientSettings {
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();

private static final String DEFAULT_GENERATOR_NAME = "gapic";
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private final PagedCallSettings<
ListGroupStatsRequest, ListGroupStatsResponse, ListGroupStatsPagedResponse>
Expand Down Expand Up @@ -150,10 +150,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
return InstantiatingChannelProvider.newBuilder()
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
.setPort(DEFAULT_SERVICE_PORT)
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
}

private static String getGapicVersion() {
String packageVersion = ErrorStatsServiceSettings.class.getPackage().getImplementationVersion();
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
}

/** Returns a builder for this class with recommended defaults. */
public static Builder defaultBuilder() {
return Builder.createDefault();
Expand Down Expand Up @@ -300,7 +305,9 @@ public static class Builder extends ClientSettings.Builder {
Sets.immutableEnumSet(
Lists.<Status.Code>newArrayList(
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
definitions.put(
"non_idempotent",
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down
18 changes: 13 additions & 5 deletions ...rc/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
* </code>
* </pre>
*/
@Generated("by GAPIC")
@Generated("by GAPIC v0.0.5")
@ExperimentalApi
public class ReportErrorsServiceSettings extends ClientSettings {
/** The default address of the service. */
Expand All @@ -78,8 +78,8 @@ public class ReportErrorsServiceSettings extends ClientSettings {
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();

private static final String DEFAULT_GENERATOR_NAME = "gapic";
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private final SimpleCallSettings<ReportErrorEventRequest, ReportErrorEventResponse>
reportErrorEventSettings;
Expand Down Expand Up @@ -120,10 +120,16 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
return InstantiatingChannelProvider.newBuilder()
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
.setPort(DEFAULT_SERVICE_PORT)
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
}

private static String getGapicVersion() {
String packageVersion =
ReportErrorsServiceSettings.class.getPackage().getImplementationVersion();
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
}

/** Returns a builder for this class with recommended defaults. */
public static Builder defaultBuilder() {
return Builder.createDefault();
Expand Down Expand Up @@ -161,7 +167,9 @@ public static class Builder extends ClientSettings.Builder {
Sets.immutableEnumSet(
Lists.<Status.Code>newArrayList(
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
definitions.put(
"non_idempotent",
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down
17 changes: 12 additions & 5 deletions ...loud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
* </code>
* </pre>
*/
@Generated("by GAPIC")
@Generated("by GAPIC v0.0.5")
@ExperimentalApi
public class LanguageServiceSettings extends ClientSettings {
/** The default address of the service. */
Expand All @@ -83,8 +83,8 @@ public class LanguageServiceSettings extends ClientSettings {
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();

private static final String DEFAULT_GENERATOR_NAME = "gapic";
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private final SimpleCallSettings<AnalyzeSentimentRequest, AnalyzeSentimentResponse>
analyzeSentimentSettings;
Expand Down Expand Up @@ -146,10 +146,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
return InstantiatingChannelProvider.newBuilder()
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
.setPort(DEFAULT_SERVICE_PORT)
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
}

private static String getGapicVersion() {
String packageVersion = LanguageServiceSettings.class.getPackage().getImplementationVersion();
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
}

/** Returns a builder for this class with recommended defaults. */
public static Builder defaultBuilder() {
return Builder.createDefault();
Expand Down Expand Up @@ -196,7 +201,9 @@ public static class Builder extends ClientSettings.Builder {
Sets.immutableEnumSet(
Lists.<Status.Code>newArrayList(
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
definitions.put(
"non_idempotent",
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down
17 changes: 12 additions & 5 deletions ...-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigServiceV2Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
* </code>
* </pre>
*/
@Generated("by GAPIC")
@Generated("by GAPIC v0.0.5")
@ExperimentalApi
public class ConfigServiceV2Settings extends ClientSettings {
/** The default address of the service. */
Expand All @@ -96,8 +96,8 @@ public class ConfigServiceV2Settings extends ClientSettings {
.add("https://www.googleapis.com/auth/logging.write")
.build();

private static final String DEFAULT_GENERATOR_NAME = "gapic";
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private final PagedCallSettings<ListSinksRequest, ListSinksResponse, ListSinksPagedResponse>
listSinksSettings;
Expand Down Expand Up @@ -162,10 +162,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
return InstantiatingChannelProvider.newBuilder()
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
.setPort(DEFAULT_SERVICE_PORT)
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
}

private static String getGapicVersion() {
String packageVersion = ConfigServiceV2Settings.class.getPackage().getImplementationVersion();
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
}

/** Returns a builder for this class with recommended defaults. */
public static Builder defaultBuilder() {
return Builder.createDefault();
Expand Down Expand Up @@ -261,7 +266,9 @@ public static class Builder extends ClientSettings.Builder {
Sets.immutableEnumSet(
Lists.<Status.Code>newArrayList(
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
definitions.put(
"non_idempotent",
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down
17 changes: 12 additions & 5 deletions ...cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
* </code>
* </pre>
*/
@Generated("by GAPIC")
@Generated("by GAPIC v0.0.5")
@ExperimentalApi
public class LoggingServiceV2Settings extends ClientSettings {
/** The default address of the service. */
Expand All @@ -109,8 +109,8 @@ public class LoggingServiceV2Settings extends ClientSettings {
.add("https://www.googleapis.com/auth/logging.write")
.build();

private static final String DEFAULT_GENERATOR_NAME = "gapic";
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private final SimpleCallSettings<DeleteLogRequest, Empty> deleteLogSettings;
private final BundlingCallSettings<WriteLogEntriesRequest, WriteLogEntriesResponse>
Expand Down Expand Up @@ -187,10 +187,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
return InstantiatingChannelProvider.newBuilder()
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
.setPort(DEFAULT_SERVICE_PORT)
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
}

private static String getGapicVersion() {
String packageVersion = LoggingServiceV2Settings.class.getPackage().getImplementationVersion();
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
}

/** Returns a builder for this class with recommended defaults. */
public static Builder defaultBuilder() {
return Builder.createDefault();
Expand Down Expand Up @@ -474,7 +479,9 @@ public static class Builder extends ClientSettings.Builder {
Sets.immutableEnumSet(
Lists.<Status.Code>newArrayList(
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
definitions.put(
"non_idempotent",
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down
17 changes: 12 additions & 5 deletions ...cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsServiceV2Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
* </code>
* </pre>
*/
@Generated("by GAPIC")
@Generated("by GAPIC v0.0.5")
@ExperimentalApi
public class MetricsServiceV2Settings extends ClientSettings {
/** The default address of the service. */
Expand All @@ -96,8 +96,8 @@ public class MetricsServiceV2Settings extends ClientSettings {
.add("https://www.googleapis.com/auth/logging.write")
.build();

private static final String DEFAULT_GENERATOR_NAME = "gapic";
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private final PagedCallSettings<
ListLogMetricsRequest, ListLogMetricsResponse, ListLogMetricsPagedResponse>
Expand Down Expand Up @@ -164,10 +164,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
return InstantiatingChannelProvider.newBuilder()
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
.setPort(DEFAULT_SERVICE_PORT)
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
}

private static String getGapicVersion() {
String packageVersion = MetricsServiceV2Settings.class.getPackage().getImplementationVersion();
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
}

/** Returns a builder for this class with recommended defaults. */
public static Builder defaultBuilder() {
return Builder.createDefault();
Expand Down Expand Up @@ -266,7 +271,9 @@ public static class Builder extends ClientSettings.Builder {
Sets.immutableEnumSet(
Lists.<Status.Code>newArrayList(
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
definitions.put(
"non_idempotent",
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down
17 changes: 12 additions & 5 deletions ...oud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
* </code>
* </pre>
*/
@Generated("by GAPIC")
@Generated("by GAPIC v0.0.5")
@ExperimentalApi
public class GroupServiceSettings extends ClientSettings {
/** The default address of the service. */
Expand All @@ -99,8 +99,8 @@ public class GroupServiceSettings extends ClientSettings {
.add("https://www.googleapis.com/auth/monitoring.write")
.build();

private static final String DEFAULT_GENERATOR_NAME = "gapic";
private static final String DEFAULT_GENERATOR_VERSION = "0.0.5";
private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private final PagedCallSettings<ListGroupsRequest, ListGroupsResponse, ListGroupsPagedResponse>
listGroupsSettings;
Expand Down Expand Up @@ -175,10 +175,15 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
return InstantiatingChannelProvider.newBuilder()
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
.setPort(DEFAULT_SERVICE_PORT)
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
}

private static String getGapicVersion() {
String packageVersion = GroupServiceSettings.class.getPackage().getImplementationVersion();
return packageVersion != null ? packageVersion : DEFAULT_GAPIC_VERSION;
}

/** Returns a builder for this class with recommended defaults. */
public static Builder defaultBuilder() {
return Builder.createDefault();
Expand Down Expand Up @@ -333,7 +338,9 @@ public static class Builder extends ClientSettings.Builder {
Sets.immutableEnumSet(
Lists.<Status.Code>newArrayList(
Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
definitions.put(
"non_idempotent",
Sets.immutableEnumSet(Lists.<Status.Code>newArrayList(Status.Code.UNAVAILABLE)));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}

Expand Down
Loading