Skip to content

Commit 7d7f526

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: An existing resource pattern value projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=**} to resource definition storage.googleapis.com/ManagedFolder is removed (#2524)
* fix!: An existing resource pattern value `projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=**}` to resource definition `storage.googleapis.com/ManagedFolder` is removed feat: A new resource pattern value `projects/{project}/buckets/{bucket}/managedFolders/{managed_folder=**}` added to the resource definition `storage.googleapis.com/ManagedFolder` PiperOrigin-RevId: 630439820 Source-Link: googleapis/googleapis@d9a3161 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d39d37f4bad975da0fb0bb277dd4e18fbeba24d5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDM5ZDM3ZjRiYWQ5NzVkYTBmYjBiYjI3N2RkNGUxOGZiZWJhMjRkNSJ9 * 🦉 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>
1 parent cebf059 commit 7d7f526

File tree

9 files changed

+146
-149
lines changed

9 files changed

+146
-149
lines changed

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,8 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-storage/tree/
389389
| Upload Kms Encrypted Object | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/object/UploadKmsEncryptedObject.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/object/UploadKmsEncryptedObject.java) |
390390
| Upload Object | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/object/UploadObject.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/object/UploadObject.java) |
391391
| Upload Object From Memory | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/object/UploadObjectFromMemory.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/object/UploadObjectFromMemory.java) |
392+
| Allow Divide And Conquer Download | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/transfermanager/AllowDivideAndConquerDownload.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/transfermanager/AllowDivideAndConquerDownload.java) |
393+
| Allow Parallel Composite Upload | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/transfermanager/AllowParallelCompositeUpload.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/transfermanager/AllowParallelCompositeUpload.java) |
392394
| Download Bucket | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/transfermanager/DownloadBucket.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/transfermanager/DownloadBucket.java) |
393395
| Download Many | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/transfermanager/DownloadMany.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/transfermanager/DownloadMany.java) |
394396
| Upload Directory | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/transfermanager/UploadDirectory.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/transfermanager/UploadDirectory.java) |

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ public final ManagedFolder createManagedFolder(CreateManagedFolderRequest reques
13871387
* // - It may require specifying regional endpoints when creating the service client as shown in
13881388
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
13891389
* try (StorageControlClient storageControlClient = StorageControlClient.create()) {
1390-
* ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]");
1390+
* ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]");
13911391
* storageControlClient.deleteManagedFolder(name);
13921392
* }
13931393
* }</pre>
@@ -1417,7 +1417,7 @@ public final void deleteManagedFolder(ManagedFolderName name) {
14171417
* // - It may require specifying regional endpoints when creating the service client as shown in
14181418
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
14191419
* try (StorageControlClient storageControlClient = StorageControlClient.create()) {
1420-
* String name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString();
1420+
* String name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString();
14211421
* storageControlClient.deleteManagedFolder(name);
14221422
* }
14231423
* }</pre>
@@ -1447,7 +1447,7 @@ public final void deleteManagedFolder(String name) {
14471447
* try (StorageControlClient storageControlClient = StorageControlClient.create()) {
14481448
* DeleteManagedFolderRequest request =
14491449
* DeleteManagedFolderRequest.newBuilder()
1450-
* .setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString())
1450+
* .setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString())
14511451
* .setIfMetagenerationMatch(1043427781)
14521452
* .setIfMetagenerationNotMatch(1025430873)
14531453
* .setAllowNonEmpty(true)
@@ -1479,7 +1479,7 @@ public final void deleteManagedFolder(DeleteManagedFolderRequest request) {
14791479
* try (StorageControlClient storageControlClient = StorageControlClient.create()) {
14801480
* DeleteManagedFolderRequest request =
14811481
* DeleteManagedFolderRequest.newBuilder()
1482-
* .setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString())
1482+
* .setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString())
14831483
* .setIfMetagenerationMatch(1043427781)
14841484
* .setIfMetagenerationNotMatch(1025430873)
14851485
* .setAllowNonEmpty(true)
@@ -1509,7 +1509,7 @@ public final UnaryCallable<DeleteManagedFolderRequest, Empty> deleteManagedFolde
15091509
* // - It may require specifying regional endpoints when creating the service client as shown in
15101510
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
15111511
* try (StorageControlClient storageControlClient = StorageControlClient.create()) {
1512-
* ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]");
1512+
* ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]");
15131513
* ManagedFolder response = storageControlClient.getManagedFolder(name);
15141514
* }
15151515
* }</pre>
@@ -1537,7 +1537,7 @@ public final ManagedFolder getManagedFolder(ManagedFolderName name) {
15371537
* // - It may require specifying regional endpoints when creating the service client as shown in
15381538
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
15391539
* try (StorageControlClient storageControlClient = StorageControlClient.create()) {
1540-
* String name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString();
1540+
* String name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString();
15411541
* ManagedFolder response = storageControlClient.getManagedFolder(name);
15421542
* }
15431543
* }</pre>
@@ -1566,7 +1566,7 @@ public final ManagedFolder getManagedFolder(String name) {
15661566
* try (StorageControlClient storageControlClient = StorageControlClient.create()) {
15671567
* GetManagedFolderRequest request =
15681568
* GetManagedFolderRequest.newBuilder()
1569-
* .setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString())
1569+
* .setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString())
15701570
* .setIfMetagenerationMatch(1043427781)
15711571
* .setIfMetagenerationNotMatch(1025430873)
15721572
* .setRequestId("requestId693933066")
@@ -1597,7 +1597,7 @@ public final ManagedFolder getManagedFolder(GetManagedFolderRequest request) {
15971597
* try (StorageControlClient storageControlClient = StorageControlClient.create()) {
15981598
* GetManagedFolderRequest request =
15991599
* GetManagedFolderRequest.newBuilder()
1600-
* .setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString())
1600+
* .setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString())
16011601
* .setIfMetagenerationMatch(1043427781)
16021602
* .setIfMetagenerationNotMatch(1025430873)
16031603
* .setRequestId("requestId693933066")

