feat: REST LRO implementation #859
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -132,7 +132,7 @@ public GapicClass generate(GapicContext context, Service service) { | |||||
| String className = ClassNames.getServiceClientClassName(service); | ||||||
| GapicClass.Kind kind = Kind.MAIN; | ||||||
| String pakkage = service.pakkage(); | ||||||
| boolean hasLroClient = service.hasStandardLroMethods(); | ||||||
|
|
||||||
| Map<String, List<String>> grpcRpcsToJavaMethodNames = new HashMap<>(); | ||||||
|
|
||||||
|
|
@@ -741,6 +741,7 @@ private static MethodDefinition createMethodDefaultMethod( | |||||
| method.isPaged() | ||||||
| ? typeStore.get(String.format(PAGED_RESPONSE_TYPE_NAME_PATTERN, method.name())) | ||||||
| : method.outputType(); | ||||||
| List<AnnotationNode> annotations = new ArrayList<>(); | ||||||
| if (method.hasLro()) { | ||||||
| LongrunningOperation lro = method.lro(); | ||||||
| methodOutputType = | ||||||
|
|
@@ -751,6 +752,13 @@ private static MethodDefinition createMethodDefaultMethod( | |||||
| .copyAndSetGenerics( | ||||||
| Arrays.asList( | ||||||
| lro.responseType().reference(), lro.metadataType().reference()))); | ||||||
| if (method.hasLro() && method.lro().operationServiceStubType() != null) { | ||||||
|
There was a problem hiding this comment. We already checked
Suggested change
There was a problem hiding this comment. yep, that was redundant. Removed |
||||||
| annotations.add( | ||||||
| AnnotationNode.withTypeAndDescription( | ||||||
| typeStore.get("BetaApi"), | ||||||
| "The surface for long-running operations is not stable yet and may change in the" | ||||||
| + " future.")); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // Construct the method that accepts a request proto. | ||||||
|
|
@@ -792,8 +800,7 @@ private static MethodDefinition createMethodDefaultMethod( | |||||
| .setArguments(Arrays.asList(requestArgVarExpr)); | ||||||
|
|
||||||
| if (method.isDeprecated()) { | ||||||
| annotations.add(AnnotationNode.withType(TypeNode.DEPRECATED)); | ||||||
| } | ||||||
|
|
||||||
| if (isProtoEmptyType(methodOutputType)) { | ||||||
|
|
@@ -805,6 +812,9 @@ private static MethodDefinition createMethodDefaultMethod( | |||||
| methodBuilder = | ||||||
| methodBuilder.setReturnExpr(callableMethodExpr).setReturnType(methodOutputType); | ||||||
| } | ||||||
|
|
||||||
| methodBuilder.setAnnotations(annotations); | ||||||
|
|
||||||
| return methodBuilder.build(); | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,8 +20,12 @@ | |
| import com.google.api.gax.rpc.BidiStreamingCallable; | ||
| import com.google.api.gax.rpc.ClientStreamingCallable; | ||
| import com.google.api.gax.rpc.InvalidArgumentException; | ||
| import com.google.api.gax.rpc.PagedCallSettings; | ||
| import com.google.api.gax.rpc.ServerStreamingCallSettings; | ||
| import com.google.api.gax.rpc.ServerStreamingCallable; | ||
| import com.google.api.gax.rpc.StatusCode; | ||
| import com.google.api.gax.rpc.StreamingCallSettings; | ||
| import com.google.api.gax.rpc.UnaryCallSettings; | ||
| import com.google.api.generator.engine.ast.AnnotationNode; | ||
| import com.google.api.generator.engine.ast.AssignmentExpr; | ||
| import com.google.api.generator.engine.ast.ClassDefinition; | ||
|
|
@@ -54,6 +58,7 @@ | |
| import com.google.api.generator.gapic.model.Message; | ||
| import com.google.api.generator.gapic.model.Method; | ||
| import com.google.api.generator.gapic.model.MethodArgument; | ||
| import com.google.api.generator.gapic.model.OperationResponse; | ||
| import com.google.api.generator.gapic.model.ResourceName; | ||
| import com.google.api.generator.gapic.model.Service; | ||
| import com.google.api.generator.gapic.utils.JavaStyle; | ||
|
|
@@ -408,7 +413,10 @@ private MethodDefinition createRpcTestMethod( | |
| .setValueExpr(expectedResponseValExpr) | ||
| .build()); | ||
|
|
||
| if (method.hasLro() | ||
| && (method.lro().operationServiceStubType() == null | ||
| || !method.lro().responseType().equals(method.outputType()))) { | ||
|
|
||
| VariableExpr resultOperationVarExpr = | ||
| VariableExpr.withVariable( | ||
| Variable.builder() | ||
|
|
@@ -905,6 +913,46 @@ private void addDynamicTypes(GapicContext context, Service service, TypeStore ty | |
| } | ||
| } | ||
|
|
||
| private static TypeNode getCallSettingsTypeHelper( | ||
| Method protoMethod, TypeStore typeStore, boolean isBuilder) { | ||
| Class callSettingsClazz = isBuilder ? UnaryCallSettings.Builder.class : UnaryCallSettings.class; | ||
| if (protoMethod.isPaged()) { | ||
| callSettingsClazz = isBuilder ? PagedCallSettings.Builder.class : PagedCallSettings.class; | ||
| } else { | ||
| switch (protoMethod.stream()) { | ||
| case CLIENT: | ||
| // Fall through. | ||
| case BIDI: | ||
| callSettingsClazz = | ||
| isBuilder ? StreamingCallSettings.Builder.class : StreamingCallSettings.class; | ||
| break; | ||
| case SERVER: | ||
| callSettingsClazz = | ||
| isBuilder | ||
| ? ServerStreamingCallSettings.Builder.class | ||
| : ServerStreamingCallSettings.class; | ||
| break; | ||
| case NONE: | ||
| // Fall through | ||
| default: | ||
| // Fall through | ||
| } | ||
| } | ||
|
|
||
| List<Reference> generics = new ArrayList<>(); | ||
| generics.add(protoMethod.inputType().reference()); | ||
| generics.add(protoMethod.outputType().reference()); | ||
| if (protoMethod.isPaged()) { | ||
| generics.add( | ||
| typeStore | ||
| .get(String.format(PAGED_RESPONSE_TYPE_NAME_PATTERN, protoMethod.name())) | ||
| .reference()); | ||
| } | ||
|
|
||
| return TypeNode.withReference( | ||
| ConcreteReference.builder().setClazz(callSettingsClazz).setGenerics(generics).build()); | ||
| } | ||
|
|
||
| protected static TypeNode getCallableType(Method protoMethod) { | ||
| Preconditions.checkState( | ||
| !protoMethod.stream().equals(Method.Stream.NONE), | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed to point to upstream