Skip to content
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

Jump to bottom

[samplecode] Implement rpc default method sample code #594

Merged
merged 5 commits into from
Dec 17, 2020
Merged

[samplecode] Implement rpc default method sample code #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef07c63
Implement rpc default method sample code
summer-ji-eng Dec 10, 2020
25d6723
Add unit test
summer-ji-eng Dec 13, 2020
535f2ae
refactor to reuse private functions
summer-ji-eng Dec 15, 2020
12d5df2
refactor body statements
summer-ji-eng Dec 16, 2020
3fcc3e0
fix nit with body exprs position
summer-ji-eng Dec 17, 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
21 changes: 16 additions & 5 deletions src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,13 +479,14 @@ private static List<MethodDefinition> createServiceMethods(
Map<String, Message> messageTypes,
Map<String, TypeNode> types,
Map<String, ResourceName> resourceNames) {
String clientName = getClientClassName(service);
List<MethodDefinition> javaMethods = new ArrayList<>();
for (Method method : service.methods()) {
if (method.stream().equals(Stream.NONE)) {
javaMethods.addAll(
createMethodVariants(
method, getClientClassName(service), messageTypes, types, resourceNames));
javaMethods.add(createMethodDefaultMethod(method, types));
createMethodVariants(method, clientName, messageTypes, types, resourceNames));
javaMethods.add(
createMethodDefaultMethod(method, clientName, messageTypes, types, resourceNames));
}
if (method.hasLro()) {
javaMethods.add(createLroCallableMethod(service, method, types));
Expand Down Expand Up @@ -594,7 +595,11 @@ private static List<MethodDefinition> createMethodVariants(
}

private static MethodDefinition createMethodDefaultMethod(
Method method, Map<String, TypeNode> types) {
Method method,
String clientName,
Map<String, Message> messageTypes,
Map<String, TypeNode> types,
Map<String, ResourceName> resourceNames) {
String methodName = JavaStyle.toLowerCamelCase(method.name());
TypeNode methodInputType = method.inputType();
TypeNode methodOutputType =
Expand Down Expand Up @@ -627,6 +632,11 @@ private static MethodDefinition createMethodDefaultMethod(
callableMethodName = String.format(OPERATION_CALLABLE_NAME_PATTERN, methodName);
}

Optional<String> defaultMethodSampleCode =
Optional.of(
ServiceClientSampleCodeComposer.composeRpcDefaultMethodHeaderSampleCode(
method, types.get(clientName), resourceNames, messageTypes));

MethodInvocationExpr callableMethodExpr =
MethodInvocationExpr.builder().setMethodName(callableMethodName).build();
callableMethodExpr =
Expand All @@ -639,7 +649,8 @@ private static MethodDefinition createMethodDefaultMethod(
MethodDefinition.Builder methodBuilder =
MethodDefinition.builder()
.setHeaderCommentStatements(
ServiceClientCommentComposer.createRpcMethodHeaderComment(method))
ServiceClientCommentComposer.createRpcMethodHeaderComment(
method, defaultMethodSampleCode))
.setScope(ScopeNode.PUBLIC)
.setIsFinal(true)
.setName(String.format(method.hasLro() ? "%sAsync" : "%s", methodName))
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@ static List<CommentStatement> createRpcMethodHeaderComment(
return comments;
}

static List<CommentStatement> createRpcMethodHeaderComment(Method method) {
// TODO(summerji): Refactor this method when implement default method sample code.
return createRpcMethodHeaderComment(method, Collections.emptyList(), Optional.empty());
static List<CommentStatement> createRpcMethodHeaderComment(
Method method, Optional<String> sampleCode) {
return createRpcMethodHeaderComment(method, Collections.emptyList(), sampleCode);
}

static CommentStatement createMethodNoArgComment(String serviceName) {
Expand Down
Loading