Skip to content

Commit bae1f27

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: Integrate new gapic-generator-java and rules_gapic (#180)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 454027580 Source-Link: googleapis/googleapis@1b22277 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9
1 parent 89b90e4 commit bae1f27

3 files changed

Lines changed: 70 additions & 23 deletions

File tree

‎java-resource-settings/google-cloud-resource-settings/src/main/java/com/google/cloud/resourcesettings/v1/ResourceSettingsServiceClient.java‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
* try (ResourceSettingsServiceClient resourceSettingsServiceClient =
5757
* ResourceSettingsServiceClient.create()) {
5858
* SettingName name =
59-
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
59+
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");
6060
* Setting response = resourceSettingsServiceClient.getSetting(name);
6161
* }
6262
* }</pre>
@@ -177,7 +177,24 @@ public ResourceSettingsServiceStub getStub() {
177177
* try (ResourceSettingsServiceClient resourceSettingsServiceClient =
178178
* ResourceSettingsServiceClient.create()) {
179179
* ResourceName parent =
180-
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
180+
* new ResourceName() {
181+
* {@literal @}Override
182+
* public Map<String, String> getFieldValuesMap() {
183+
* Map<String, String> fieldValuesMap = new HashMap<>();
184+
* fieldValuesMap.put("parent", "organizations/organization-8287");
185+
* return fieldValuesMap;
186+
* }
187+
*
188+
* {@literal @}Override
189+
* public String getFieldValue(String fieldName) {
190+
* return getFieldValuesMap().get(fieldName);
191+
* }
192+
*
193+
* {@literal @}Override
194+
* public String toString() {
195+
* return "organizations/organization-8287";
196+
* }
197+
* };
181198
* for (Setting element : resourceSettingsServiceClient.listSettings(parent).iterateAll()) {
182199
* // doThingsWith(element);
183200
* }
@@ -252,9 +269,7 @@ public final ListSettingsPagedResponse listSettings(String parent) {
252269
* ResourceSettingsServiceClient.create()) {
253270
* ListSettingsRequest request =
254271
* ListSettingsRequest.newBuilder()
255-
* .setParent(
256-
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
257-
* .toString())
272+
* .setParent("ListSettingsRequest-286838706".toString())
258273
* .setPageSize(883849137)
259274
* .setPageToken("pageToken873572522")
260275
* .setView(SettingView.forNumber(0))
@@ -285,9 +300,7 @@ public final ListSettingsPagedResponse listSettings(ListSettingsRequest request)
285300
* ResourceSettingsServiceClient.create()) {
286301
* ListSettingsRequest request =
287302
* ListSettingsRequest.newBuilder()
288-
* .setParent(
289-
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
290-
* .toString())
303+
* .setParent("ListSettingsRequest-286838706".toString())
291304
* .setPageSize(883849137)
292305
* .setPageToken("pageToken873572522")
293306
* .setView(SettingView.forNumber(0))
@@ -319,17 +332,15 @@ public final ListSettingsPagedResponse listSettings(ListSettingsRequest request)
319332
* ResourceSettingsServiceClient.create()) {
320333
* ListSettingsRequest request =
321334
* ListSettingsRequest.newBuilder()
322-
* .setParent(
323-
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
324-
* .toString())
335+
* .setParent("ListSettingsRequest-286838706".toString())
325336
* .setPageSize(883849137)
326337
* .setPageToken("pageToken873572522")
327338
* .setView(SettingView.forNumber(0))
328339
* .build();
329340
* while (true) {
330341
* ListSettingsResponse response =
331342
* resourceSettingsServiceClient.listSettingsCallable().call(request);
332-
* for (Setting element : response.getResponsesList()) {
343+
* for (Setting element : response.getSettingsList()) {
333344
* // doThingsWith(element);
334345
* }
335346
* String nextPageToken = response.getNextPageToken();
@@ -361,7 +372,7 @@ public final UnaryCallable<ListSettingsRequest, ListSettingsResponse> listSettin
361372
* try (ResourceSettingsServiceClient resourceSettingsServiceClient =
362373
* ResourceSettingsServiceClient.create()) {
363374
* SettingName name =
364-
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
375+
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");
365376
* Setting response = resourceSettingsServiceClient.getSetting(name);
366377
* }
367378
* }</pre>
@@ -423,7 +434,7 @@ public final Setting getSetting(String name) {
423434
* GetSettingRequest request =
424435
* GetSettingRequest.newBuilder()
425436
* .setName(
426-
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
437+
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
427438
* .toString())
428439
* .setView(SettingView.forNumber(0))
429440
* .build();
@@ -455,7 +466,7 @@ public final Setting getSetting(GetSettingRequest request) {
455466
* GetSettingRequest request =
456467
* GetSettingRequest.newBuilder()
457468
* .setName(
458-
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
469+
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
459470
* .toString())
460471
* .setView(SettingView.forNumber(0))
461472
* .build();

‎java-resource-settings/google-cloud-resource-settings/src/main/java/com/google/cloud/resourcesettings/v1/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* try (ResourceSettingsServiceClient resourceSettingsServiceClient =
4040
* ResourceSettingsServiceClient.create()) {
4141
* SettingName name =
42-
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
42+
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");
4343
* Setting response = resourceSettingsServiceClient.getSetting(name);
4444
* }
4545
* }</pre>

‎java-resource-settings/google-cloud-resource-settings/src/test/java/com/google/cloud/resourcesettings/v1/ResourceSettingsServiceClientTest.java‎

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
import io.grpc.StatusRuntimeException;
3232
import java.io.IOException;
3333
import java.util.Arrays;
34+
import java.util.HashMap;
3435
import java.util.List;
36+
import java.util.Map;
3537
import java.util.UUID;
3638
import javax.annotation.Generated;
3739
import org.junit.After;
@@ -91,7 +93,24 @@ public void listSettingsTest() throws Exception {
9193
mockResourceSettingsService.addResponse(expectedResponse);
9294

9395
ResourceName parent =
94-
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
96+
new ResourceName() {
97+
@Override
98+
public Map<String, String> getFieldValuesMap() {
99+
Map<String, String> fieldValuesMap = new HashMap<>();
100+
fieldValuesMap.put("parent", "organizations/organization-8287");
101+
return fieldValuesMap;
102+
}
103+
104+
@Override
105+
public String getFieldValue(String fieldName) {
106+
return getFieldValuesMap().get(fieldName);
107+
}
108+
109+
@Override
110+
public String toString() {
111+
return "organizations/organization-8287";
112+
}
113+
};
95114

96115
ListSettingsPagedResponse pagedListResponse = client.listSettings(parent);
97116

@@ -118,7 +137,24 @@ public void listSettingsExceptionTest() throws Exception {
118137

119138
try {
120139
ResourceName parent =
121-
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
140+
new ResourceName() {
141+
@Override
142+
public Map<String, String> getFieldValuesMap() {
143+
Map<String, String> fieldValuesMap = new HashMap<>();
144+
fieldValuesMap.put("parent", "organizations/organization-8287");
145+
return fieldValuesMap;
146+
}
147+
148+
@Override
149+
public String getFieldValue(String fieldName) {
150+
return getFieldValuesMap().get(fieldName);
151+
}
152+
153+
@Override
154+
public String toString() {
155+
return "organizations/organization-8287";
156+
}
157+
};
122158
client.listSettings(parent);
123159
Assert.fail("No exception raised");
124160
} catch (InvalidArgumentException e) {
@@ -175,7 +211,7 @@ public void getSettingTest() throws Exception {
175211
Setting expectedResponse =
176212
Setting.newBuilder()
177213
.setName(
178-
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
214+
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
179215
.toString())
180216
.setMetadata(SettingMetadata.newBuilder().build())
181217
.setLocalValue(Value.newBuilder().build())
@@ -185,7 +221,7 @@ public void getSettingTest() throws Exception {
185221
mockResourceSettingsService.addResponse(expectedResponse);
186222

187223
SettingName name =
188-
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
224+
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");
189225

190226
Setting actualResponse = client.getSetting(name);
191227
Assert.assertEquals(expectedResponse, actualResponse);
@@ -208,7 +244,7 @@ public void getSettingExceptionTest() throws Exception {
208244

209245
try {
210246
SettingName name =
211-
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
247+
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");
212248
client.getSetting(name);
213249
Assert.fail("No exception raised");
214250
} catch (InvalidArgumentException e) {
@@ -221,7 +257,7 @@ public void getSettingTest2() throws Exception {
221257
Setting expectedResponse =
222258
Setting.newBuilder()
223259
.setName(
224-
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
260+
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
225261
.toString())
226262
.setMetadata(SettingMetadata.newBuilder().build())
227263
.setLocalValue(Value.newBuilder().build())
@@ -265,7 +301,7 @@ public void updateSettingTest() throws Exception {
265301
Setting expectedResponse =
266302
Setting.newBuilder()
267303
.setName(
268-
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
304+
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
269305
.toString())
270306
.setMetadata(SettingMetadata.newBuilder().build())
271307
.setLocalValue(Value.newBuilder().build())

0 commit comments

Comments
 (0)