Skip to content

Commit c701671

Browse files
jabubakejabubake
committed
Merge remote-tracking branch 'upstream/master' into pubsub_snippets
2 parents 59ccf27 + 365a0f7 commit c701671

88 files changed

Lines changed: 232 additions & 87 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -79,6 +79,9 @@ 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";
84+
8285
private final SimpleCallSettings<GetGroupRequest, ErrorGroup> getGroupSettings;
8386
private final SimpleCallSettings<UpdateGroupRequest, ErrorGroup> updateGroupSettings;
8487

@@ -122,6 +125,7 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
122125
return InstantiatingChannelProvider.newBuilder()
123126
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
124127
.setPort(DEFAULT_SERVICE_PORT)
128+
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
125129
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
126130
}
127131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -92,6 +92,9 @@ 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";
97+
9598
private final PagedCallSettings<
9699
ListGroupStatsRequest, ListGroupStatsResponse, ListGroupStatsPagedResponse>
97100
listGroupStatsSettings;
@@ -147,6 +150,7 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
147150
return InstantiatingChannelProvider.newBuilder()
148151
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
149152
.setPort(DEFAULT_SERVICE_PORT)
153+
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
150154
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
151155
}
152156

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -78,6 +78,9 @@ 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";
83+
8184
private final SimpleCallSettings<ReportErrorEventRequest, ReportErrorEventResponse>
8285
reportErrorEventSettings;
8386

@@ -117,6 +120,7 @@ public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder
117120
return InstantiatingChannelProvider.newBuilder()
118121
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
119122
.setPort(DEFAULT_SERVICE_PORT)
123+
.setGeneratorHeader(DEFAULT_GENERATOR_NAME, DEFAULT_GENERATOR_VERSION)
120124
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
121125
}
122126

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClientTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClientTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016, Google Inc. All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)