Skip to content

Commit 8c416d8

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
---
yaml --- r: 8827 b: refs/heads/lesv-patch-1 c: b73fc8b h: refs/heads/master i: 8825: 50458d6 8823: b4905a4
1 parent a514b0a commit 8c416d8

110 files changed

Lines changed: 374 additions & 1089 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.

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ refs/tags/v0.22.0: 18b298fe4bfe8ec2f20b0e0bf7ffdcce5cc3c5fe
6666
refs/heads/vam-google-patch-1: d0c8fee3a4074d0bf7360ce8c4f7f7223d0ee7b9
6767
refs/heads/vam-google-patch-CODEOWNERS: 2ac1616e25229e51d08a984708ef1918f91a35ee
6868
refs/heads/danoscarmike-patch-1: 7342a9916bce4ed00002c7202e2a16c5d46afaea
69-
refs/heads/lesv-patch-1: 6faf7f932d4f1a1e4df3c64cae4b88e69e6dce97
69+
refs/heads/lesv-patch-1: b73fc8be68a1be14bbb41ec87bdfd31d1073a927
7070
refs/heads/ml-update-branch: 079dd6610017f5c51b9d1938c12d6d55b61513cf
7171
refs/heads/vkedia-patch-2: 7d8241388a9769a5c069334761b06c7012c878e7
7272
refs/heads/vkedia-patch-3: 4d128043acaa7db9160faf439d2ca6104e8a88cb

‎branches/lesv-patch-1/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2017 Google Inc. All Rights Reserved.
2+
* Copyright 2017, Google LLC 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.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -113,11 +113,7 @@
113113
* <pre>
114114
* <code>
115115
* BigtableInstanceAdminSettings bigtableInstanceAdminSettings =
116-
* BigtableInstanceAdminSettings.newBuilder()
117-
* .setTransportChannelProvider(BigtableInstanceAdminSettings.defaultGrpcTransportProviderBuilder()
118-
* .setEndpoint(myEndpoint)
119-
* .build())
120-
* .build();
116+
* BigtableInstanceAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
121117
* BigtableInstanceAdminClient bigtableInstanceAdminClient =
122118
* BigtableInstanceAdminClient.create(bigtableInstanceAdminSettings);
123119
* </code>
@@ -148,7 +144,7 @@ public static final BigtableInstanceAdminClient create(BigtableInstanceAdminSett
148144
* Constructs an instance of BigtableInstanceAdminClient, using the given stub for making calls.
149145
* This is for advanced usage - prefer to use BigtableInstanceAdminSettings}.
150146
*/
151-
@BetaApi
147+
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
152148
public static final BigtableInstanceAdminClient create(BigtableInstanceAdminStub stub) {
153149
return new BigtableInstanceAdminClient(stub);
154150
}
@@ -164,6 +160,7 @@ protected BigtableInstanceAdminClient(BigtableInstanceAdminSettings settings) th
164160
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
165161
}
166162

