From 8bc63f4e5645dc626e502c3a5d2546dfd0286d61 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Wed, 2 Dec 2020 13:27:08 -0800 Subject: [PATCH 1/3] fix: fix dep ordering in Bazel dedupe rules --- rules_java_gapic/java_gapic.bzl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rules_java_gapic/java_gapic.bzl b/rules_java_gapic/java_gapic.bzl index 96e482907c..d265f8c676 100644 --- a/rules_java_gapic/java_gapic.bzl +++ b/rules_java_gapic/java_gapic.bzl @@ -189,7 +189,7 @@ def java_gapic_library( ) # General additional deps. - actual_deps = resource_name_deps + [ + actual_deps = deps + resource_name_deps + [ "@com_google_googleapis//google/rpc:rpc_java_proto", "@com_google_googleapis//google/longrunning:longrunning_java_proto", "@com_google_protobuf//:protobuf_java", @@ -207,7 +207,6 @@ def java_gapic_library( "@com_google_http_client_google_http_client//jar", "@javax_annotation_javax_annotation_api//jar", ] - _append_dep_without_duplicates(actual_deps, deps) native.java_library( name = name, From f71562e2af06f807c87786e03796d8c3a012f33d Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Fri, 4 Dec 2020 00:22:20 -0800 Subject: [PATCH 2/3] fix: use lowerCamelCase for string types in DefaultValueComposer --- .../gapic/composer/DefaultValueComposer.java | 4 +- .../composer/DefaultValueComposerTest.java | 10 +- .../composer/goldens/EchoClientTest.golden | 6 +- .../composer/goldens/LoggingClientTest.golden | 16 +- .../goldens/SubscriberClientTest.golden | 4 +- .../composer/goldens/TestingClientTest.golden | 8 +- .../library/LibraryServiceClientTest.java | 20 +- .../goldens/logging/ConfigClientTest.java | 46 ++-- .../goldens/logging/LoggingClientTest.java | 16 +- .../goldens/logging/MetricsClientTest.java | 24 +- .../goldens/redis/CloudRedisClientTest.java | 214 +++++++++--------- 11 files changed, 189 insertions(+), 179 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java b/src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java index a8d89f3932..fdab242aa1 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java @@ -123,8 +123,10 @@ static Expr createDefaultValue(Field f, boolean useExplicitInitTypeInGenerics) { } if (f.type().equals(TypeNode.STRING)) { + String javaFieldName = JavaStyle.toLowerCamelCase(f.name()); return ValueExpr.withValue( - StringObjectValue.withValue(String.format("%s%s", f.name(), f.name().hashCode()))); + StringObjectValue.withValue( + String.format("%s%s", javaFieldName, javaFieldName.hashCode()))); } if (TypeNode.isNumericType(f.type())) { diff --git a/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java index 5893f2f17f..5b2dc78522 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java @@ -106,6 +106,14 @@ public void defaultValue_stringField() { Expr expr = DefaultValueComposer.createDefaultValue(field); expr.accept(writerVisitor); assertEquals("\"foobar-1268878963\"", writerVisitor.write()); + + writerVisitor.clear(); + + // Original name is very clearly in lower_camel_case. + field = Field.builder().setName("foo_bar_baz").setType(TypeNode.STRING).build(); + expr = DefaultValueComposer.createDefaultValue(field); + expr.accept(writerVisitor); + assertEquals("\"fooBarBaz-2082080914\"", writerVisitor.write()); } @Test @@ -281,7 +289,7 @@ public void createSimpleMessage_containsRepeatedField() { expr.accept(writerVisitor); assertEquals( "PagedExpandResponse.newBuilder().addAllResponses(new ArrayList())" - + ".setNextPageToken(\"next_page_token-1530815211\").build()", + + ".setNextPageToken(\"nextPageToken-1386094857\").build()", writerVisitor.write()); } diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClientTest.golden index 4bf64b3348..85c18fddf6 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClientTest.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClientTest.golden @@ -584,7 +584,7 @@ public class EchoClientTest { PagedExpandRequest.newBuilder() .setContent("content951530617") .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); PagedExpandPagedResponse pagedListResponse = client.pagedExpand(request); @@ -617,7 +617,7 @@ public class EchoClientTest { PagedExpandRequest.newBuilder() .setContent("content951530617") .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); client.pagedExpand(request); Assert.fail("No exception raised"); @@ -663,7 +663,7 @@ public class EchoClientTest { PagedExpandRequest.newBuilder() .setContent("content951530617") .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); client.simplePagedExpand(request); Assert.fail("No exception raised"); diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/LoggingClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/LoggingClientTest.golden index 0329f4f7ef..0432c8afca 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/LoggingClientTest.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/LoggingClientTest.golden @@ -113,7 +113,7 @@ public class LoggingServiceV2ClientTest { Empty expectedResponse = Empty.newBuilder().build(); mockLoggingServiceV2.addResponse(expectedResponse); - String logName = "log_name2013526694"; + String logName = "logName341528559"; client.deleteLog(logName); @@ -134,7 +134,7 @@ public class LoggingServiceV2ClientTest { mockLoggingServiceV2.addException(exception); try { - String logName = "log_name2013526694"; + String logName = "logName341528559"; client.deleteLog(logName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -192,7 +192,7 @@ public class LoggingServiceV2ClientTest { WriteLogEntriesResponse expectedResponse = WriteLogEntriesResponse.newBuilder().build(); mockLoggingServiceV2.addResponse(expectedResponse); - String logName = "log_name2013526694"; + String logName = "logName341528559"; MonitoredResource resource = MonitoredResource.newBuilder().build(); Map labels = new HashMap<>(); List entries = new ArrayList<>(); @@ -221,7 +221,7 @@ public class LoggingServiceV2ClientTest { mockLoggingServiceV2.addException(exception); try { - String logName = "log_name2013526694"; + String logName = "logName341528559"; MonitoredResource resource = MonitoredResource.newBuilder().build(); Map labels = new HashMap<>(); List entries = new ArrayList<>(); @@ -244,7 +244,7 @@ public class LoggingServiceV2ClientTest { List resourceNames = new ArrayList<>(); String filter = "filter-1274492040"; - String orderBy = "order_by1234304744"; + String orderBy = "orderBy-1207110587"; ListLogEntriesPagedResponse pagedListResponse = client.listLogEntries(resourceNames, filter, orderBy); @@ -275,7 +275,7 @@ public class LoggingServiceV2ClientTest { try { List resourceNames = new ArrayList<>(); String filter = "filter-1274492040"; - String orderBy = "order_by1234304744"; + String orderBy = "orderBy-1207110587"; client.listLogEntries(resourceNames, filter, orderBy); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -296,7 +296,7 @@ public class LoggingServiceV2ClientTest { ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest.newBuilder() .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); ListMonitoredResourceDescriptorsPagedResponse pagedListResponse = @@ -330,7 +330,7 @@ public class LoggingServiceV2ClientTest { ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest.newBuilder() .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); client.listMonitoredResourceDescriptors(request); Assert.fail("No exception raised"); diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/SubscriberClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/SubscriberClientTest.golden index 681fac4faa..6871486078 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/SubscriberClientTest.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/SubscriberClientTest.golden @@ -870,7 +870,7 @@ public class SubscriberClientTest { .addAllModifyDeadlineSeconds(new ArrayList()) .addAllModifyDeadlineAckIds(new ArrayList()) .setStreamAckDeadlineSeconds(1875467245) - .setClientId("client_id-1904089585") + .setClientId("clientId908408390") .setMaxOutstandingMessages(-1315266996) .setMaxOutstandingBytes(-2103098517) .build(); @@ -901,7 +901,7 @@ public class SubscriberClientTest { .addAllModifyDeadlineSeconds(new ArrayList()) .addAllModifyDeadlineAckIds(new ArrayList()) .setStreamAckDeadlineSeconds(1875467245) - .setClientId("client_id-1904089585") + .setClientId("clientId908408390") .setMaxOutstandingMessages(-1315266996) .setMaxOutstandingBytes(-2103098517) .build(); diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/TestingClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/TestingClientTest.golden index 441300e8a4..bf955ecc31 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/TestingClientTest.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/TestingClientTest.golden @@ -164,7 +164,7 @@ public class TestingClientTest { ListSessionsRequest request = ListSessionsRequest.newBuilder() .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); ListSessionsPagedResponse pagedListResponse = client.listSessions(request); @@ -195,7 +195,7 @@ public class TestingClientTest { ListSessionsRequest request = ListSessionsRequest.newBuilder() .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); client.listSessions(request); Assert.fail("No exception raised"); @@ -371,7 +371,7 @@ public class TestingClientTest { ListTestsRequest.newBuilder() .setParent(SessionName.of("[SESSION]").toString()) .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); ListTestsPagedResponse pagedListResponse = client.listTests(request); @@ -405,7 +405,7 @@ public class TestingClientTest { ListTestsRequest.newBuilder() .setParent(SessionName.of("[SESSION]").toString()) .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); client.listTests(request); Assert.fail("No exception raised"); diff --git a/test/integration/goldens/library/LibraryServiceClientTest.java b/test/integration/goldens/library/LibraryServiceClientTest.java index 90a1de03c6..dab4fb6398 100644 --- a/test/integration/goldens/library/LibraryServiceClientTest.java +++ b/test/integration/goldens/library/LibraryServiceClientTest.java @@ -227,7 +227,7 @@ public void listShelvesTest() throws Exception { ListShelvesRequest request = ListShelvesRequest.newBuilder() .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); ListShelvesPagedResponse pagedListResponse = client.listShelves(request); @@ -258,7 +258,7 @@ public void listShelvesExceptionTest() throws Exception { ListShelvesRequest request = ListShelvesRequest.newBuilder() .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); client.listShelves(request); Assert.fail("No exception raised"); @@ -387,7 +387,7 @@ public void mergeShelvesTest2() throws Exception { mockLibraryService.addResponse(expectedResponse); ShelfName name = ShelfName.of("[SHELF_ID]"); - String otherShelfName = "other_shelf_name145746959"; + String otherShelfName = "otherShelfName-1942963547"; Shelf actualResponse = client.mergeShelves(name, otherShelfName); Assert.assertEquals(expectedResponse, actualResponse); @@ -411,7 +411,7 @@ public void mergeShelvesExceptionTest2() throws Exception { try { ShelfName name = ShelfName.of("[SHELF_ID]"); - String otherShelfName = "other_shelf_name145746959"; + String otherShelfName = "otherShelfName-1942963547"; client.mergeShelves(name, otherShelfName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -471,7 +471,7 @@ public void mergeShelvesTest4() throws Exception { mockLibraryService.addResponse(expectedResponse); String name = "name3373707"; - String otherShelfName = "other_shelf_name145746959"; + String otherShelfName = "otherShelfName-1942963547"; Shelf actualResponse = client.mergeShelves(name, otherShelfName); Assert.assertEquals(expectedResponse, actualResponse); @@ -495,7 +495,7 @@ public void mergeShelvesExceptionTest4() throws Exception { try { String name = "name3373707"; - String otherShelfName = "other_shelf_name145746959"; + String otherShelfName = "otherShelfName-1942963547"; client.mergeShelves(name, otherShelfName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -892,7 +892,7 @@ public void moveBookTest2() throws Exception { mockLibraryService.addResponse(expectedResponse); BookName name = BookName.of("[SHELF_ID]", "[BOOK_ID]"); - String otherShelfName = "other_shelf_name145746959"; + String otherShelfName = "otherShelfName-1942963547"; Book actualResponse = client.moveBook(name, otherShelfName); Assert.assertEquals(expectedResponse, actualResponse); @@ -916,7 +916,7 @@ public void moveBookExceptionTest2() throws Exception { try { BookName name = BookName.of("[SHELF_ID]", "[BOOK_ID]"); - String otherShelfName = "other_shelf_name145746959"; + String otherShelfName = "otherShelfName-1942963547"; client.moveBook(name, otherShelfName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -980,7 +980,7 @@ public void moveBookTest4() throws Exception { mockLibraryService.addResponse(expectedResponse); String name = "name3373707"; - String otherShelfName = "other_shelf_name145746959"; + String otherShelfName = "otherShelfName-1942963547"; Book actualResponse = client.moveBook(name, otherShelfName); Assert.assertEquals(expectedResponse, actualResponse); @@ -1004,7 +1004,7 @@ public void moveBookExceptionTest4() throws Exception { try { String name = "name3373707"; - String otherShelfName = "other_shelf_name145746959"; + String otherShelfName = "otherShelfName-1942963547"; client.moveBook(name, otherShelfName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { diff --git a/test/integration/goldens/logging/ConfigClientTest.java b/test/integration/goldens/logging/ConfigClientTest.java index 27e6089686..1fbb5e36ba 100644 --- a/test/integration/goldens/logging/ConfigClientTest.java +++ b/test/integration/goldens/logging/ConfigClientTest.java @@ -682,7 +682,7 @@ public void getSinkTest() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -728,14 +728,14 @@ public void getSinkTest2() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .build(); mockConfigServiceV2.addResponse(expectedResponse); - String sinkName = "sink_name-1391757129"; + String sinkName = "sinkName508775358"; LogSink actualResponse = client.getSink(sinkName); Assert.assertEquals(expectedResponse, actualResponse); @@ -757,7 +757,7 @@ public void getSinkExceptionTest2() throws Exception { mockConfigServiceV2.addException(exception); try { - String sinkName = "sink_name-1391757129"; + String sinkName = "sinkName508775358"; client.getSink(sinkName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -774,7 +774,7 @@ public void createSinkTest() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -823,7 +823,7 @@ public void createSinkTest2() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -872,7 +872,7 @@ public void createSinkTest3() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -921,7 +921,7 @@ public void createSinkTest4() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -970,7 +970,7 @@ public void createSinkTest5() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1019,7 +1019,7 @@ public void updateSinkTest() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1068,14 +1068,14 @@ public void updateSinkTest2() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .build(); mockConfigServiceV2.addResponse(expectedResponse); - String sinkName = "sink_name-1391757129"; + String sinkName = "sinkName508775358"; LogSink sink = LogSink.newBuilder().build(); LogSink actualResponse = client.updateSink(sinkName, sink); @@ -1099,7 +1099,7 @@ public void updateSinkExceptionTest2() throws Exception { mockConfigServiceV2.addException(exception); try { - String sinkName = "sink_name-1391757129"; + String sinkName = "sinkName508775358"; LogSink sink = LogSink.newBuilder().build(); client.updateSink(sinkName, sink); Assert.fail("No exception raised"); @@ -1117,7 +1117,7 @@ public void updateSinkTest3() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1169,14 +1169,14 @@ public void updateSinkTest4() throws Exception { .setFilter("filter-1274492040") .setDescription("description-1724546052") .setDisabled(true) - .setWriterIdentity("writer_identity775638794") + .setWriterIdentity("writerIdentity925193809") .setIncludeChildren(true) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .build(); mockConfigServiceV2.addResponse(expectedResponse); - String sinkName = "sink_name-1391757129"; + String sinkName = "sinkName508775358"; LogSink sink = LogSink.newBuilder().build(); FieldMask updateMask = FieldMask.newBuilder().build(); @@ -1202,7 +1202,7 @@ public void updateSinkExceptionTest4() throws Exception { mockConfigServiceV2.addException(exception); try { - String sinkName = "sink_name-1391757129"; + String sinkName = "sinkName508775358"; LogSink sink = LogSink.newBuilder().build(); FieldMask updateMask = FieldMask.newBuilder().build(); client.updateSink(sinkName, sink, updateMask); @@ -1251,7 +1251,7 @@ public void deleteSinkTest2() throws Exception { Empty expectedResponse = Empty.newBuilder().build(); mockConfigServiceV2.addResponse(expectedResponse); - String sinkName = "sink_name-1391757129"; + String sinkName = "sinkName508775358"; client.deleteSink(sinkName); @@ -1272,7 +1272,7 @@ public void deleteSinkExceptionTest2() throws Exception { mockConfigServiceV2.addException(exception); try { - String sinkName = "sink_name-1391757129"; + String sinkName = "sinkName508775358"; client.deleteSink(sinkName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -1987,8 +1987,8 @@ public void getCmekSettingsTest() throws Exception { CmekSettings expectedResponse = CmekSettings.newBuilder() .setName(CmekSettingsName.ofProjectName("[PROJECT]").toString()) - .setKmsKeyName("kms_key_name2094986649") - .setServiceAccountId("service_account_id-111486921") + .setKmsKeyName("kmsKeyName412586233") + .setServiceAccountId("serviceAccountId1964232947") .build(); mockConfigServiceV2.addResponse(expectedResponse); @@ -2033,8 +2033,8 @@ public void updateCmekSettingsTest() throws Exception { CmekSettings expectedResponse = CmekSettings.newBuilder() .setName(CmekSettingsName.ofProjectName("[PROJECT]").toString()) - .setKmsKeyName("kms_key_name2094986649") - .setServiceAccountId("service_account_id-111486921") + .setKmsKeyName("kmsKeyName412586233") + .setServiceAccountId("serviceAccountId1964232947") .build(); mockConfigServiceV2.addResponse(expectedResponse); diff --git a/test/integration/goldens/logging/LoggingClientTest.java b/test/integration/goldens/logging/LoggingClientTest.java index 77eea27ee7..0bcc1d8353 100644 --- a/test/integration/goldens/logging/LoggingClientTest.java +++ b/test/integration/goldens/logging/LoggingClientTest.java @@ -140,7 +140,7 @@ public void deleteLogTest2() throws Exception { Empty expectedResponse = Empty.newBuilder().build(); mockLoggingServiceV2.addResponse(expectedResponse); - String logName = "log_name2013526694"; + String logName = "logName341528559"; client.deleteLog(logName); @@ -161,7 +161,7 @@ public void deleteLogExceptionTest2() throws Exception { mockLoggingServiceV2.addException(exception); try { - String logName = "log_name2013526694"; + String logName = "logName341528559"; client.deleteLog(logName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -219,7 +219,7 @@ public void writeLogEntriesTest2() throws Exception { WriteLogEntriesResponse expectedResponse = WriteLogEntriesResponse.newBuilder().build(); mockLoggingServiceV2.addResponse(expectedResponse); - String logName = "log_name2013526694"; + String logName = "logName341528559"; MonitoredResource resource = MonitoredResource.newBuilder().build(); Map labels = new HashMap<>(); List entries = new ArrayList<>(); @@ -248,7 +248,7 @@ public void writeLogEntriesExceptionTest2() throws Exception { mockLoggingServiceV2.addException(exception); try { - String logName = "log_name2013526694"; + String logName = "logName341528559"; MonitoredResource resource = MonitoredResource.newBuilder().build(); Map labels = new HashMap<>(); List entries = new ArrayList<>(); @@ -271,7 +271,7 @@ public void listLogEntriesTest() throws Exception { List resourceNames = new ArrayList<>(); String filter = "filter-1274492040"; - String orderBy = "order_by1234304744"; + String orderBy = "orderBy-1207110587"; ListLogEntriesPagedResponse pagedListResponse = client.listLogEntries(resourceNames, filter, orderBy); @@ -302,7 +302,7 @@ public void listLogEntriesExceptionTest() throws Exception { try { List resourceNames = new ArrayList<>(); String filter = "filter-1274492040"; - String orderBy = "order_by1234304744"; + String orderBy = "orderBy-1207110587"; client.listLogEntries(resourceNames, filter, orderBy); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -323,7 +323,7 @@ public void listMonitoredResourceDescriptorsTest() throws Exception { ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest.newBuilder() .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); ListMonitoredResourceDescriptorsPagedResponse pagedListResponse = @@ -357,7 +357,7 @@ public void listMonitoredResourceDescriptorsExceptionTest() throws Exception { ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest.newBuilder() .setPageSize(883849137) - .setPageToken("page_token1630607433") + .setPageToken("pageToken873572522") .build(); client.listMonitoredResourceDescriptors(request); Assert.fail("No exception raised"); diff --git a/test/integration/goldens/logging/MetricsClientTest.java b/test/integration/goldens/logging/MetricsClientTest.java index 83d7fdc003..e6a0289905 100644 --- a/test/integration/goldens/logging/MetricsClientTest.java +++ b/test/integration/goldens/logging/MetricsClientTest.java @@ -187,7 +187,7 @@ public void getLogMetricTest() throws Exception { .setDescription("description-1724546052") .setFilter("filter-1274492040") .setMetricDescriptor(MetricDescriptor.newBuilder().build()) - .setValueExtractor("value_extractor2047672534") + .setValueExtractor("valueExtractor-1867420749") .putAllLabelExtractors(new HashMap()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -232,14 +232,14 @@ public void getLogMetricTest2() throws Exception { .setDescription("description-1724546052") .setFilter("filter-1274492040") .setMetricDescriptor(MetricDescriptor.newBuilder().build()) - .setValueExtractor("value_extractor2047672534") + .setValueExtractor("valueExtractor-1867420749") .putAllLabelExtractors(new HashMap()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .build(); mockMetricsServiceV2.addResponse(expectedResponse); - String metricName = "metric_name-1737602118"; + String metricName = "metricName-610759589"; LogMetric actualResponse = client.getLogMetric(metricName); Assert.assertEquals(expectedResponse, actualResponse); @@ -261,7 +261,7 @@ public void getLogMetricExceptionTest2() throws Exception { mockMetricsServiceV2.addException(exception); try { - String metricName = "metric_name-1737602118"; + String metricName = "metricName-610759589"; client.getLogMetric(metricName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -277,7 +277,7 @@ public void createLogMetricTest() throws Exception { .setDescription("description-1724546052") .setFilter("filter-1274492040") .setMetricDescriptor(MetricDescriptor.newBuilder().build()) - .setValueExtractor("value_extractor2047672534") + .setValueExtractor("valueExtractor-1867420749") .putAllLabelExtractors(new HashMap()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -325,7 +325,7 @@ public void createLogMetricTest2() throws Exception { .setDescription("description-1724546052") .setFilter("filter-1274492040") .setMetricDescriptor(MetricDescriptor.newBuilder().build()) - .setValueExtractor("value_extractor2047672534") + .setValueExtractor("valueExtractor-1867420749") .putAllLabelExtractors(new HashMap()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -373,7 +373,7 @@ public void updateLogMetricTest() throws Exception { .setDescription("description-1724546052") .setFilter("filter-1274492040") .setMetricDescriptor(MetricDescriptor.newBuilder().build()) - .setValueExtractor("value_extractor2047672534") + .setValueExtractor("valueExtractor-1867420749") .putAllLabelExtractors(new HashMap()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -421,14 +421,14 @@ public void updateLogMetricTest2() throws Exception { .setDescription("description-1724546052") .setFilter("filter-1274492040") .setMetricDescriptor(MetricDescriptor.newBuilder().build()) - .setValueExtractor("value_extractor2047672534") + .setValueExtractor("valueExtractor-1867420749") .putAllLabelExtractors(new HashMap()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .build(); mockMetricsServiceV2.addResponse(expectedResponse); - String metricName = "metric_name-1737602118"; + String metricName = "metricName-610759589"; LogMetric metric = LogMetric.newBuilder().build(); LogMetric actualResponse = client.updateLogMetric(metricName, metric); @@ -452,7 +452,7 @@ public void updateLogMetricExceptionTest2() throws Exception { mockMetricsServiceV2.addException(exception); try { - String metricName = "metric_name-1737602118"; + String metricName = "metricName-610759589"; LogMetric metric = LogMetric.newBuilder().build(); client.updateLogMetric(metricName, metric); Assert.fail("No exception raised"); @@ -500,7 +500,7 @@ public void deleteLogMetricTest2() throws Exception { Empty expectedResponse = Empty.newBuilder().build(); mockMetricsServiceV2.addResponse(expectedResponse); - String metricName = "metric_name-1737602118"; + String metricName = "metricName-610759589"; client.deleteLogMetric(metricName); @@ -521,7 +521,7 @@ public void deleteLogMetricExceptionTest2() throws Exception { mockMetricsServiceV2.addException(exception); try { - String metricName = "metric_name-1737602118"; + String metricName = "metricName-610759589"; client.deleteLogMetric(metricName); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { diff --git a/test/integration/goldens/redis/CloudRedisClientTest.java b/test/integration/goldens/redis/CloudRedisClientTest.java index 47640c187d..27908462f4 100644 --- a/test/integration/goldens/redis/CloudRedisClientTest.java +++ b/test/integration/goldens/redis/CloudRedisClientTest.java @@ -179,21 +179,21 @@ public void getInstanceTest() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); mockCloudRedis.addResponse(expectedResponse); @@ -232,21 +232,21 @@ public void getInstanceTest2() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); mockCloudRedis.addResponse(expectedResponse); @@ -285,21 +285,21 @@ public void createInstanceTest() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); Operation resultOperation = Operation.newBuilder() @@ -310,7 +310,7 @@ public void createInstanceTest() throws Exception { mockCloudRedis.addResponse(resultOperation); LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]"); - String instanceId = "instance_id-2101995259"; + String instanceId = "instanceId902024336"; Instance instance = Instance.newBuilder().build(); Instance actualResponse = client.createInstanceAsync(parent, instanceId, instance).get(); @@ -336,7 +336,7 @@ public void createInstanceExceptionTest() throws Exception { try { LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]"); - String instanceId = "instance_id-2101995259"; + String instanceId = "instanceId902024336"; Instance instance = Instance.newBuilder().build(); client.createInstanceAsync(parent, instanceId, instance).get(); Assert.fail("No exception raised"); @@ -352,21 +352,21 @@ public void createInstanceTest2() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); Operation resultOperation = Operation.newBuilder() @@ -377,7 +377,7 @@ public void createInstanceTest2() throws Exception { mockCloudRedis.addResponse(resultOperation); String parent = "parent-995424086"; - String instanceId = "instance_id-2101995259"; + String instanceId = "instanceId902024336"; Instance instance = Instance.newBuilder().build(); Instance actualResponse = client.createInstanceAsync(parent, instanceId, instance).get(); @@ -403,7 +403,7 @@ public void createInstanceExceptionTest2() throws Exception { try { String parent = "parent-995424086"; - String instanceId = "instance_id-2101995259"; + String instanceId = "instanceId902024336"; Instance instance = Instance.newBuilder().build(); client.createInstanceAsync(parent, instanceId, instance).get(); Assert.fail("No exception raised"); @@ -419,21 +419,21 @@ public void updateInstanceTest() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); Operation resultOperation = Operation.newBuilder() @@ -483,21 +483,21 @@ public void upgradeInstanceTest() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); Operation resultOperation = Operation.newBuilder() @@ -508,7 +508,7 @@ public void upgradeInstanceTest() throws Exception { mockCloudRedis.addResponse(resultOperation); InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]"); - String redisVersion = "redis_version-685310444"; + String redisVersion = "redisVersion-1972584739"; Instance actualResponse = client.upgradeInstanceAsync(name, redisVersion).get(); Assert.assertEquals(expectedResponse, actualResponse); @@ -532,7 +532,7 @@ public void upgradeInstanceExceptionTest() throws Exception { try { InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]"); - String redisVersion = "redis_version-685310444"; + String redisVersion = "redisVersion-1972584739"; client.upgradeInstanceAsync(name, redisVersion).get(); Assert.fail("No exception raised"); } catch (ExecutionException e) { @@ -547,21 +547,21 @@ public void upgradeInstanceTest2() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); Operation resultOperation = Operation.newBuilder() @@ -572,7 +572,7 @@ public void upgradeInstanceTest2() throws Exception { mockCloudRedis.addResponse(resultOperation); String name = "name3373707"; - String redisVersion = "redis_version-685310444"; + String redisVersion = "redisVersion-1972584739"; Instance actualResponse = client.upgradeInstanceAsync(name, redisVersion).get(); Assert.assertEquals(expectedResponse, actualResponse); @@ -596,7 +596,7 @@ public void upgradeInstanceExceptionTest2() throws Exception { try { String name = "name3373707"; - String redisVersion = "redis_version-685310444"; + String redisVersion = "redisVersion-1972584739"; client.upgradeInstanceAsync(name, redisVersion).get(); Assert.fail("No exception raised"); } catch (ExecutionException e) { @@ -611,21 +611,21 @@ public void importInstanceTest() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); Operation resultOperation = Operation.newBuilder() @@ -675,21 +675,21 @@ public void exportInstanceTest() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); Operation resultOperation = Operation.newBuilder() @@ -739,21 +739,21 @@ public void failoverInstanceTest() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); Operation resultOperation = Operation.newBuilder() @@ -805,21 +805,21 @@ public void failoverInstanceTest2() throws Exception { Instance expectedResponse = Instance.newBuilder() .setName(InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]").toString()) - .setDisplayName("display_name1615086568") + .setDisplayName("displayName1714148973") .putAllLabels(new HashMap()) - .setLocationId("location_id552319461") - .setAlternativeLocationId("alternative_location_id-718920621") - .setRedisVersion("redis_version-685310444") - .setReservedIpRange("reserved_ip_range-1082940580") + .setLocationId("locationId1541836720") + .setAlternativeLocationId("alternativeLocationId1787141949") + .setRedisVersion("redisVersion-1972584739") + .setReservedIpRange("reservedIpRange575015950") .setHost("host3208616") .setPort(3446913) - .setCurrentLocationId("current_location_id1312712735") + .setCurrentLocationId("currentLocationId-1808505335") .setCreateTime(Timestamp.newBuilder().build()) - .setStatusMessage("status_message-239442758") + .setStatusMessage("statusMessage-958704715") .putAllRedisConfigs(new HashMap()) .setMemorySizeGb(34199707) - .setAuthorizedNetwork("authorized_network-1733809270") - .setPersistenceIamIdentity("persistence_iam_identity1061944584") + .setAuthorizedNetwork("authorizedNetwork1515554835") + .setPersistenceIamIdentity("persistenceIamIdentity1464017428") .build(); Operation resultOperation = Operation.newBuilder() From 45140789252a905a85d522c599986858f6cefa68 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Fri, 4 Dec 2020 12:44:53 -0800 Subject: [PATCH 3/3] fix: handle clientStreamingCall in generated tests --- .../gapic/composer/ServiceClientTestClassComposer.java | 6 ++++-- .../generator/gapic/composer/goldens/EchoClientTest.golden | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java index eb630063a7..3395d67121 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java @@ -1089,7 +1089,8 @@ private static MethodDefinition createStreamingRpcTestMethod( .setName("requestObserver") .build()); List callableMethodArgs = new ArrayList<>(); - if (!method.stream().equals(Method.Stream.BIDI)) { + if (!method.stream().equals(Method.Stream.BIDI) + && !method.stream().equals(Method.Stream.CLIENT)) { callableMethodArgs.add(requestVarExpr); } callableMethodArgs.add(responseObserverVarExpr); @@ -1361,7 +1362,8 @@ private static List createStreamingRpcExceptionTestStatements( .build()); List callableMethodArgs = new ArrayList<>(); - if (!method.stream().equals(Method.Stream.BIDI)) { + if (!method.stream().equals(Method.Stream.BIDI) + && !method.stream().equals(Method.Stream.CLIENT)) { callableMethodArgs.add(requestVarExpr); } callableMethodArgs.add(responseObserverVarExpr); diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClientTest.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClientTest.golden index 85c18fddf6..216a007562 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClientTest.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClientTest.golden @@ -424,8 +424,7 @@ public class EchoClientTest { MockStreamObserver responseObserver = new MockStreamObserver<>(); ClientStreamingCallable callable = client.collectCallable(); - ApiStreamObserver requestObserver = - callable.clientStreamingCall(request, responseObserver); + ApiStreamObserver requestObserver = callable.clientStreamingCall(responseObserver); requestObserver.onNext(request); requestObserver.onCompleted(); @@ -449,8 +448,7 @@ public class EchoClientTest { MockStreamObserver responseObserver = new MockStreamObserver<>(); ClientStreamingCallable callable = client.collectCallable(); - ApiStreamObserver requestObserver = - callable.clientStreamingCall(request, responseObserver); + ApiStreamObserver requestObserver = callable.clientStreamingCall(responseObserver); requestObserver.onNext(request);