‎google-cloud-storage-control/src/test/java/com/google/storage/control/v2/StorageControlClientTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ public void getStorageLayoutExceptionTest2() throws Exception {
615615
public void createManagedFolderTest() throws Exception {
616616
ManagedFolder expectedResponse =
617617
ManagedFolder.newBuilder()
618-
.setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString())
618+
.setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString())
619619
.setMetageneration(1048558813)
620620
.setCreateTime(Timestamp.newBuilder().build())
621621
.setUpdateTime(Timestamp.newBuilder().build())
@@ -663,7 +663,7 @@ public void createManagedFolderExceptionTest() throws Exception {
663663
public void createManagedFolderTest2() throws Exception {
664664
ManagedFolder expectedResponse =
665665
ManagedFolder.newBuilder()
666-
.setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString())
666+
.setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString())
667667
.setMetageneration(1048558813)
668668
.setCreateTime(Timestamp.newBuilder().build())
669669
.setUpdateTime(Timestamp.newBuilder().build())
@@ -712,7 +712,7 @@ public void deleteManagedFolderTest() throws Exception {
712712
Empty expectedResponse = Empty.newBuilder().build();
713713
mockStorageControl.addResponse(expectedResponse);
714714

715-
ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]");
715+
ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]");
716716

717717
client.deleteManagedFolder(name);
718718

@@ -733,7 +733,7 @@ public void deleteManagedFolderExceptionTest() throws Exception {
733733
mockStorageControl.addException(exception);
734734

735735
try {
736-
ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]");
736+
ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]");
737737
client.deleteManagedFolder(name);
738738
Assert.fail("No exception raised");
739739
} catch (InvalidArgumentException e) {
@@ -779,14 +779,14 @@ public void deleteManagedFolderExceptionTest2() throws Exception {
779779
public void getManagedFolderTest() throws Exception {
780780
ManagedFolder expectedResponse =
781781
ManagedFolder.newBuilder()
782-
.setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString())
782+
.setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString())
783783
.setMetageneration(1048558813)
784784
.setCreateTime(Timestamp.newBuilder().build())
785785
.setUpdateTime(Timestamp.newBuilder().build())
786786
.build();
787787
mockStorageControl.addResponse(expectedResponse);
788788

789-
ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]");
789+
ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]");
790790

