Skip to content

[ggj][codegen] fix: ServiceStub callable types #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miraleung merged 18 commits into from
Sep 19, 2020
Merged

[ggj][codegen] fix: ServiceStub callable types #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fd218de
feat: add protobuf comment parser util
miraleung Sep 15, 2020
8c792e3
fix: add basic proto build rules
miraleung Sep 15, 2020
d6ee068
feat: add header comments to ServiceClient
miraleung Sep 15, 2020
82aa0b6
fix: build protoc at test time
miraleung Sep 15, 2020
c8f2233
Merge branch 'gp/g0' of github.com:googleapis/gapic-generator-java in…
miraleung Sep 15, 2020
2405b1a
fix!: wrap protobuf location and process comments
miraleung Sep 15, 2020
a59fd3f
feat: add comment parsing to methods and fields
miraleung Sep 16, 2020
66dec11
fix: test
miraleung Sep 16, 2020
8325450
feat: add protobuf comments to ServiceClient
miraleung Sep 16, 2020
5acc151
fix: solidify codegen method order with TypeNode/MethodArg and Compar…
miraleung Sep 16, 2020
97e780a
fix: clean up tests
miraleung Sep 16, 2020
5508e67
fix: merge gp/g2_5
miraleung Sep 17, 2020
0b7288e
fix: merge
miraleung Sep 17, 2020
c6ca60b
fix: ServiceClient member variables and method calls
miraleung Sep 18, 2020
ac89e12
fix: ServiceStubSettings builder type
miraleung Sep 18, 2020
b5e6585
fix: ServiceSettings Builder construction
miraleung Sep 18, 2020
1e10b6b
fix: ServiceStub callable types
miraleung Sep 18, 2020
7a20548
Merge branch 'master' into gp/g8
miraleung Sep 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private static MethodDefinition createCallableGetterHelper(
(isLroCallable ? "Operation" : isPaged ? "Paged" : ""));
List<Reference> genericRefs = new ArrayList<>();
genericRefs.add(method.inputType().reference());
if (method.hasLro()) {
if (method.hasLro() && isLroCallable) {
genericRefs.add(method.lro().responseType().reference());
genericRefs.add(method.lro().metadataType().reference());
} else if (isPaged) {
Expand Down
7 changes: 4 additions & 3 deletions src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public void generateServiceClasses() {
+ "import com.google.api.gax.rpc.OperationCallable;\n"
+ "import com.google.api.gax.rpc.ServerStreamingCallable;\n"
+ "import com.google.api.gax.rpc.UnaryCallable;\n"
+ "import com.google.longrunning.Operation;\n"
+ "import com.google.longrunning.stub.OperationsStub;\n"
+ "import com.google.showcase.v1beta1.BlockRequest;\n"
+ "import com.google.showcase.v1beta1.BlockResponse;\n"
Expand Down Expand Up @@ -120,8 +121,8 @@ public void generateServiceClasses() {
+ " chatAgainCallable()\");\n"
+ " }\n"
+ "\n"
+ " public UnaryCallable<PagedExpandRequest, PagedExpandPagedResponse> pagedExpandPagedCallable()"
+ " {\n"
+ " public UnaryCallable<PagedExpandRequest, PagedExpandPagedResponse>"
+ " pagedExpandPagedCallable() {\n"
+ " throw new UnsupportedOperationException(\"Not implemented:"
+ " pagedExpandPagedCallable()\");\n"
+ " }\n"
Expand All @@ -138,7 +139,7 @@ public void generateServiceClasses() {
+ " waitOperationCallable()\");\n"
+ " }\n"
+ "\n"
+ " public UnaryCallable<WaitRequest, WaitResponse, WaitMetadata> waitCallable() {\n"
+ " public UnaryCallable<WaitRequest, Operation> waitCallable() {\n"
+ " throw new UnsupportedOperationException(\"Not implemented: waitCallable()\");\n"
+ " }\n"
+ "\n"
Expand Down