Skip to content

Commit 00b3817

Browse files
feat: Adding two new fields for Instance create_time and update_time (#1908)
* feat: add Session creator role docs: clarify transaction semantics PiperOrigin-RevId: 452634948 Source-Link: googleapis/googleapis@df51ec8 Source-Link: https://github.com/googleapis/googleapis-gen/commit/25426f6fd17c5229e17a1f37858cb6c1738f0cad Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjU0MjZmNmZkMTdjNTIyOWUxN2ExZjM3ODU4Y2I2YzE3MzhmMGNhZCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Integrate new gapic-generator-java and rules_gapic PiperOrigin-RevId: 454027580 Source-Link: googleapis/googleapis@1b22277 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Enable REST transport for most of Java and Go clients PiperOrigin-RevId: 456641589 Source-Link: googleapis/googleapis@8a251f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * deps: adding gax-httpjson * fix: update gapic-generator-java with mock service generation fixes PiperOrigin-RevId: 457524730 Source-Link: googleapis/googleapis@917e7f2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2497f9a069d3f6b2d6810d5a4e239cda1e7e5a39 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Adding two new fields for Instance create_time and update_time PiperOrigin-RevId: 458877561 Source-Link: googleapis/googleapis@207bf59 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ede6e4fbc14d76f9a6f48152a16d8141d8aff52 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWVkZTZlNGZiYzE0ZDc2ZjlhNmY0ODE1MmExNmQ4MTQxZDhhZmY1MiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Tomo Suzuki <suztomo@google.com>
1 parent 289bf79 commit 00b3817

File tree

43 files changed

+9686
-528
lines changed

Some content is hidden

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

43 files changed

+9686
-528
lines changed

‎google-cloud-spanner/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,10 @@
271271
<groupId>com.google.api</groupId>
272272
<artifactId>gax-grpc</artifactId>
273273
</dependency>
274+
<dependency>
275+
<groupId>com.google.api</groupId>
276+
<artifactId>gax-httpjson</artifactId>
277+
</dependency>
274278
<dependency>
275279
<groupId>org.threeten</groupId>
276280
<artifactId>threetenbp</artifactId>
@@ -308,12 +312,24 @@
308312
</dependency>
309313

310314
<!-- Need testing utility classes for generated gRPC clients tests -->
315+
<dependency>
316+
<groupId>com.google.api</groupId>
317+
<artifactId>gax</artifactId>
318+
<classifier>testlib</classifier>
319+
<scope>test</scope>
320+
</dependency>
311321
<dependency>
312322
<groupId>com.google.api</groupId>
313323
<artifactId>gax-grpc</artifactId>
314324
<classifier>testlib</classifier>
315325
<scope>test</scope>
316326
</dependency>
327+
<dependency>
328+
<groupId>com.google.api</groupId>
329+
<artifactId>gax-httpjson</artifactId>
330+
<classifier>testlib</classifier>
331+
<scope>test</scope>
332+
</dependency>
317333
<dependency>
318334
<groupId>com.google.truth</groupId>
319335
<artifactId>truth</artifactId>

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
import com.google.api.core.ApiFuture;
2020
import com.google.api.core.ApiFutures;
21+
import com.google.api.core.BetaApi;
2122
import com.google.api.gax.core.BackgroundResource;
23+
import com.google.api.gax.httpjson.longrunning.OperationsClient;
2224
import com.google.api.gax.longrunning.OperationFuture;
2325
import com.google.api.gax.paging.AbstractFixedSizeCollection;
2426
import com.google.api.gax.paging.AbstractPage;
@@ -36,7 +38,6 @@
3638
import com.google.iam.v1.TestIamPermissionsRequest;
3739
import com.google.iam.v1.TestIamPermissionsResponse;
3840
import com.google.longrunning.Operation;
39-
import com.google.longrunning.OperationsClient;
4041
import com.google.protobuf.Empty;
4142
import com.google.protobuf.FieldMask;
4243
import com.google.protobuf.Timestamp;
@@ -143,13 +144,28 @@
143144
* DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create(databaseAdminSettings);
144145
* }</pre>
145146
*
147+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
148+
* the wire:
149+
*
150+
* <pre>{@code
151+
* // This snippet has been automatically generated for illustrative purposes only.
152+
* // It may require modifications to work in your environment.
153+
* DatabaseAdminSettings databaseAdminSettings =
154+
* DatabaseAdminSettings.newBuilder()
155+
* .setTransportChannelProvider(
156+
* DatabaseAdminSettings.defaultHttpJsonTransportProviderBuilder().build())
157+
* .build();
158+
* DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create(databaseAdminSettings);
159+
* }</pre>
160+
*
146161
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
147162
*/
148163
@Generated("by gapic-generator-java")
149164
public class DatabaseAdminClient implements BackgroundResource {
150165
private final DatabaseAdminSettings settings;
151166
private final DatabaseAdminStub stub;
152-
private final OperationsClient operationsClient;
167+
private final OperationsClient httpJsonOperationsClient;
168+
private final com.google.longrunning.OperationsClient operationsClient;
153169

154170
/** Constructs an instance of DatabaseAdminClient with default settings. */
155171
public static final DatabaseAdminClient create() throws IOException {
@@ -181,13 +197,17 @@ public static final DatabaseAdminClient create(DatabaseAdminStub stub) {
181197
protected DatabaseAdminClient(DatabaseAdminSettings settings) throws IOException {
182198
this.settings = settings;
183199
this.stub = ((DatabaseAdminStubSettings) settings.getStubSettings()).createStub();
184-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
200+
this.operationsClient =
201+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
202+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
185203
}
186204

187205
protected DatabaseAdminClient(DatabaseAdminStub stub) {
188206
this.settings = null;
189207
this.stub = stub;
190-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
208+
this.operationsClient =
209+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
210+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
191211
}
192212

193213
public final DatabaseAdminSettings getSettings() {
@@ -202,10 +222,19 @@ public DatabaseAdminStub getStub() {
202222
* Returns the OperationsClient that can be used to query the status of a long-running operation
203223
* returned by another API method call.
204224
*/
205-
public final OperationsClient getOperationsClient() {
225+
public final com.google.longrunning.OperationsClient getOperationsClient() {
206226
return operationsClient;
207227
}
208228

229+
/**
230+
* Returns the OperationsClient that can be used to query the status of a long-running operation
231+
* returned by another API method call.
232+
*/
233+
@BetaApi
234+
public final OperationsClient getHttpJsonOperationsClient() {
235+
return httpJsonOperationsClient;
236+
}
237+
209238
// AUTO-GENERATED DOCUMENTATION AND METHOD.
210239
/**
211240
* Lists Cloud Spanner databases.
@@ -338,7 +367,7 @@ public final ListDatabasesPagedResponse listDatabases(ListDatabasesRequest reque
338367
* .build();
339368
* while (true) {
340369
* ListDatabasesResponse response = databaseAdminClient.listDatabasesCallable().call(request);
341-
* for (Database element : response.getResponsesList()) {
370+
* for (Database element : response.getDatabasesList()) {
342371
* // doThingsWith(element);
343372
* }
344373
* String nextPageToken = response.getNextPageToken();
@@ -2395,7 +2424,7 @@ public final ListBackupsPagedResponse listBackups(ListBackupsRequest request) {
23952424
* .build();
23962425
* while (true) {
23972426
* ListBackupsResponse response = databaseAdminClient.listBackupsCallable().call(request);
2398-
* for (Backup element : response.getResponsesList()) {
2427+
* for (Backup element : response.getBackupsList()) {
23992428
* // doThingsWith(element);
24002429
* }
24012430
* String nextPageToken = response.getNextPageToken();
@@ -2913,7 +2942,7 @@ public final ListDatabaseOperationsPagedResponse listDatabaseOperations(
29132942
* while (true) {
29142943
* ListDatabaseOperationsResponse response =
29152944
* databaseAdminClient.listDatabaseOperationsCallable().call(request);
2916-
* for (Operation element : response.getResponsesList()) {
2945+
* for (Operation element : response.getOperationsList()) {
29172946
* // doThingsWith(element);
29182947
* }
29192948
* String nextPageToken = response.getNextPageToken();
@@ -3104,7 +3133,7 @@ public final ListBackupOperationsPagedResponse listBackupOperations(
31043133
* while (true) {
31053134
* ListBackupOperationsResponse response =
31063135
* databaseAdminClient.listBackupOperationsCallable().call(request);
3107-
* for (Operation element : response.getResponsesList()) {
3136+
* for (Operation element : response.getOperationsList()) {
31083137
* // doThingsWith(element);
31093138
* }
31103139
* String nextPageToken = response.getNextPageToken();

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.api.gax.core.GoogleCredentialsProvider;
2727
import com.google.api.gax.core.InstantiatingExecutorProvider;
2828
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
29+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2930
import com.google.api.gax.rpc.ApiClientHeaderProvider;
3031
import com.google.api.gax.rpc.ClientContext;
3132
import com.google.api.gax.rpc.ClientSettings;
@@ -264,11 +265,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
264265
return DatabaseAdminStubSettings.defaultCredentialsProviderBuilder();
265266
}
266267

267-
/** Returns a builder for the default ChannelProvider for this service. */
268+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
268269
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
269270
return DatabaseAdminStubSettings.defaultGrpcTransportProviderBuilder();
270271
}
271272

273+
/** Returns a builder for the default REST ChannelProvider for this service. */
274+
@BetaApi
275+
public static InstantiatingHttpJsonChannelProvider.Builder
276+
defaultHttpJsonTransportProviderBuilder() {
277+
return DatabaseAdminStubSettings.defaultHttpJsonTransportProviderBuilder();
278+
}
279+
272280
public static TransportChannelProvider defaultTransportChannelProvider() {
273281
return DatabaseAdminStubSettings.defaultTransportChannelProvider();
274282
}
@@ -278,11 +286,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
278286
return DatabaseAdminStubSettings.defaultApiClientHeaderProviderBuilder();
279287
}
280288

281-
/** Returns a new builder for this class. */
289+
/** Returns a new gRPC builder for this class. */
282290
public static Builder newBuilder() {
283291
return Builder.createDefault();
284292
}
285293

294+
/** Returns a new REST builder for this class. */
295+
@BetaApi
296+
public static Builder newHttpJsonBuilder() {
297+
return Builder.createHttpJsonDefault();
298+
}
299+
286300
/** Returns a new builder for this class. */
287301
public static Builder newBuilder(ClientContext clientContext) {
288302
return new Builder(clientContext);
@@ -320,6 +334,11 @@ private static Builder createDefault() {
320334
return new Builder(DatabaseAdminStubSettings.newBuilder());
321335
}
322336

337+
@BetaApi
338+
private static Builder createHttpJsonDefault() {
339+
return new Builder(DatabaseAdminStubSettings.newHttpJsonBuilder());
340+
}
341+
323342
public DatabaseAdminStubSettings.Builder getStubSettingsBuilder() {
324343
return ((DatabaseAdminStubSettings.Builder) getStubSettings());
325344
}

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@
7171
public abstract class DatabaseAdminStub implements BackgroundResource {
7272

7373
public OperationsStub getOperationsStub() {
74-
throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
74+
return null;
75+
}
76+
77+
public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() {
78+
return null;
7579
}
7680

7781
public UnaryCallable<ListDatabasesRequest, ListDatabasesPagedResponse>

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
import com.google.api.gax.grpc.GrpcTransportChannel;
3232
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
3333
import com.google.api.gax.grpc.ProtoOperationTransformers;
34+
import com.google.api.gax.httpjson.GaxHttpJsonProperties;
35+
import com.google.api.gax.httpjson.HttpJsonTransportChannel;
36+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
3437
import com.google.api.gax.longrunning.OperationSnapshot;
3538
import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
3639
import com.google.api.gax.retrying.RetrySettings;
@@ -547,6 +550,11 @@ public DatabaseAdminStub createStub() throws IOException {
547550
.equals(GrpcTransportChannel.getGrpcTransportName())) {
548551
return GrpcDatabaseAdminStub.create(this);
549552
}
553+
if (getTransportChannelProvider()
554+
.getTransportName()
555+
.equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
556+
return HttpJsonDatabaseAdminStub.create(this);
557+
}
550558
throw new UnsupportedOperationException(
551559
String.format(
552560
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
@@ -579,30 +587,56 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
579587
.setUseJwtAccessWithScope(true);
580588
}
581589

582-
/** Returns a builder for the default ChannelProvider for this service. */
590+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
583591
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
584592
return InstantiatingGrpcChannelProvider.newBuilder()
585593
.setMaxInboundMessageSize(Integer.MAX_VALUE);
586594
}
587595

596+
/** Returns a builder for the default REST ChannelProvider for this service. */
597+
@BetaApi
598+
public static InstantiatingHttpJsonChannelProvider.Builder
599+
defaultHttpJsonTransportProviderBuilder() {
600+
return InstantiatingHttpJsonChannelProvider.newBuilder();
601+
}
602+
588603
public static TransportChannelProvider defaultTransportChannelProvider() {
589604
return defaultGrpcTransportProviderBuilder().build();
590605
}
591606

592607
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
593-
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
608+
public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
594609
return ApiClientHeaderProvider.newBuilder()
595610
.setGeneratedLibToken(
596611
"gapic", GaxProperties.getLibraryVersion(DatabaseAdminStubSettings.class))
597612
.setTransportToken(
598613
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
599614
}
600615

601-
/** Returns a new builder for this class. */
616+
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
617+
public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
618+
return ApiClientHeaderProvider.newBuilder()
619+
.setGeneratedLibToken(
620+
"gapic", GaxProperties.getLibraryVersion(DatabaseAdminStubSettings.class))
621+
.setTransportToken(
622+
GaxHttpJsonProperties.getHttpJsonTokenName(),
623+
GaxHttpJsonProperties.getHttpJsonVersion());
624+
}
625+
626+
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
627+
return DatabaseAdminStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
628+
}
629+
630+
/** Returns a new gRPC builder for this class. */
602631
public static Builder newBuilder() {
603632
return Builder.createDefault();
604633
}
605634

635+
/** Returns a new REST builder for this class. */
636+
public static Builder newHttpJsonBuilder() {
637+
return Builder.createHttpJsonDefault();
638+
}
639+
606640
/** Returns a new builder for this class. */
607641
public static Builder newBuilder(ClientContext clientContext) {
608642
return new Builder(clientContext);
@@ -880,6 +914,19 @@ private static Builder createDefault() {
880914
return initDefaults(builder);
881915
}
882916

917+
private static Builder createHttpJsonDefault() {
918+
Builder builder = new Builder(((ClientContext) null));
919+
920+
builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
921+
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
922+
builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
923+
builder.setEndpoint(getDefaultEndpoint());
924+
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
925+
builder.setSwitchToMtlsEndpointAllowed(true);
926+
927+
return initDefaults(builder);
928+
}
929+
883930
private static Builder initDefaults(Builder builder) {
884931
builder
885932
.listDatabasesSettings()

0 commit comments

Comments
 (0)