Skip to content
This repository was archived by the owner on Jul 17, 2023. It is now read-only.

fix(datastream): Change a few resource pattern variables from camelCase to snake_case #47

Merged
merged 2 commits into from
Sep 10, 2021
Merged

fix(datastream): Change a few resource pattern variables from camelCase to snake_case #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29b2ef8
fix(datastream)!: Change a few resource pattern variables from camelC…
gcf-owl-bot[bot] Aug 30, 2021
4a645c8
🦉 Updates from OwlBot
gcf-owl-bot[bot] Aug 30, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 56 additions & 56 deletions ...cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* <pre>{@code
* try (DatastreamClient datastreamClient = DatastreamClient.create()) {
* ConnectionProfileName name =
* ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]");
* ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]");
* ConnectionProfile response = datastreamClient.getConnectionProfile(name);
* }
* }</pre>
Expand Down
4 changes: 3 additions & 1 deletion ...tream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/DatastreamStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,9 @@ public static List<String> getDefaultServiceScopes() {

/** Returns a builder for the default credentials for this service. */
public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
return GoogleCredentialsProvider.newBuilder()
.setScopesToApply(DEFAULT_SERVICE_SCOPES)
.setUseJwtAccessWithScope(true);
}

/** Returns a builder for the default ChannelProvider for this service. */
Expand Down
62 changes: 31 additions & 31 deletions ...d-datastream/src/test/java/com/google/cloud/datastream/v1alpha1/DatastreamClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public void getConnectionProfileTest() throws Exception {
ConnectionProfile expectedResponse =
ConnectionProfile.newBuilder()
.setName(
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand All @@ -196,7 +196,7 @@ public void getConnectionProfileTest() throws Exception {
mockDatastream.addResponse(expectedResponse);

ConnectionProfileName name =
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]");
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]");

ConnectionProfile actualResponse = client.getConnectionProfile(name);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -220,7 +220,7 @@ public void getConnectionProfileExceptionTest() throws Exception {

try {
ConnectionProfileName name =
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]");
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]");
client.getConnectionProfile(name);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
Expand All @@ -233,7 +233,7 @@ public void getConnectionProfileTest2() throws Exception {
ConnectionProfile expectedResponse =
ConnectionProfile.newBuilder()
.setName(
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand Down Expand Up @@ -278,7 +278,7 @@ public void createConnectionProfileTest() throws Exception {
ConnectionProfile expectedResponse =
ConnectionProfile.newBuilder()
.setName(
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand Down Expand Up @@ -338,7 +338,7 @@ public void createConnectionProfileTest2() throws Exception {
ConnectionProfile expectedResponse =
ConnectionProfile.newBuilder()
.setName(
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand Down Expand Up @@ -398,7 +398,7 @@ public void updateConnectionProfileTest() throws Exception {
ConnectionProfile expectedResponse =
ConnectionProfile.newBuilder()
.setName(
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand Down Expand Up @@ -462,7 +462,7 @@ public void deleteConnectionProfileTest() throws Exception {
mockDatastream.addResponse(resultOperation);

ConnectionProfileName name =
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]");
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]");

client.deleteConnectionProfileAsync(name).get();

Expand All @@ -485,7 +485,7 @@ public void deleteConnectionProfileExceptionTest() throws Exception {

try {
ConnectionProfileName name =
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]");
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]");
client.deleteConnectionProfileAsync(name).get();
Assert.fail("No exception raised");
} catch (ExecutionException e) {
Expand Down Expand Up @@ -547,7 +547,7 @@ public void discoverConnectionProfileTest() throws Exception {
DiscoverConnectionProfileRequest request =
DiscoverConnectionProfileRequest.newBuilder()
.setParent(
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
.toString())
.build();

Expand Down Expand Up @@ -582,7 +582,7 @@ public void discoverConnectionProfileExceptionTest() throws Exception {
DiscoverConnectionProfileRequest request =
DiscoverConnectionProfileRequest.newBuilder()
.setParent(
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
.toString())
.build();
client.discoverConnectionProfile(request);
Expand Down Expand Up @@ -1171,7 +1171,7 @@ public void createPrivateConnectionTest() throws Exception {
PrivateConnection expectedResponse =
PrivateConnection.newBuilder()
.setName(
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand Down Expand Up @@ -1233,7 +1233,7 @@ public void createPrivateConnectionTest2() throws Exception {
PrivateConnection expectedResponse =
PrivateConnection.newBuilder()
.setName(
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand Down Expand Up @@ -1295,7 +1295,7 @@ public void getPrivateConnectionTest() throws Exception {
PrivateConnection expectedResponse =
PrivateConnection.newBuilder()
.setName(
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand All @@ -1307,7 +1307,7 @@ public void getPrivateConnectionTest() throws Exception {
mockDatastream.addResponse(expectedResponse);

PrivateConnectionName name =
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");

PrivateConnection actualResponse = client.getPrivateConnection(name);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -1331,7 +1331,7 @@ public void getPrivateConnectionExceptionTest() throws Exception {

try {
PrivateConnectionName name =
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");
client.getPrivateConnection(name);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
Expand All @@ -1344,7 +1344,7 @@ public void getPrivateConnectionTest2() throws Exception {
PrivateConnection expectedResponse =
PrivateConnection.newBuilder()
.setName(
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand Down Expand Up @@ -1488,7 +1488,7 @@ public void deletePrivateConnectionTest() throws Exception {
mockDatastream.addResponse(resultOperation);

PrivateConnectionName name =
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");

client.deletePrivateConnectionAsync(name).get();

Expand All @@ -1511,7 +1511,7 @@ public void deletePrivateConnectionExceptionTest() throws Exception {

try {
PrivateConnectionName name =
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");
client.deletePrivateConnectionAsync(name).get();
Assert.fail("No exception raised");
} catch (ExecutionException e) {
Expand Down Expand Up @@ -1569,7 +1569,7 @@ public void createRouteTest() throws Exception {
Route expectedResponse =
Route.newBuilder()
.setName(
RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand All @@ -1587,7 +1587,7 @@ public void createRouteTest() throws Exception {
mockDatastream.addResponse(resultOperation);

PrivateConnectionName parent =
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");
Route route = Route.newBuilder().build();
String routeId = "routeId1385647428";

Expand All @@ -1614,7 +1614,7 @@ public void createRouteExceptionTest() throws Exception {

try {
PrivateConnectionName parent =
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");
Route route = Route.newBuilder().build();
String routeId = "routeId1385647428";
client.createRouteAsync(parent, route, routeId).get();
Expand All @@ -1631,7 +1631,7 @@ public void createRouteTest2() throws Exception {
Route expectedResponse =
Route.newBuilder()
.setName(
RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand Down Expand Up @@ -1691,7 +1691,7 @@ public void getRouteTest() throws Exception {
Route expectedResponse =
Route.newBuilder()
.setName(
RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand All @@ -1702,7 +1702,7 @@ public void getRouteTest() throws Exception {
.build();
mockDatastream.addResponse(expectedResponse);

RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]");
RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]");

Route actualResponse = client.getRoute(name);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -1724,7 +1724,7 @@ public void getRouteExceptionTest() throws Exception {
mockDatastream.addException(exception);

try {
RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]");
RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]");
client.getRoute(name);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
Expand All @@ -1737,7 +1737,7 @@ public void getRouteTest2() throws Exception {
Route expectedResponse =
Route.newBuilder()
.setName(
RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
.toString())
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
Expand Down Expand Up @@ -1789,7 +1789,7 @@ public void listRoutesTest() throws Exception {
mockDatastream.addResponse(expectedResponse);

PrivateConnectionName parent =
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");

ListRoutesPagedResponse pagedListResponse = client.listRoutes(parent);

Expand All @@ -1816,7 +1816,7 @@ public void listRoutesExceptionTest() throws Exception {

try {
PrivateConnectionName parent =
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");
client.listRoutes(parent);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
Expand Down Expand Up @@ -1879,7 +1879,7 @@ public void deleteRouteTest() throws Exception {
.build();
mockDatastream.addResponse(resultOperation);

RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]");
RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]");

client.deleteRouteAsync(name).get();

Expand All @@ -1900,7 +1900,7 @@ public void deleteRouteExceptionTest() throws Exception {
mockDatastream.addException(exception);

try {
RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]");
RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]");
client.deleteRouteAsync(name).get();
Assert.fail("No exception raised");
} catch (ExecutionException e) {
Expand Down
Loading