[ggj][engx] fix: add @Override to GrpcServiceStub *Callable() methods

src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java

@@ -934,6 +934,7 @@ private static List<MethodDefinition> createCallableGetterMethods(
         .map(
             e ->
                 MethodDefinition.builder()
+                    .setIsOverride(true)
                     .setScope(ScopeNode.PUBLIC)
                     .setReturnType(e.getValue().type())
                     .setName(e.getKey())

src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcEchoStub.golden

@@ -256,51 +256,63 @@ public class GrpcEchoStub extends EchoStub {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<EchoRequest, EchoResponse> echoCallable() {
     return echoCallable;
   }
 
+  @Override
   public ServerStreamingCallable<ExpandRequest, EchoResponse> expandCallable() {
     return expandCallable;
   }
 
+  @Override
   public ClientStreamingCallable<EchoRequest, EchoResponse> collectCallable() {
     return collectCallable;
   }
 
+  @Override
   public BidiStreamingCallable<EchoRequest, EchoResponse> chatCallable() {
     return chatCallable;
   }
 
+  @Override
   public BidiStreamingCallable<EchoRequest, EchoResponse> chatAgainCallable() {
     return chatAgainCallable;
   }
 
+  @Override
   public UnaryCallable<PagedExpandRequest, PagedExpandResponse> pagedExpandCallable() {
     return pagedExpandCallable;
   }
 
+  @Override
   public UnaryCallable<PagedExpandRequest, PagedExpandPagedResponse> pagedExpandPagedCallable() {
     return pagedExpandPagedCallable;
   }
 
+  @Override
   public UnaryCallable<PagedExpandRequest, PagedExpandResponse> simplePagedExpandCallable() {
     return simplePagedExpandCallable;
   }
 
+  @Override
   public UnaryCallable<PagedExpandRequest, SimplePagedExpandPagedResponse>
       simplePagedExpandPagedCallable() {
     return simplePagedExpandPagedCallable;
   }
 
+  @Override
   public UnaryCallable<WaitRequest, Operation> waitCallable() {
     return waitCallable;
   }
 
+  @Override
   public OperationCallable<WaitRequest, WaitResponse, WaitMetadata> waitOperationCallable() {
     return waitOperationCallable;
   }
 
+  @Override
   public UnaryCallable<BlockRequest, BlockResponse> blockCallable() {
     return blockCallable;
   }

src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcPublisherStub.golden

@@ -363,54 +363,66 @@ public class GrpcPublisherStub extends PublisherStub {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<Topic, Topic> createTopicCallable() {
     return createTopicCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateTopicRequest, Topic> updateTopicCallable() {
     return updateTopicCallable;
   }
 
+  @Override
   public UnaryCallable<PublishRequest, PublishResponse> publishCallable() {
     return publishCallable;
   }
 
+  @Override
   public UnaryCallable<GetTopicRequest, Topic> getTopicCallable() {
     return getTopicCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallable() {
     return listTopicsCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicsRequest, ListTopicsPagedResponse> listTopicsPagedCallable() {
     return listTopicsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse>
       listTopicSubscriptionsCallable() {
     return listTopicSubscriptionsCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicSubscriptionsRequest, ListTopicSubscriptionsPagedResponse>
       listTopicSubscriptionsPagedCallable() {
     return listTopicSubscriptionsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicSnapshotsRequest, ListTopicSnapshotsResponse>
       listTopicSnapshotsCallable() {
     return listTopicSnapshotsCallable;
   }
 
+  @Override
   public UnaryCallable<ListTopicSnapshotsRequest, ListTopicSnapshotsPagedResponse>
       listTopicSnapshotsPagedCallable() {
     return listTopicSnapshotsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteTopicRequest, Empty> deleteTopicCallable() {
     return deleteTopicCallable;
   }
 
+  @Override
   public UnaryCallable<DetachSubscriptionRequest, DetachSubscriptionResponse>
       detachSubscriptionCallable() {
     return detachSubscriptionCallable;

src/test/java/com/google/api/generator/gapic/composer/goldens/GrpcTestingStub.golden

@@ -324,46 +324,57 @@ public class GrpcTestingStub extends TestingStub {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<CreateSessionRequest, Session> createSessionCallable() {
     return createSessionCallable;
   }
 
+  @Override
   public UnaryCallable<GetSessionRequest, Session> getSessionCallable() {
     return getSessionCallable;
   }
 
+  @Override
   public UnaryCallable<ListSessionsRequest, ListSessionsResponse> listSessionsCallable() {
     return listSessionsCallable;
   }
 
+  @Override
   public UnaryCallable<ListSessionsRequest, ListSessionsPagedResponse> listSessionsPagedCallable() {
     return listSessionsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteSessionRequest, Empty> deleteSessionCallable() {
     return deleteSessionCallable;
   }
 
+  @Override
   public UnaryCallable<ReportSessionRequest, ReportSessionResponse> reportSessionCallable() {
     return reportSessionCallable;
   }
 
+  @Override
   public UnaryCallable<GetTestRequest, Test> getTestCallable() {
     return getTestCallable;
   }
 
+  @Override
   public UnaryCallable<ListTestsRequest, ListTestsResponse> listTestsCallable() {
     return listTestsCallable;
   }
 
+  @Override
   public UnaryCallable<ListTestsRequest, ListTestsPagedResponse> listTestsPagedCallable() {
     return listTestsPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteTestRequest, Empty> deleteTestCallable() {
     return deleteTestCallable;
   }
 
+  @Override
   public UnaryCallable<VerifyTestRequest, VerifyTestResponse> verifyTestCallable() {
     return verifyTestCallable;
   }

test/integration/goldens/asset/GrpcAssetServiceStub.java

@@ -385,55 +385,67 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<ExportAssetsRequest, Operation> exportAssetsCallable() {
     return exportAssetsCallable;
   }
 
+  @Override
   public OperationCallable<ExportAssetsRequest, ExportAssetsResponse, ExportAssetsRequest>
       exportAssetsOperationCallable() {
     return exportAssetsOperationCallable;
   }
 
+  @Override
   public UnaryCallable<BatchGetAssetsHistoryRequest, BatchGetAssetsHistoryResponse>
       batchGetAssetsHistoryCallable() {
     return batchGetAssetsHistoryCallable;
   }
 
+  @Override
   public UnaryCallable<CreateFeedRequest, Feed> createFeedCallable() {
     return createFeedCallable;
   }
 
+  @Override
   public UnaryCallable<GetFeedRequest, Feed> getFeedCallable() {
     return getFeedCallable;
   }
 
+  @Override
   public UnaryCallable<ListFeedsRequest, ListFeedsResponse> listFeedsCallable() {
     return listFeedsCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateFeedRequest, Feed> updateFeedCallable() {
     return updateFeedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteFeedRequest, Empty> deleteFeedCallable() {
     return deleteFeedCallable;
   }
 
+  @Override
   public UnaryCallable<SearchAllResourcesRequest, SearchAllResourcesResponse>
       searchAllResourcesCallable() {
     return searchAllResourcesCallable;
   }
 
+  @Override
   public UnaryCallable<SearchAllResourcesRequest, SearchAllResourcesPagedResponse>
       searchAllResourcesPagedCallable() {
     return searchAllResourcesPagedCallable;
   }
 
+  @Override
   public UnaryCallable<SearchAllIamPoliciesRequest, SearchAllIamPoliciesResponse>
       searchAllIamPoliciesCallable() {
     return searchAllIamPoliciesCallable;
   }
 
+  @Override
   public UnaryCallable<SearchAllIamPoliciesRequest, SearchAllIamPoliciesPagedResponse>
       searchAllIamPoliciesPagedCallable() {
     return searchAllIamPoliciesPagedCallable;

test/integration/goldens/credentials/GrpcIamCredentialsStub.java

@@ -216,19 +216,23 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<GenerateAccessTokenRequest, GenerateAccessTokenResponse>
       generateAccessTokenCallable() {
     return generateAccessTokenCallable;
   }
 
+  @Override
   public UnaryCallable<GenerateIdTokenRequest, GenerateIdTokenResponse> generateIdTokenCallable() {
     return generateIdTokenCallable;
   }
 
+  @Override
   public UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable() {
     return signBlobCallable;
   }
 
+  @Override
   public UnaryCallable<SignJwtRequest, SignJwtResponse> signJwtCallable() {
     return signJwtCallable;
   }

test/integration/goldens/library/GrpcLibraryServiceStub.java

@@ -383,54 +383,67 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
   public UnaryCallable<CreateShelfRequest, Shelf> createShelfCallable() {
     return createShelfCallable;
   }
 
+  @Override
   public UnaryCallable<GetShelfRequest, Shelf> getShelfCallable() {
     return getShelfCallable;
   }
 
+  @Override
   public UnaryCallable<ListShelvesRequest, ListShelvesResponse> listShelvesCallable() {
     return listShelvesCallable;
   }
 
+  @Override
   public UnaryCallable<ListShelvesRequest, ListShelvesPagedResponse> listShelvesPagedCallable() {
     return listShelvesPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteShelfRequest, Empty> deleteShelfCallable() {
     return deleteShelfCallable;
   }
 
+  @Override
   public UnaryCallable<MergeShelvesRequest, Shelf> mergeShelvesCallable() {
     return mergeShelvesCallable;
   }
 
+  @Override
   public UnaryCallable<CreateBookRequest, Book> createBookCallable() {
     return createBookCallable;
   }
 
+  @Override
   public UnaryCallable<GetBookRequest, Book> getBookCallable() {
     return getBookCallable;
   }
 
+  @Override
   public UnaryCallable<ListBooksRequest, ListBooksResponse> listBooksCallable() {
     return listBooksCallable;
   }
 
+  @Override
   public UnaryCallable<ListBooksRequest, ListBooksPagedResponse> listBooksPagedCallable() {
     return listBooksPagedCallable;
   }
 
+  @Override
   public UnaryCallable<DeleteBookRequest, Empty> deleteBookCallable() {
     return deleteBookCallable;
   }
 
+  @Override
   public UnaryCallable<UpdateBookRequest, Book> updateBookCallable() {
     return updateBookCallable;
   }
 
+  @Override
   public UnaryCallable<MoveBookRequest, Book> moveBookCallable() {
     return moveBookCallable;
   }