Skip to content

Commit 685ccfd

Browse files
committed
fix: add per-service api_version to gapic_metadata
1 parent 32b9995 commit 685ccfd

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

gapic-generator-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<clirr.skip>true</clirr.skip>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<!-- Should be in sync with repositories.bzl -->
17-
<googleapis.commit>44d6bef0ca6db8bba3fb324c8186e694bcc4829c</googleapis.commit>
17+
<googleapis.commit>9fcfbea0aa5b50fa22e190faceb073d74504172b</googleapis.commit>
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>
2020
</properties>

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,12 +1898,17 @@ private static void updateGapicMetadata(
18981898
serviceClientProtoBuilder.putRpcs(rpcName, methodList);
18991899
}
19001900

1901+
GapicMetadata.ServiceForTransport.Builder grpcServiceClient =
1902+
GapicMetadata.ServiceForTransport.newBuilder()
1903+
.putClients("grpc", serviceClientProtoBuilder.build());
1904+
1905+
if (service.hasApiVersion()) {
1906+
grpcServiceClient.setApiVersion(service.apiVersion());
1907+
}
1908+
19011909
metadataBuilder =
19021910
metadataBuilder.putServices(
1903-
service.name(),
1904-
GapicMetadata.ServiceForTransport.newBuilder()
1905-
.putClients("grpc", serviceClientProtoBuilder.build())
1906-
.build());
1911+
service.name(),grpcServiceClient.build());
19071912
context.updateGapicMetadata(metadataBuilder.build());
19081913
}
19091914
}

0 commit comments

Comments
 (0)