diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java index edc3b6a265..b15b2de2a2 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java @@ -539,28 +539,35 @@ private static List createMethodVariants( .setVariableExpr(requestVarExpr) .setValueExpr(requestBuilderExpr) .build(); - List statements = Arrays.asList(ExprStatement.withExpr(requestAssignmentExpr)); - // Return expression. - MethodInvocationExpr returnExpr = + List statements = new ArrayList<>(); + statements.add(ExprStatement.withExpr(requestAssignmentExpr)); + + MethodInvocationExpr rpcInvocationExpr = MethodInvocationExpr.builder() .setMethodName(String.format(method.hasLro() ? "%sAsync" : "%s", methodName)) .setArguments(Arrays.asList(requestVarExpr.toBuilder().setIsDecl(false).build())) .setReturnType(methodOutputType) .build(); - javaMethods.add( + MethodDefinition.Builder methodVariantBuilder = MethodDefinition.builder() .setHeaderCommentStatements( ServiceClientCommentComposer.createRpcMethodHeaderComment(method, signature)) .setScope(ScopeNode.PUBLIC) .setIsFinal(true) - .setReturnType(methodOutputType) .setName(String.format(method.hasLro() ? "%sAsync" : "%s", methodName)) - .setArguments(arguments) - .setBody(statements) - .setReturnExpr(returnExpr) - .build()); + .setArguments(arguments); + + if (isProtoEmptyType(methodOutputType)) { + statements.add(ExprStatement.withExpr(rpcInvocationExpr)); + methodVariantBuilder = methodVariantBuilder.setReturnType(TypeNode.VOID); + } else { + methodVariantBuilder = + methodVariantBuilder.setReturnType(methodOutputType).setReturnExpr(rpcInvocationExpr); + } + methodVariantBuilder = methodVariantBuilder.setBody(statements); + javaMethods.add(methodVariantBuilder.build()); } return javaMethods; @@ -600,25 +607,34 @@ private static MethodDefinition createMethodDefaultMethod( callableMethodName = String.format(OPERATION_CALLABLE_NAME_PATTERN, methodName); } - MethodInvocationExpr methodReturnExpr = + MethodInvocationExpr callableMethodExpr = MethodInvocationExpr.builder().setMethodName(callableMethodName).build(); - methodReturnExpr = + callableMethodExpr = MethodInvocationExpr.builder() .setMethodName(method.hasLro() ? "futureCall" : "call") .setArguments(Arrays.asList(requestArgVarExpr.toBuilder().setIsDecl(false).build())) - .setExprReferenceExpr(methodReturnExpr) + .setExprReferenceExpr(callableMethodExpr) .setReturnType(methodOutputType) .build(); - return MethodDefinition.builder() - .setHeaderCommentStatements( - ServiceClientCommentComposer.createRpcMethodHeaderComment(method)) - .setScope(ScopeNode.PUBLIC) - .setIsFinal(true) - .setReturnType(methodOutputType) - .setName(String.format(method.hasLro() ? "%sAsync" : "%s", methodName)) - .setArguments(Arrays.asList(requestArgVarExpr)) - .setReturnExpr(methodReturnExpr) - .build(); + MethodDefinition.Builder methodBuilder = + MethodDefinition.builder() + .setHeaderCommentStatements( + ServiceClientCommentComposer.createRpcMethodHeaderComment(method)) + .setScope(ScopeNode.PUBLIC) + .setIsFinal(true) + .setName(String.format(method.hasLro() ? "%sAsync" : "%s", methodName)) + .setArguments(Arrays.asList(requestArgVarExpr)); + + if (isProtoEmptyType(methodOutputType)) { + methodBuilder = + methodBuilder + .setBody(Arrays.asList(ExprStatement.withExpr(callableMethodExpr))) + .setReturnType(TypeNode.VOID); + } else { + methodBuilder = + methodBuilder.setReturnExpr(callableMethodExpr).setReturnType(methodOutputType); + } + return methodBuilder.build(); } private static MethodDefinition createLroCallableMethod( @@ -1537,4 +1553,9 @@ private static String getCallableName(CallableMethodKind kind, String rawMethodN } return String.format(CALLABLE_NAME_PATTERN, rawMethodName); } + + private static boolean isProtoEmptyType(TypeNode type) { + return type.reference().pakkage().equals("com.google.protobuf") + && type.reference().name().equals("Empty"); + } } 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 9e9119032c..82ba668318 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 @@ -650,11 +650,17 @@ private static MethodDefinition createRpcTestMethod( .setReturnType(rpcJavaMethodInvocationExpr.type()) .build(); } - methodExprs.add( - AssignmentExpr.builder() - .setVariableExpr(actualResponseVarExpr.toBuilder().setIsDecl(true).build()) - .setValueExpr(rpcJavaMethodInvocationExpr) - .build()); + + boolean returnsVoid = isProtoEmptyType(methodOutputType); + if (returnsVoid) { + methodExprs.add(rpcJavaMethodInvocationExpr); + } else { + methodExprs.add( + AssignmentExpr.builder() + .setVariableExpr(actualResponseVarExpr.toBuilder().setIsDecl(true).build()) + .setValueExpr(rpcJavaMethodInvocationExpr) + .build()); + } if (method.isPaged()) { // Assign the resources variable. @@ -747,7 +753,7 @@ private static MethodDefinition createRpcTestMethod( .setMethodName("assertEquals") .setArguments(expectedPagedResponseExpr, actualPagedResponseExpr) .build()); - } else { + } else if (!returnsVoid) { methodExprs.add( MethodInvocationExpr.builder() .setStaticReferenceType(STATIC_TYPES.get("Assert")) @@ -1898,4 +1904,9 @@ private static String getServiceSettingsClassName(String serviceName) { private static String getMockServiceVarName(String serviceName) { return String.format(MOCK_SERVICE_VAR_NAME_PATTERN, serviceName); } + + private static boolean isProtoEmptyType(TypeNode type) { + return type.reference().pakkage().equals("com.google.protobuf") + && type.reference().name().equals("Empty"); + } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index 3ad7f2617d..41674ba1fa 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -257,12 +257,12 @@ public class IdentityClient implements BackgroundResource { * @param name * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteUser(UserName name) { + public final void deleteUser(UserName name) { DeleteUserRequest request = DeleteUserRequest.newBuilder() .setName(Objects.isNull(name) ? null : name.toString()) .build(); - return deleteUser(request); + deleteUser(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -272,9 +272,9 @@ public class IdentityClient implements BackgroundResource { * @param name * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteUser(String name) { + public final void deleteUser(String name) { DeleteUserRequest request = DeleteUserRequest.newBuilder().setName(name).build(); - return deleteUser(request); + deleteUser(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -284,8 +284,8 @@ public class IdentityClient implements BackgroundResource { * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteUser(DeleteUserRequest request) { - return deleteUserCallable().call(request); + public final void deleteUser(DeleteUserRequest request) { + deleteUserCallable().call(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. 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 044c5691fe..0329f4f7ef 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 @@ -81,8 +81,7 @@ public class LoggingServiceV2ClientTest { LogName logName = LogName.ofProjectLogName("[PROJECT]", "[LOG]"); - Empty actualResponse = client.deleteLog(logName); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteLog(logName); List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -116,8 +115,7 @@ public class LoggingServiceV2ClientTest { String logName = "log_name2013526694"; - Empty actualResponse = client.deleteLog(logName); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteLog(logName); List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); 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 0e03fd0e11..721a37df25 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 @@ -557,8 +557,7 @@ public class SubscriberClientTest { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); - Empty actualResponse = client.deleteSubscription(subscription); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteSubscription(subscription); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -592,8 +591,7 @@ public class SubscriberClientTest { String subscription = "subscription341203229"; - Empty actualResponse = client.deleteSubscription(subscription); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteSubscription(subscription); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -629,8 +627,7 @@ public class SubscriberClientTest { List ackIds = new ArrayList<>(); int ackDeadlineSeconds = 2135351438; - Empty actualResponse = client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -670,8 +667,7 @@ public class SubscriberClientTest { List ackIds = new ArrayList<>(); int ackDeadlineSeconds = 2135351438; - Empty actualResponse = client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -710,8 +706,7 @@ public class SubscriberClientTest { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); List ackIds = new ArrayList<>(); - Empty actualResponse = client.acknowledge(subscription, ackIds); - Assert.assertEquals(expectedResponse, actualResponse); + client.acknowledge(subscription, ackIds); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -748,8 +743,7 @@ public class SubscriberClientTest { String subscription = "subscription341203229"; List ackIds = new ArrayList<>(); - Empty actualResponse = client.acknowledge(subscription, ackIds); - Assert.assertEquals(expectedResponse, actualResponse); + client.acknowledge(subscription, ackIds); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -939,8 +933,7 @@ public class SubscriberClientTest { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); PushConfig pushConfig = PushConfig.newBuilder().build(); - Empty actualResponse = client.modifyPushConfig(subscription, pushConfig); - Assert.assertEquals(expectedResponse, actualResponse); + client.modifyPushConfig(subscription, pushConfig); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -977,8 +970,7 @@ public class SubscriberClientTest { String subscription = "subscription341203229"; PushConfig pushConfig = PushConfig.newBuilder().build(); - Empty actualResponse = client.modifyPushConfig(subscription, pushConfig); - Assert.assertEquals(expectedResponse, actualResponse); + client.modifyPushConfig(subscription, pushConfig); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -1397,8 +1389,7 @@ public class SubscriberClientTest { SnapshotName snapshot = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); - Empty actualResponse = client.deleteSnapshot(snapshot); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteSnapshot(snapshot); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -1432,8 +1423,7 @@ public class SubscriberClientTest { String snapshot = "snapshot284874180"; - Empty actualResponse = client.deleteSnapshot(snapshot); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteSnapshot(snapshot); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); 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 cae284d0c9..441300e8a4 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 @@ -212,8 +212,7 @@ public class TestingClientTest { DeleteSessionRequest request = DeleteSessionRequest.newBuilder().setName(SessionName.of("[SESSION]").toString()).build(); - Empty actualResponse = client.deleteSession(request); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteSession(request); List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -425,8 +424,7 @@ public class TestingClientTest { .setName(TestName.of("[SESSION]", "[SHARD_ID]", "[TEST_ID]").toString()) .build(); - Empty actualResponse = client.deleteTest(request); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteTest(request); List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index 77e8605e25..84ad956991 100644 --- a/test/integration/goldens/asset/AssetServiceClient.java +++ b/test/integration/goldens/asset/AssetServiceClient.java @@ -429,12 +429,12 @@ public final UnaryCallable updateFeedCallable() { * organizations/organization_number/feeds/feed_id * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteFeed(FeedName name) { + public final void deleteFeed(FeedName name) { DeleteFeedRequest request = DeleteFeedRequest.newBuilder() .setName(Objects.isNull(name) ? null : name.toString()) .build(); - return deleteFeed(request); + deleteFeed(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -448,9 +448,9 @@ public final Empty deleteFeed(FeedName name) { * organizations/organization_number/feeds/feed_id * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteFeed(String name) { + public final void deleteFeed(String name) { DeleteFeedRequest request = DeleteFeedRequest.newBuilder().setName(name).build(); - return deleteFeed(request); + deleteFeed(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -462,8 +462,8 @@ public final Empty deleteFeed(String name) { * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteFeed(DeleteFeedRequest request) { - return deleteFeedCallable().call(request); + public final void deleteFeed(DeleteFeedRequest request) { + deleteFeedCallable().call(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. diff --git a/test/integration/goldens/asset/AssetServiceClientTest.java b/test/integration/goldens/asset/AssetServiceClientTest.java index dfc1344534..f12688c9d7 100644 --- a/test/integration/goldens/asset/AssetServiceClientTest.java +++ b/test/integration/goldens/asset/AssetServiceClientTest.java @@ -414,8 +414,7 @@ public void deleteFeedTest() throws Exception { FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]"); - Empty actualResponse = client.deleteFeed(name); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteFeed(name); List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -449,8 +448,7 @@ public void deleteFeedTest2() throws Exception { String name = "name3373707"; - Empty actualResponse = client.deleteFeed(name); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteFeed(name); List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java index c023def3b1..3105199690 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -884,12 +884,12 @@ public final UnaryCallable updateSinkCallable() { *

Example: `"projects/my-project-id/sinks/my-sink-id"`. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteSink(LogSinkName sinkName) { + public final void deleteSink(LogSinkName sinkName) { DeleteSinkRequest request = DeleteSinkRequest.newBuilder() .setSinkName(Objects.isNull(sinkName) ? null : sinkName.toString()) .build(); - return deleteSink(request); + deleteSink(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -908,9 +908,9 @@ public final Empty deleteSink(LogSinkName sinkName) { *

Example: `"projects/my-project-id/sinks/my-sink-id"`. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteSink(String sinkName) { + public final void deleteSink(String sinkName) { DeleteSinkRequest request = DeleteSinkRequest.newBuilder().setSinkName(sinkName).build(); - return deleteSink(request); + deleteSink(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -923,8 +923,8 @@ public final Empty deleteSink(String sinkName) { * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteSink(DeleteSinkRequest request) { - return deleteSinkCallable().call(request); + public final void deleteSink(DeleteSinkRequest request) { + deleteSinkCallable().call(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -1374,12 +1374,12 @@ public final UnaryCallable updateExclusion *

Example: `"projects/my-project-id/exclusions/my-exclusion-id"`. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteExclusion(LogExclusionName name) { + public final void deleteExclusion(LogExclusionName name) { DeleteExclusionRequest request = DeleteExclusionRequest.newBuilder() .setName(Objects.isNull(name) ? null : name.toString()) .build(); - return deleteExclusion(request); + deleteExclusion(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -1396,9 +1396,9 @@ public final Empty deleteExclusion(LogExclusionName name) { *

Example: `"projects/my-project-id/exclusions/my-exclusion-id"`. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteExclusion(String name) { + public final void deleteExclusion(String name) { DeleteExclusionRequest request = DeleteExclusionRequest.newBuilder().setName(name).build(); - return deleteExclusion(request); + deleteExclusion(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -1410,8 +1410,8 @@ public final Empty deleteExclusion(String name) { * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteExclusion(DeleteExclusionRequest request) { - return deleteExclusionCallable().call(request); + public final void deleteExclusion(DeleteExclusionRequest request) { + deleteExclusionCallable().call(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. diff --git a/test/integration/goldens/logging/ConfigServiceV2ClientTest.java b/test/integration/goldens/logging/ConfigServiceV2ClientTest.java index 90207f524d..b129c373ac 100644 --- a/test/integration/goldens/logging/ConfigServiceV2ClientTest.java +++ b/test/integration/goldens/logging/ConfigServiceV2ClientTest.java @@ -1185,8 +1185,7 @@ public void deleteSinkTest() throws Exception { LogSinkName sinkName = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]"); - Empty actualResponse = client.deleteSink(sinkName); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteSink(sinkName); List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -1220,8 +1219,7 @@ public void deleteSinkTest2() throws Exception { String sinkName = "sink_name-1391757129"; - Empty actualResponse = client.deleteSink(sinkName); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteSink(sinkName); List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -1889,8 +1887,7 @@ public void deleteExclusionTest() throws Exception { LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]"); - Empty actualResponse = client.deleteExclusion(name); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteExclusion(name); List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -1924,8 +1921,7 @@ public void deleteExclusionTest2() throws Exception { String name = "name3373707"; - Empty actualResponse = client.deleteExclusion(name); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteExclusion(name); List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java index 4a45a9bd3f..1d9f1c3af9 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -163,12 +163,12 @@ public LoggingServiceV2Stub getStub() { * information about log names, see [LogEntry][google.logging.v2.LogEntry]. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteLog(LogName logName) { + public final void deleteLog(LogName logName) { DeleteLogRequest request = DeleteLogRequest.newBuilder() .setLogName(Objects.isNull(logName) ? null : logName.toString()) .build(); - return deleteLog(request); + deleteLog(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -187,9 +187,9 @@ public final Empty deleteLog(LogName logName) { * information about log names, see [LogEntry][google.logging.v2.LogEntry]. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteLog(String logName) { + public final void deleteLog(String logName) { DeleteLogRequest request = DeleteLogRequest.newBuilder().setLogName(logName).build(); - return deleteLog(request); + deleteLog(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -203,8 +203,8 @@ public final Empty deleteLog(String logName) { * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteLog(DeleteLogRequest request) { - return deleteLogCallable().call(request); + public final void deleteLog(DeleteLogRequest request) { + deleteLogCallable().call(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. diff --git a/test/integration/goldens/logging/LoggingServiceV2ClientTest.java b/test/integration/goldens/logging/LoggingServiceV2ClientTest.java index a3a8022c52..07dca33347 100644 --- a/test/integration/goldens/logging/LoggingServiceV2ClientTest.java +++ b/test/integration/goldens/logging/LoggingServiceV2ClientTest.java @@ -93,8 +93,7 @@ public void deleteLogTest() throws Exception { LogName logName = LogName.ofProjectLogName("[PROJECT]", "[LOG]"); - Empty actualResponse = client.deleteLog(logName); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteLog(logName); List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -128,8 +127,7 @@ public void deleteLogTest2() throws Exception { String logName = "log_name2013526694"; - Empty actualResponse = client.deleteLog(logName); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteLog(logName); List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java index 6cd33bb8c4..7723027b74 100644 --- a/test/integration/goldens/logging/MetricsServiceV2Client.java +++ b/test/integration/goldens/logging/MetricsServiceV2Client.java @@ -409,12 +409,12 @@ public final UnaryCallable updateLogMetricCal *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteLogMetric(LogMetricName metricName) { + public final void deleteLogMetric(LogMetricName metricName) { DeleteLogMetricRequest request = DeleteLogMetricRequest.newBuilder() .setMetricName(Objects.isNull(metricName) ? null : metricName.toString()) .build(); - return deleteLogMetric(request); + deleteLogMetric(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -427,10 +427,10 @@ public final Empty deleteLogMetric(LogMetricName metricName) { *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteLogMetric(String metricName) { + public final void deleteLogMetric(String metricName) { DeleteLogMetricRequest request = DeleteLogMetricRequest.newBuilder().setMetricName(metricName).build(); - return deleteLogMetric(request); + deleteLogMetric(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -442,8 +442,8 @@ public final Empty deleteLogMetric(String metricName) { * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Empty deleteLogMetric(DeleteLogMetricRequest request) { - return deleteLogMetricCallable().call(request); + public final void deleteLogMetric(DeleteLogMetricRequest request) { + deleteLogMetricCallable().call(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. diff --git a/test/integration/goldens/logging/MetricsServiceV2ClientTest.java b/test/integration/goldens/logging/MetricsServiceV2ClientTest.java index e4715490da..2d54ee79c9 100644 --- a/test/integration/goldens/logging/MetricsServiceV2ClientTest.java +++ b/test/integration/goldens/logging/MetricsServiceV2ClientTest.java @@ -459,8 +459,7 @@ public void deleteLogMetricTest() throws Exception { LogMetricName metricName = LogMetricName.of("[PROJECT]", "[METRIC]"); - Empty actualResponse = client.deleteLogMetric(metricName); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteLogMetric(metricName); List actualRequests = mockMetricsServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -494,8 +493,7 @@ public void deleteLogMetricTest2() throws Exception { String metricName = "metric_name-1737602118"; - Empty actualResponse = client.deleteLogMetric(metricName); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteLogMetric(metricName); List actualRequests = mockMetricsServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); diff --git a/test/integration/goldens/redis/CloudRedisClientTest.java b/test/integration/goldens/redis/CloudRedisClientTest.java index 277155a0c6..47640c187d 100644 --- a/test/integration/goldens/redis/CloudRedisClientTest.java +++ b/test/integration/goldens/redis/CloudRedisClientTest.java @@ -879,8 +879,7 @@ public void deleteInstanceTest() throws Exception { InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]"); - Empty actualResponse = client.deleteInstanceAsync(name).get(); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteInstanceAsync(name).get(); List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); @@ -922,8 +921,7 @@ public void deleteInstanceTest2() throws Exception { String name = "name3373707"; - Empty actualResponse = client.deleteInstanceAsync(name).get(); - Assert.assertEquals(expectedResponse, actualResponse); + client.deleteInstanceAsync(name).get(); List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size());