791791
ManagedFolder actualResponse = client.getManagedFolder(name);
792792
Assert.assertEquals(expectedResponse, actualResponse);
@@ -808,7 +808,7 @@ public void getManagedFolderExceptionTest() throws Exception {
808808
mockStorageControl.addException(exception);
809809

810810
try {
811-
ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]");
811+
ManagedFolderName name = ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]");
812812
client.getManagedFolder(name);
813813
Assert.fail("No exception raised");
814814
} catch (InvalidArgumentException e) {
@@ -820,7 +820,7 @@ public void getManagedFolderExceptionTest() throws Exception {
820820
public void getManagedFolderTest2() throws Exception {
821821
ManagedFolder expectedResponse =
822822
ManagedFolder.newBuilder()
823-
.setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGEDFOLDER]").toString())
823+
.setName(ManagedFolderName.of("[PROJECT]", "[BUCKET]", "[MANAGED_FOLDER]").toString())
824824
.setMetageneration(1048558813)
825825
.setCreateTime(Timestamp.newBuilder().build())
826826
.setUpdateTime(Timestamp.newBuilder().build())

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
// AUTO-GENERATED DOCUMENTATION AND CLASS.
3030
@Generated("by gapic-generator-java")
3131
public class ManagedFolderName implements ResourceName {
32-
private static final PathTemplate PROJECT_BUCKET_MANAGEDFOLDER =
32+
private static final PathTemplate PROJECT_BUCKET_MANAGED_FOLDER =
3333
PathTemplate.createWithoutUrlEncoding(
34-
"projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=**}");
34+
"projects/{project}/buckets/{bucket}/managedFolders/{managed_folder=**}");
3535
private volatile Map<String, String> fieldValuesMap;
3636
private final String project;
3737
private final String bucket;
@@ -92,9 +92,9 @@ public static ManagedFolderName parse(String formattedString) {
9292
return null;
9393
}
9494
Map<String, String> matchMap =
95-
PROJECT_BUCKET_MANAGEDFOLDER.validatedMatch(
95+
PROJECT_BUCKET_MANAGED_FOLDER.validatedMatch(
9696
formattedString, "ManagedFolderName.parse: formattedString not in valid format");
97-
return of(matchMap.get("project"), matchMap.get("bucket"), matchMap.get("managedFolder"));
97+
return of(matchMap.get("project"), matchMap.get("bucket"), matchMap.get("managed_folder"));
9898
}
9999

100100
public static List<ManagedFolderName> parseList(List<String> formattedStrings) {
@@ -118,7 +118,7 @@ public static List<String> toStringList(List<ManagedFolderName> values) {
118118
}
119119

120120
public static boolean isParsableFrom(String formattedString) {
121-
return PROJECT_BUCKET_MANAGEDFOLDER.matches(formattedString);
121+
return PROJECT_BUCKET_MANAGED_FOLDER.matches(formattedString);
122122
}
123123

124124
@Override
@@ -134,7 +134,7 @@ public Map<String, String> getFieldValuesMap() {
134134
fieldMapBuilder.put("bucket", bucket);
135135
}
136136
if (managedFolder != null) {
137-
fieldMapBuilder.put("managedFolder", managedFolder);
137+
fieldMapBuilder.put("managed_folder", managedFolder);
138138
}
139139
fieldValuesMap = fieldMapBuilder.build();
140140
}
@@ -149,8 +149,8 @@ public String getFieldValue(String fieldName) {
149149

150150
@Override
151151
public String toString() {
152-
return PROJECT_BUCKET_MANAGEDFOLDER.instantiate(
153-
"project", project, "bucket", bucket, "managedFolder", managedFolder);
152+
return PROJECT_BUCKET_MANAGED_FOLDER.instantiate(
153+
"project", project, "bucket", bucket, "managed_folder", managedFolder);
154154
}
155155

156156
@Override
@@ -179,7 +179,7 @@ public int hashCode() {
179179
return h;
180180
}
181181

182-
/** Builder for projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=&#42;&#42;}. */
182+
/** Builder for projects/{project}/buckets/{bucket}/managedFolders/{managed_folder=&#42;&#42;}. */
183183
public static class Builder {
184184
private String project;
185185
private String bucket;

0 commit comments

Comments
 (0)