163+
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
167164
protected BigtableInstanceAdminClient(BigtableInstanceAdminStub stub) {
168165
this.settings = null;
169166
this.stub = stub;
@@ -174,7 +171,7 @@ public final BigtableInstanceAdminSettings getSettings() {
174171
return settings;
175172
}
176173

177-
@BetaApi
174+
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
178175
public BigtableInstanceAdminStub getStub() {
179176
return stub;
180177
}

‎branches/lesv-patch-1/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java‎

Lines changed: 10 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2017 Google Inc. All Rights Reserved.
2+
* Copyright 2017, Google LLC 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.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,8 +17,6 @@
1717

1818
import com.google.api.core.ApiFunction;
1919
import com.google.api.core.BetaApi;
20-
import com.google.api.gax.core.CredentialsProvider;
21-
import com.google.api.gax.core.ExecutorProvider;
2220
import com.google.api.gax.core.GoogleCredentialsProvider;
2321
import com.google.api.gax.core.InstantiatingExecutorProvider;
2422
import com.google.api.gax.core.PropertiesProvider;
@@ -32,7 +30,6 @@
3230
import com.google.api.gax.rpc.ApiClientHeaderProvider;
3331
import com.google.api.gax.rpc.ClientContext;
3432
import com.google.api.gax.rpc.ClientSettings;
35-
import com.google.api.gax.rpc.HeaderProvider;
3633
import com.google.api.gax.rpc.OperationCallSettings;
3734
import com.google.api.gax.rpc.StatusCode;
3835
import com.google.api.gax.rpc.TransportChannelProvider;
@@ -93,7 +90,7 @@
9390
*/
9491
@Generated("by GAPIC v0.0.5")
9592
@BetaApi
96-
public class BigtableInstanceAdminSettings extends ClientSettings {
93+
public class BigtableInstanceAdminSettings extends ClientSettings<BigtableInstanceAdminSettings> {
9794
/** The default scopes of the service. */
9895
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
9996
ImmutableList.<String>builder()
@@ -203,6 +200,7 @@ public UnaryCallSettings<DeleteClusterRequest, Empty> deleteClusterSettings() {
203200
return deleteClusterSettings;
204201
}
205202

203+
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
206204
public BigtableInstanceAdminStub createStub() throws IOException {
207205
if (getTransportChannelProvider()
208206
.getTransportName()
@@ -236,13 +234,14 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
236234

237235
/** Returns a builder for the default ChannelProvider for this service. */
238236
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
239-
return InstantiatingGrpcChannelProvider.newBuilder().setEndpoint(getDefaultEndpoint());
237+
return InstantiatingGrpcChannelProvider.newBuilder();
240238
}
241239

242240
public static TransportChannelProvider defaultTransportChannelProvider() {
243241
return defaultGrpcTransportProviderBuilder().build();
244242
}
245243

244+
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
246245
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
247246
return ApiClientHeaderProvider.newBuilder()
248247
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
@@ -291,12 +290,7 @@ public Builder toBuilder() {
291290
}
292291

293292
private BigtableInstanceAdminSettings(Builder settingsBuilder) throws IOException {
294-
super(
295-
settingsBuilder.getExecutorProvider(),
296-
settingsBuilder.getTransportChannelProvider(),
297-
settingsBuilder.getCredentialsProvider(),
298-
settingsBuilder.getHeaderProvider(),
299-
settingsBuilder.getClock());
293+
super(settingsBuilder);
300294

301295
createInstanceSettings = settingsBuilder.createInstanceSettings().build();
302296
createInstanceOperationSettings = settingsBuilder.createInstanceOperationSettings().build();
@@ -314,7 +308,8 @@ private BigtableInstanceAdminSettings(Builder settingsBuilder) throws IOExceptio
314308
}
315309

316310
/** Builder for BigtableInstanceAdminSettings. */
317-
public static class Builder extends ClientSettings.Builder {
311+
public static class Builder
312+
extends ClientSettings.Builder<BigtableInstanceAdminSettings, Builder> {
318313
private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
319314

320315
private final UnaryCallSettings.Builder<CreateInstanceRequest, Operation>
@@ -429,6 +424,7 @@ private static Builder createDefault() {
429424
builder.setTransportChannelProvider(defaultTransportChannelProvider());
430425
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
431426
builder.setHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
427+
builder.setEndpoint(getDefaultEndpoint());
432428
return initDefaults(builder);
433429
}
434430

@@ -586,30 +582,6 @@ private Builder(BigtableInstanceAdminSettings settings) {
586582
deleteClusterSettings);
587583
}
588584

589-
@Override
590-
public Builder setExecutorProvider(ExecutorProvider executorProvider) {
591-
super.setExecutorProvider(executorProvider);
592-
return this;
593-
}
594-
595-
@Override
596-
public Builder setTransportChannelProvider(TransportChannelProvider transportProvider) {
597-
super.setTransportChannelProvider(transportProvider);
598-
return this;
599-
}
600-
601-
@Override
602-
public Builder setHeaderProvider(HeaderProvider headerProvider) {
603-
super.setHeaderProvider(headerProvider);
604-
return this;
605-
}
606-
607-
@Override
608-
public Builder setCredentialsProvider(CredentialsProvider credentialsProvider) {
609-
super.setCredentialsProvider(credentialsProvider);
610-
return this;
611-
}
612-
613585
/**
614586
* Applies the given settings updater function to all of the unary API methods in this service.
615587
*

‎branches/lesv-patch-1/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2017 Google Inc. All Rights Reserved.
2+
* Copyright 2017, Google LLC 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.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -104,11 +104,7 @@
104104
* <pre>
105105
* <code>
106106
* BigtableTableAdminSettings bigtableTableAdminSettings =
107-
* BigtableTableAdminSettings.newBuilder()
108-
* .setTransportChannelProvider(BigtableTableAdminSettings.defaultGrpcTransportProviderBuilder()
109-
* .setEndpoint(myEndpoint)
110-
* .build())
111-
* .build();
107+
* BigtableTableAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
112108
* BigtableTableAdminClient bigtableTableAdminClient =
113109
* BigtableTableAdminClient.create(bigtableTableAdminSettings);
114110
* </code>
@@ -138,7 +134,7 @@ public static final BigtableTableAdminClient create(BigtableTableAdminSettings s
138134
* Constructs an instance of BigtableTableAdminClient, using the given stub for making calls. This
139135
* is for advanced usage - prefer to use BigtableTableAdminSettings}.
140136
*/
141-
@BetaApi
137+
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
142138
public static final BigtableTableAdminClient create(BigtableTableAdminStub stub) {
143139
return new BigtableTableAdminClient(stub);
144140
}
@@ -153,6 +149,7 @@ protected BigtableTableAdminClient(BigtableTableAdminSettings settings) throws I
153149
this.stub = settings.createStub();
154150
}
155151

152+
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
156153
protected BigtableTableAdminClient(BigtableTableAdminStub stub) {
157154
this.settings = null;
158155
this.stub = stub;
@@ -162,7 +159,7 @@ public final BigtableTableAdminSettings getSettings() {
162159
return settings;
163160
}
164161

165-
@BetaApi
162+
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
166163
public BigtableTableAdminStub getStub() {
167164
return stub;
168165
}

‎branches/lesv-patch-1/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java‎

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2017 Google Inc. All Rights Reserved.
2+
* Copyright 2017, Google LLC 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.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,8 +20,6 @@
2020
import com.google.api.core.ApiFunction;
2121
import com.google.api.core.ApiFuture;
2222
import com.google.api.core.BetaApi;
23-
import com.google.api.gax.core.CredentialsProvider;
24-
import com.google.api.gax.core.ExecutorProvider;
2523
import com.google.api.gax.core.GoogleCredentialsProvider;
2624
import com.google.api.gax.core.InstantiatingExecutorProvider;
2725
import com.google.api.gax.core.PropertiesProvider;
@@ -33,7 +31,6 @@
3331
import com.google.api.gax.rpc.ApiClientHeaderProvider;
3432
import com.google.api.gax.rpc.ClientContext;
3533
import com.google.api.gax.rpc.ClientSettings;
36-
import com.google.api.gax.rpc.HeaderProvider;
3734
import com.google.api.gax.rpc.PageContext;
3835
import com.google.api.gax.rpc.PagedCallSettings;
3936
import com.google.api.gax.rpc.PagedListDescriptor;
@@ -90,7 +87,7 @@
9087
*/
9188
@Generated("by GAPIC v0.0.5")
9289
@BetaApi
93-
public class BigtableTableAdminSettings extends ClientSettings {
90+
public class BigtableTableAdminSettings extends ClientSettings<BigtableTableAdminSettings> {
9491
/** The default scopes of the service. */
9592
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
9693
ImmutableList.<String>builder()
@@ -153,6 +150,7 @@ public UnaryCallSettings<DropRowRangeRequest, Empty> dropRowRangeSettings() {
153150
return dropRowRangeSettings;
154151
}
155152

153+
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
156154
public BigtableTableAdminStub createStub() throws IOException {
157155
if (getTransportChannelProvider()
158156
.getTransportName()
@@ -186,13 +184,14 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
186184

187185
/** Returns a builder for the default ChannelProvider for this service. */
188186
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
189-
return InstantiatingGrpcChannelProvider.newBuilder().setEndpoint(getDefaultEndpoint());
187+
return InstantiatingGrpcChannelProvider.newBuilder();
190188
}
191189

192190
public static TransportChannelProvider defaultTransportChannelProvider() {
193191
return defaultGrpcTransportProviderBuilder().build();
194192
}
195193

194+
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
196195
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
197196
return ApiClientHeaderProvider.newBuilder()
198197
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
@@ -241,12 +240,7 @@ public Builder toBuilder() {
241240
}
242241

243242
private BigtableTableAdminSettings(Builder settingsBuilder) throws IOException {
244-
super(
245-
settingsBuilder.getExecutorProvider(),
246-
settingsBuilder.getTransportChannelProvider(),
247-
settingsBuilder.getCredentialsProvider(),
248-
settingsBuilder.getHeaderProvider(),
249-
settingsBuilder.getClock());
243+
super(settingsBuilder);
250244

251245
createTableSettings = settingsBuilder.createTableSettings().build();
252246
listTablesSettings = settingsBuilder.listTablesSettings().build();
@@ -310,7 +304,7 @@ public ApiFuture<ListTablesPagedResponse> getFuturePagedResponse(
310304
};
311305

312306
/** Builder for BigtableTableAdminSettings. */
313-
public static class Builder extends ClientSettings.Builder {
307+
public static class Builder extends ClientSettings.Builder<BigtableTableAdminSettings, Builder> {
314308
private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
315309

316310
private final UnaryCallSettings.Builder<CreateTableRequest, Table> createTableSettings;
@@ -393,6 +387,7 @@ private static Builder createDefault() {
393387
builder.setTransportChannelProvider(defaultTransportChannelProvider());
394388
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
395389
builder.setHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
390+
builder.setEndpoint(getDefaultEndpoint());
396391
return initDefaults(builder);
397392
}
398393

@@ -451,30 +446,6 @@ private Builder(BigtableTableAdminSettings settings) {
451446
dropRowRangeSettings);
452447
}
453448

454-
@Override
455-
public Builder setExecutorProvider(ExecutorProvider executorProvider) {
456-
super.setExecutorProvider(executorProvider);
457-
return this;
458-
}
459-
460-
@Override
461-
public Builder setTransportChannelProvider(TransportChannelProvider transportProvider) {
462-
super.setTransportChannelProvider(transportProvider);
463-
return this;
464-
}
465-
466-
@Override
467-
public Builder setHeaderProvider(HeaderProvider headerProvider) {
468-
super.setHeaderProvider(headerProvider);
469-
return this;
470-
}
471-
472-
@Override
473-
public Builder setCredentialsProvider(CredentialsProvider credentialsProvider) {
474-
super.setCredentialsProvider(credentialsProvider);
475-
return this;
476-
}
477-
478449
/**
479450
* Applies the given settings updater function to all of the unary API methods in this service.
480451
*

‎branches/lesv-patch-1/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/PagedResponseWrappers.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2017 Google Inc. All Rights Reserved.
2+
* Copyright 2017, Google LLC 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.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎branches/lesv-patch-1/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2017 Google Inc. All Rights Reserved.
2+
* Copyright 2017, Google LLC 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.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)