Skip to content

Commit 33ad28d

Browse files
cloud-java-botBenWhitehead
cloud-java-bot
and
BenWhitehead
authored
chore: Update generation configuration at Wed Jun 25 15:48:09 UTC 2025 (googleapis#3169)
* chore: Update generation configuration at Wed Jun 25 15:48:09 UTC 2025 * chore: generate libraries at Wed Jun 25 15:48:39 UTC 2025 * chore(deps(storagecontrol)): add com.google.api:gax-httpjson test(deps): add com.google.api:gax:testlib test(deps): add com.google.api:gax-httpjson:testlib * test(deps): add com.google.http-client:google-http-client * chore: revert unintended downgrade, fix in googleapis#3170 --------- Co-authored-by: BenWhitehead <[email protected]>
1 parent b956eb9 commit 33ad28d

File tree

17 files changed

+1684
-57
lines changed

17 files changed

+1684
-57
lines changed

‎README.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ If you are using Maven without the BOM, add this to your dependencies:
4646
<dependency>
4747
<groupId>com.google.cloud</groupId>
4848
<artifactId>google-cloud-storage</artifactId>
49-
<version>2.53.0</version>
49+
<version>2.53.1</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>com.google.cloud</groupId>
5353
<artifactId>google-cloud-storage-control</artifactId>
54-
<version>2.53.0</version>
54+
<version>2.53.1</version>
5555
</dependency>
5656

5757
```
@@ -347,6 +347,13 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-storage/tree/
347347
| Set Public Access Prevention Inherited | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/SetPublicAccessPreventionInherited.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/SetPublicAccessPreventionInherited.java) |
348348
| Set Retention Policy | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/SetRetentionPolicy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/SetRetentionPolicy.java) |
349349
| Set Soft Delete Policy | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/SetSoftDeletePolicy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/SetSoftDeletePolicy.java) |
350+
| Anywhere Cache Create | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheCreate.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheCreate.java) |
351+
| Anywhere Cache Disable | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheDisable.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheDisable.java) |
352+
| Anywhere Cache Get | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheGet.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheGet.java) |
353+
| Anywhere Cache List | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheList.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheList.java) |
354+
| Anywhere Cache Pause | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCachePause.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCachePause.java) |
355+
| Anywhere Cache Resume | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheResume.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheResume.java) |
356+
| Anywhere Cache Update | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheUpdate.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/AnywhereCacheUpdate.java) |
350357
| Create Folder | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/CreateFolder.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/CreateFolder.java) |
351358
| Create Hierarchical Namespace Bucket | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/CreateHierarchicalNamespaceBucket.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/CreateHierarchicalNamespaceBucket.java) |
352359
| Delete Folder | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/control/v2/DeleteFolder.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/control/v2/DeleteFolder.java) |

‎generation_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
gapic_generator_version: 2.59.0
2-
googleapis_commitish: 3a45aa38968f4fe537cd3837c0e95af8c189b11b
2+
googleapis_commitish: d57057715ebe652819419146472b09c14729d054
33
libraries_bom_version: 26.61.0
44
libraries:
55
- api_shortname: storage

‎google-cloud-storage-control/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,27 @@
4747
<groupId>com.google.api</groupId>
4848
<artifactId>gax</artifactId>
4949
</dependency>
50+
<dependency>
51+
<groupId>com.google.api</groupId>
52+
<artifactId>gax</artifactId>
53+
<scope>test</scope>
54+
<classifier>testlib</classifier>
55+
</dependency>
5056

5157
<dependency>
5258
<groupId>com.google.api</groupId>
5359
<artifactId>gax-grpc</artifactId>
5460
</dependency>
61+
<dependency>
62+
<groupId>com.google.api</groupId>
63+
<artifactId>gax-httpjson</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.google.api</groupId>
67+
<artifactId>gax-httpjson</artifactId>
68+
<scope>test</scope>
69+
<classifier>testlib</classifier>
70+
</dependency>
5571
<dependency>
5672
<groupId>com.google.guava</groupId>
5773
<artifactId>guava</artifactId>
@@ -71,6 +87,11 @@
7187
<groupId>com.google.api.grpc</groupId>
7288
<artifactId>grpc-google-cloud-storage-control-v2</artifactId>
7389
</dependency>
90+
<dependency>
91+
<groupId>com.google.http-client</groupId>
92+
<artifactId>google-http-client</artifactId>
93+
<scope>test</scope>
94+
</dependency>
7495
</dependencies>
7596

7697
<profiles>

‎google-cloud-storage-control/src/main/java/com/google/storage/control/v2/StorageControlClient.java‎

Lines changed: 34 additions & 5 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;
@@ -28,7 +30,6 @@
2830
import com.google.api.gax.rpc.UnaryCallable;
2931
import com.google.common.util.concurrent.MoreExecutors;
3032
import com.google.longrunning.Operation;
31-
import com.google.longrunning.OperationsClient;
3233
import com.google.protobuf.Empty;
3334
import com.google.protobuf.FieldMask;
3435
import com.google.storage.control.v2.stub.StorageControlStub;
@@ -547,13 +548,28 @@
547548
* StorageControlClient storageControlClient = StorageControlClient.create(storageControlSettings);
548549
* }</pre>
549550
*
551+
* <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
552+
* the wire:
553+
*
554+
* <pre>{@code
555+
* // This snippet has been automatically generated and should be regarded as a code template only.
556+
* // It will require modifications to work:
557+
* // - It may require correct/in-range values for request initialization.
558+
* // - It may require specifying regional endpoints when creating the service client as shown in
559+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
560+
* StorageControlSettings storageControlSettings =
561+
* StorageControlSettings.newHttpJsonBuilder().build();
562+
* StorageControlClient storageControlClient = StorageControlClient.create(storageControlSettings);
563+
* }</pre>
564+
*
550565
* <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
551566
*/
552567
@Generated("by gapic-generator-java")
553568
public class StorageControlClient implements BackgroundResource {
554569
private final StorageControlSettings settings;
555570
private final StorageControlStub stub;
556-
private final OperationsClient operationsClient;
571+
private final OperationsClient httpJsonOperationsClient;
572+
private final com.google.longrunning.OperationsClient operationsClient;
557573

558574
/** Constructs an instance of StorageControlClient with default settings. */
559575
public static final StorageControlClient create() throws IOException {
@@ -585,13 +601,17 @@ public static final StorageControlClient create(StorageControlStub stub) {
585601
protected StorageControlClient(StorageControlSettings settings) throws IOException {
586602
this.settings = settings;
587603
this.stub = ((StorageControlStubSettings) settings.getStubSettings()).createStub();
588-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
604+
this.operationsClient =
605+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
606+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
589607
}
590608

591609
protected StorageControlClient(StorageControlStub stub) {
592610
this.settings = null;
593611
this.stub = stub;
594-
this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
612+
this.operationsClient =
613+
com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
614+
this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
595615
}
596616

597617
public final StorageControlSettings getSettings() {
@@ -606,10 +626,19 @@ public StorageControlStub getStub() {
606626
* Returns the OperationsClient that can be used to query the status of a long-running operation
607627
* returned by another API method call.
608628
*/
609-
public final OperationsClient getOperationsClient() {
629+
public final com.google.longrunning.OperationsClient getOperationsClient() {
610630
return operationsClient;
611631
}
612632

633+
/**
634+
* Returns the OperationsClient that can be used to query the status of a long-running operation
635+
* returned by another API method call.
636+
*/
637+
@BetaApi
638+
public final OperationsClient getHttpJsonOperationsClient() {
639+
return httpJsonOperationsClient;
640+
}
641+
613642
// AUTO-GENERATED DOCUMENTATION AND METHOD.
614643
/**
615644
* Creates a new folder. This operation is only applicable to a hierarchical namespace enabled

‎google-cloud-storage-control/src/main/java/com/google/storage/control/v2/StorageControlSettings.java‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121
import static com.google.storage.control.v2.StorageControlClient.ListManagedFoldersPagedResponse;
2222

2323
import com.google.api.core.ApiFunction;
24+
import com.google.api.core.BetaApi;
2425
import com.google.api.gax.core.GoogleCredentialsProvider;
2526
import com.google.api.gax.core.InstantiatingExecutorProvider;
2627
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
28+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
2729
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2830
import com.google.api.gax.rpc.ClientContext;
2931
import com.google.api.gax.rpc.ClientSettings;
@@ -297,11 +299,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
297299
return StorageControlStubSettings.defaultCredentialsProviderBuilder();
298300
}
299301

300-
/** Returns a builder for the default ChannelProvider for this service. */
302+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
301303
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
302304
return StorageControlStubSettings.defaultGrpcTransportProviderBuilder();
303305
}
304306

307+
/** Returns a builder for the default REST ChannelProvider for this service. */
308+
@BetaApi
309+
public static InstantiatingHttpJsonChannelProvider.Builder
310+
defaultHttpJsonTransportProviderBuilder() {
311+
return StorageControlStubSettings.defaultHttpJsonTransportProviderBuilder();
312+
}
313+
305314
public static TransportChannelProvider defaultTransportChannelProvider() {
306315
return StorageControlStubSettings.defaultTransportChannelProvider();
307316
}
@@ -310,11 +319,16 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
310319
return StorageControlStubSettings.defaultApiClientHeaderProviderBuilder();
311320
}
312321

313-
/** Returns a new builder for this class. */
322+
/** Returns a new gRPC builder for this class. */
314323
public static Builder newBuilder() {
315324
return Builder.createDefault();
316325
}
317326

327+
/** Returns a new REST builder for this class. */
328+
public static Builder newHttpJsonBuilder() {
329+
return Builder.createHttpJsonDefault();
330+
}
331+
318332
/** Returns a new builder for this class. */
319333
public static Builder newBuilder(ClientContext clientContext) {
320334
return new Builder(clientContext);
@@ -352,6 +366,10 @@ private static Builder createDefault() {
352366
return new Builder(StorageControlStubSettings.newBuilder());
353367
}
354368

369+
private static Builder createHttpJsonDefault() {
370+
return new Builder(StorageControlStubSettings.newHttpJsonBuilder());
371+
}
372+
355373
public StorageControlStubSettings.Builder getStubSettingsBuilder() {
356374
return ((StorageControlStubSettings.Builder) getStubSettings());
357375
}

‎google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/HttpJsonStorageControlCallableFactory.java‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
/*
2+
* Copyright 2025 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.storage.control.v2.stub;
18+
19+
import com.google.api.gax.httpjson.HttpJsonCallSettings;
20+
import com.google.api.gax.httpjson.HttpJsonCallableFactory;
21+
import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
22+
import com.google.api.gax.httpjson.HttpJsonStubCallableFactory;
23+
import com.google.api.gax.httpjson.longrunning.stub.OperationsStub;
24+
import com.google.api.gax.rpc.BatchingCallSettings;
25+
import com.google.api.gax.rpc.ClientContext;
26+
import com.google.api.gax.rpc.OperationCallSettings;
27+
import com.google.api.gax.rpc.OperationCallable;
28+
import com.google.api.gax.rpc.PagedCallSettings;
29+
import com.google.api.gax.rpc.ServerStreamingCallSettings;
30+
import com.google.api.gax.rpc.ServerStreamingCallable;
31+
import com.google.api.gax.rpc.UnaryCallSettings;
32+
import com.google.api.gax.rpc.UnaryCallable;
33+
import com.google.longrunning.Operation;
34+
import javax.annotation.Generated;
35+
36+
// AUTO-GENERATED DOCUMENTATION AND CLASS.
37+
/**
38+
* REST callable factory implementation for the StorageControl service API.
39+
*
40+
* <p>This class is for advanced usage.
41+
*/
42+
@Generated("by gapic-generator-java")
43+
public class HttpJsonStorageControlCallableFactory
44+
implements HttpJsonStubCallableFactory<Operation, OperationsStub> {
45+
46+
@Override
47+
public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCallable(
48+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
49+
UnaryCallSettings<RequestT, ResponseT> callSettings,
50+
ClientContext clientContext) {
51+
return HttpJsonCallableFactory.createUnaryCallable(
52+
httpJsonCallSettings, callSettings, clientContext);
53+
}
54+
55+
@Override
56+
public <RequestT, ResponseT, PagedListResponseT>
57+
UnaryCallable<RequestT, PagedListResponseT> createPagedCallable(
58+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
59+
PagedCallSettings<RequestT, ResponseT, PagedListResponseT> callSettings,
60+
ClientContext clientContext) {
61+
return HttpJsonCallableFactory.createPagedCallable(
62+
httpJsonCallSettings, callSettings, clientContext);
63+
}
64+
65+
@Override
66+
public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCallable(
67+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
68+
BatchingCallSettings<RequestT, ResponseT> callSettings,
69+
ClientContext clientContext) {
70+
return HttpJsonCallableFactory.createBatchingCallable(
71+
httpJsonCallSettings, callSettings, clientContext);
72+
}
73+
74+
@Override
75+
public <RequestT, ResponseT, MetadataT>
76+
OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
77+
HttpJsonCallSettings<RequestT, Operation> httpJsonCallSettings,
78+
OperationCallSettings<RequestT, ResponseT, MetadataT> callSettings,
79+
ClientContext clientContext,
80+
OperationsStub operationsStub) {
81+
UnaryCallable<RequestT, Operation> innerCallable =
82+
HttpJsonCallableFactory.createBaseUnaryCallable(
83+
httpJsonCallSettings, callSettings.getInitialCallSettings(), clientContext);
84+
HttpJsonOperationSnapshotCallable<RequestT, Operation> initialCallable =
85+
new HttpJsonOperationSnapshotCallable<RequestT, Operation>(
86+
innerCallable,
87+
httpJsonCallSettings.getMethodDescriptor().getOperationSnapshotFactory());
88+
return HttpJsonCallableFactory.createOperationCallable(
89+
callSettings, clientContext, operationsStub.longRunningClient(), initialCallable);
90+
}
91+
92+
@Override
93+
public <RequestT, ResponseT>
94+
ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
95+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
96+
ServerStreamingCallSettings<RequestT, ResponseT> callSettings,
97+
ClientContext clientContext) {
98+
return HttpJsonCallableFactory.createServerStreamingCallable(
99+
httpJsonCallSettings, callSettings, clientContext);
100+
}
101+
}

0 commit comments

Comments
 (0)