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.

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

[ggj][codegen] feat: add service.yaml and proto comments to package-info.java #416

Merged
merged 21 commits into from
Oct 25, 2020
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ceaaddb
fix: refactor requestBuilder into separate method in ServiceClientCla…
miraleung Oct 7, 2020
fba69cb
Merge branch 'master' of github.com:googleapis/gapic-generator-java i…
miraleung Oct 8, 2020
32672f2
fix: merge master
miraleung Oct 21, 2020
bdcb62e
feat: add varargs to AnonClass and ref setter methods
miraleung Oct 21, 2020
e15e115
feat: add HTTP annotation parsing/validation
miraleung Oct 21, 2020
28d3b3c
feat: Generate RequestParamsExtractor in GrpcServiceStub
miraleung Oct 21, 2020
5293551
feat: add GrpcPublisherStub test to exercise HTTP subfields
miraleung Oct 21, 2020
2a50453
fix: add ByteString to DefaultValueComposer
miraleung Oct 21, 2020
e4684f3
fix: Use repeated field name for paged RPC unit tests
miraleung Oct 21, 2020
7829850
fix: refactor exception field, use paged repeated field name, add pub…
miraleung Oct 22, 2020
11c38bd
fix: ensure all testgen methods throw Exceptions
miraleung Oct 22, 2020
d3ec180
fix: Fix resname helper method names for of* and format*
miraleung Oct 22, 2020
6416984
fix: use only generated resnames in codegen
miraleung Oct 22, 2020
96046a6
fix: propagate of*Name changes to resname codegen
miraleung Oct 22, 2020
297f64a
fix: fix method arg resname mappings, add logging test
miraleung Oct 23, 2020
2691d8c
fix: ensure paged tests use the right repeated resp. type
miraleung Oct 23, 2020
01b8051
feat: add PackageInfoDefinition AST node
miraleung Oct 23, 2020
0d83a14
feat: add package-info.java codegen
miraleung Oct 23, 2020
d1e4335
feat: add Service.yaml parsing
miraleung Oct 24, 2020
9b86c03
feat: add service.yaml and proto comments to package-info.java
miraleung Oct 24, 2020
bfda0f9
Merge branch 'master' into gp/g16
miraleung Oct 25, 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
Prev Previous commit
Next Next commit
feat: add service.yaml and proto comments to package-info.java
  • Loading branch information
miraleung committed Oct 24, 2020
commit 9b86c033336ee21d881afce26de182861b6fa8b9
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,29 @@
package com.google.api.generator.gapic.composer;

import com.google.api.generator.engine.ast.AnnotationNode;
import com.google.api.generator.engine.ast.CommentStatement;
import com.google.api.generator.engine.ast.ConcreteReference;
import com.google.api.generator.engine.ast.JavaDocComment;
import com.google.api.generator.engine.ast.PackageInfoDefinition;
import com.google.api.generator.engine.ast.TypeNode;
import com.google.api.generator.gapic.model.GapicContext;
import com.google.api.generator.gapic.model.GapicPackageInfo;
import com.google.api.generator.gapic.model.Service;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import javax.annotation.Generated;

public class ClientLibraryPackageInfoComposer {
private static final String DIVIDER = "=======================";

private static final String PACKAGE_INFO_DESCRIPTION =
"The interfaces provided are listed below, along with usage samples.";

private static final String CLIENT_PATTERN = "%sClient";
private static final String PACKAGE_INFO_TITLE_PATTERN = "A client to %s";
private static final String SAMPLE_CODE_HEADER_PATTERN = "Sample for %s:";
private static final String SERVICE_DESCRIPTION_HEADER_PATTERN = "Service Description: %s";

public static GapicPackageInfo generatePackageInfo(GapicContext context) {
Preconditions.checkState(!context.services().isEmpty(), "No services found to generate");
// Pick some service's package, as we assume they are all the same.
Expand All @@ -32,6 +46,7 @@ public static GapicPackageInfo generatePackageInfo(GapicContext context) {
PackageInfoDefinition packageInfo =
PackageInfoDefinition.builder()
.setPakkage(libraryPakkage)
.setHeaderCommentStatements(createPackageInfoJavadoc(context))
.setAnnotations(
AnnotationNode.builder()
.setType(TypeNode.withReference(ConcreteReference.withClazz(Generated.class)))
Expand All @@ -40,4 +55,45 @@ public static GapicPackageInfo generatePackageInfo(GapicContext context) {
.build();
return GapicPackageInfo.with(packageInfo);
}

private static CommentStatement createPackageInfoJavadoc(GapicContext context) {
JavaDocComment.Builder javaDocCommentBuilder = JavaDocComment.builder();
if (context.hasServiceYamlProto()
&& !Strings.isNullOrEmpty(context.serviceYamlProto().getTitle())) {
javaDocCommentBuilder =
javaDocCommentBuilder.addComment(
String.format(PACKAGE_INFO_TITLE_PATTERN, context.serviceYamlProto().getTitle()));
}

javaDocCommentBuilder = javaDocCommentBuilder.addParagraph(PACKAGE_INFO_DESCRIPTION);

for (Service service : context.services()) {
String javaClientName = String.format(CLIENT_PATTERN, service.name());
javaDocCommentBuilder =
javaDocCommentBuilder.addParagraph(
String.format("%s %s %s", DIVIDER, javaClientName, DIVIDER));

// TODO(miraleung): Paragraphs
if (service.hasDescription()) {
String[] descriptionParagraphs = service.description().split("\\r?\\n");
for (int i = 0; i < descriptionParagraphs.length; i++) {
if (i == 0) {
javaDocCommentBuilder =
javaDocCommentBuilder.addParagraph(
String.format(SERVICE_DESCRIPTION_HEADER_PATTERN, descriptionParagraphs[i]));
} else {
javaDocCommentBuilder = javaDocCommentBuilder.addParagraph(descriptionParagraphs[i]);
}
}
}

javaDocCommentBuilder =
javaDocCommentBuilder.addParagraph(
String.format(SAMPLE_CODE_HEADER_PATTERN, javaClientName));

// TODO(summerji): Add package-info.java sample code here.
}

return CommentStatement.withComment(javaDocCommentBuilder.build());
}
}