Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
chore: Integrate new gapic-generator-java and rules_gapic (#180)
Browse files Browse the repository at this point in the history 
- [ ] 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
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] authored Jun 13, 2022
1 parent b2d729c commit c35b696
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 23 deletions.
41 changes: 26 additions & 15 deletions ...ngs/src/main/java/com/google/cloud/resourcesettings/v1/ResourceSettingsServiceClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* try (ResourceSettingsServiceClient resourceSettingsServiceClient =
* ResourceSettingsServiceClient.create()) {
* SettingName name =
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");
* Setting response = resourceSettingsServiceClient.getSetting(name);
* }
* }</pre>
Expand Down Expand Up @@ -177,7 +177,24 @@ public ResourceSettingsServiceStub getStub() {
* try (ResourceSettingsServiceClient resourceSettingsServiceClient =
* ResourceSettingsServiceClient.create()) {
* ResourceName parent =
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
* new ResourceName() {
* {@literal @}Override
* public Map<String, String> getFieldValuesMap() {
* Map<String, String> fieldValuesMap = new HashMap<>();
* fieldValuesMap.put("parent", "organizations/organization-8287");
* return fieldValuesMap;
* }
*
* {@literal @}Override
* public String getFieldValue(String fieldName) {
* return getFieldValuesMap().get(fieldName);
* }
*
* {@literal @}Override
* public String toString() {
* return "organizations/organization-8287";
* }
* };
* for (Setting element : resourceSettingsServiceClient.listSettings(parent).iterateAll()) {
* // doThingsWith(element);
* }
Expand Down Expand Up @@ -252,9 +269,7 @@ public final ListSettingsPagedResponse listSettings(String parent) {
* ResourceSettingsServiceClient.create()) {
* ListSettingsRequest request =
* ListSettingsRequest.newBuilder()
* .setParent(
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
* .toString())
* .setParent("ListSettingsRequest-286838706".toString())
* .setPageSize(883849137)
* .setPageToken("pageToken873572522")
* .setView(SettingView.forNumber(0))
Expand Down Expand Up @@ -285,9 +300,7 @@ public final ListSettingsPagedResponse listSettings(ListSettingsRequest request)
* ResourceSettingsServiceClient.create()) {
* ListSettingsRequest request =
* ListSettingsRequest.newBuilder()
* .setParent(
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
* .toString())
* .setParent("ListSettingsRequest-286838706".toString())
* .setPageSize(883849137)
* .setPageToken("pageToken873572522")
* .setView(SettingView.forNumber(0))
Expand Down Expand Up @@ -319,17 +332,15 @@ public final ListSettingsPagedResponse listSettings(ListSettingsRequest request)
* ResourceSettingsServiceClient.create()) {
* ListSettingsRequest request =
* ListSettingsRequest.newBuilder()
* .setParent(
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
* .toString())
* .setParent("ListSettingsRequest-286838706".toString())
* .setPageSize(883849137)
* .setPageToken("pageToken873572522")
* .setView(SettingView.forNumber(0))
* .build();
* while (true) {
* ListSettingsResponse response =
* resourceSettingsServiceClient.listSettingsCallable().call(request);
* for (Setting element : response.getResponsesList()) {
* for (Setting element : response.getSettingsList()) {
* // doThingsWith(element);
* }
* String nextPageToken = response.getNextPageToken();
Expand Down Expand Up @@ -361,7 +372,7 @@ public final UnaryCallable<ListSettingsRequest, ListSettingsResponse> listSettin
* try (ResourceSettingsServiceClient resourceSettingsServiceClient =
* ResourceSettingsServiceClient.create()) {
* SettingName name =
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");
* Setting response = resourceSettingsServiceClient.getSetting(name);
* }
* }</pre>
Expand Down Expand Up @@ -423,7 +434,7 @@ public final Setting getSetting(String name) {
* GetSettingRequest request =
* GetSettingRequest.newBuilder()
* .setName(
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
* .toString())
* .setView(SettingView.forNumber(0))
* .build();
Expand Down Expand Up @@ -455,7 +466,7 @@ public final Setting getSetting(GetSettingRequest request) {
* GetSettingRequest request =
* GetSettingRequest.newBuilder()
* .setName(
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
* .toString())
* .setView(SettingView.forNumber(0))
* .build();
Expand Down
2 changes: 1 addition & 1 deletion ...ud-resource-settings/src/main/java/com/google/cloud/resourcesettings/v1/package-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* try (ResourceSettingsServiceClient resourceSettingsServiceClient =
* ResourceSettingsServiceClient.create()) {
* SettingName name =
* SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
* SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");
* Setting response = resourceSettingsServiceClient.getSetting(name);
* }
* }</pre>
Expand Down
50 changes: 43 additions & 7 deletions ...src/test/java/com/google/cloud/resourcesettings/v1/ResourceSettingsServiceClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
import io.grpc.StatusRuntimeException;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import javax.annotation.Generated;
import org.junit.After;
Expand Down Expand Up @@ -91,7 +93,24 @@ public void listSettingsTest() throws Exception {
mockResourceSettingsService.addResponse(expectedResponse);

ResourceName parent =
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
new ResourceName() {
@Override
public Map<String, String> getFieldValuesMap() {
Map<String, String> fieldValuesMap = new HashMap<>();
fieldValuesMap.put("parent", "organizations/organization-8287");
return fieldValuesMap;
}

@Override
public String getFieldValue(String fieldName) {
return getFieldValuesMap().get(fieldName);
}

@Override
public String toString() {
return "organizations/organization-8287";
}
};

ListSettingsPagedResponse pagedListResponse = client.listSettings(parent);

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

try {
ResourceName parent =
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
new ResourceName() {
@Override
public Map<String, String> getFieldValuesMap() {
Map<String, String> fieldValuesMap = new HashMap<>();
fieldValuesMap.put("parent", "organizations/organization-8287");
return fieldValuesMap;
}

@Override
public String getFieldValue(String fieldName) {
return getFieldValuesMap().get(fieldName);
}

@Override
public String toString() {
return "organizations/organization-8287";
}
};
client.listSettings(parent);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
Expand Down Expand Up @@ -175,7 +211,7 @@ public void getSettingTest() throws Exception {
Setting expectedResponse =
Setting.newBuilder()
.setName(
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
.toString())
.setMetadata(SettingMetadata.newBuilder().build())
.setLocalValue(Value.newBuilder().build())
Expand All @@ -185,7 +221,7 @@ public void getSettingTest() throws Exception {
mockResourceSettingsService.addResponse(expectedResponse);

SettingName name =
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");

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

try {
SettingName name =
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]");
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]");
client.getSetting(name);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
Expand All @@ -221,7 +257,7 @@ public void getSettingTest2() throws Exception {
Setting expectedResponse =
Setting.newBuilder()
.setName(
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
.toString())
.setMetadata(SettingMetadata.newBuilder().build())
.setLocalValue(Value.newBuilder().build())
Expand Down Expand Up @@ -265,7 +301,7 @@ public void updateSettingTest() throws Exception {
Setting expectedResponse =
Setting.newBuilder()
.setName(
SettingName.ofProjectNumberSettingNameName("[PROJECT_NUMBER]", "[SETTING_NAME]")
SettingName.ofOrganizationSettingNameName("[ORGANIZATION]", "[SETTING_NAME]")
.toString())
.setMetadata(SettingMetadata.newBuilder().build())
.setLocalValue(Value.newBuilder().build())
Expand Down

0 comments on commit c35b696

Please sign in to comment.