Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3dffa8d
feat: parse batching descriptor fields
miraleung Aug 31, 2020
c656ad1
feat: add Field.isMap and map-parsing test
miraleung Aug 31, 2020
bf28e84
feat: add initial batching descriptor field to ServiceStubSettings
miraleung Sep 1, 2020
902fd41
feat: support '? extends Foo' wildcard bounded references
miraleung Sep 1, 2020
8efb572
fix: speed up precommit checks with --disk_cache
miraleung Sep 1, 2020
66a7e1c
feat: add splitException, count{Elements,Bytes} batching descriptor m…
miraleung Sep 1, 2020
1a5c8f8
feat: add GeneralForStatement
miraleung Sep 1, 2020
23b443e
feat: add splitRseponse to batching desc. in ServiceStubSettings
miraleung Sep 2, 2020
381c6e4
fix: output srcjar path
miraleung Sep 2, 2020
f70d756
feat: add method comments to ServiceStubSettings, fix AST formatting
miraleung Sep 3, 2020
5fa910c
feat: add class Javadoc to ServiceStubSettings
miraleung Sep 3, 2020
6f570e3
feat: add class Javadoc to ServiceStubSettings
miraleung Sep 3, 2020
467848d
feat: add comments to ServiceSettings
miraleung Sep 3, 2020
857e248
fix: merge
miraleung Sep 3, 2020
6f04997
Merge branch 'gp/g10' of github.com:googleapis/gapic-generator-java i…
miraleung Sep 3, 2020
5bdad77
fix: file move
miraleung Sep 3, 2020
2ea07c8
feat: add comments for GrpcServiceCallableFactory, GrpcServiceStub, S…
miraleung Sep 3, 2020
4f222a3
feat: add comments for Resnames
miraleung Sep 3, 2020
a593261
Merge branch 'master' into gp/g13
miraleung Sep 4, 2020
634cdf6
fix: merge master
miraleung Sep 4, 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
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,7 @@ private void classes(List<ClassDefinition> classes) {
for (ClassDefinition classDef : classes) {
classDef.accept(this);
newline();
newline();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
import com.google.api.generator.engine.ast.AnnotationNode;
import com.google.api.generator.engine.ast.AssignmentExpr;
import com.google.api.generator.engine.ast.ClassDefinition;
import com.google.api.generator.engine.ast.CommentStatement;
import com.google.api.generator.engine.ast.ConcreteReference;
import com.google.api.generator.engine.ast.Expr;
import com.google.api.generator.engine.ast.ExprStatement;
import com.google.api.generator.engine.ast.ForStatement;
import com.google.api.generator.engine.ast.IfStatement;
import com.google.api.generator.engine.ast.JavaDocComment;
import com.google.api.generator.engine.ast.MethodDefinition;
import com.google.api.generator.engine.ast.MethodInvocationExpr;
import com.google.api.generator.engine.ast.NewObjectExpr;
Expand Down Expand Up @@ -69,6 +71,8 @@ public class ResourceNameHelperClassComposer {
private static final String LEFT_BRACE = "{";
private static final String RIGHT_BRACE = "}";

private static final String BUILDER_CLASS_HEADER_PATTERN = "Builder for %s.";

private static final ResourceNameHelperClassComposer INSTANCE =
new ResourceNameHelperClassComposer();

Expand Down Expand Up @@ -107,6 +111,7 @@ public GapicClass generate(ResourceName resourceName) {
ClassDefinition classDef =
ClassDefinition.builder()
.setPackageString(resourceName.pakkage())
.setHeaderCommentStatements(CommentComposer.AUTO_GENERATED_CLASS_COMMENT)
.setAnnotations(createClassAnnotations())
.setScope(ScopeNode.PUBLIC)
.setName(className)
Expand Down Expand Up @@ -1323,6 +1328,10 @@ private static ClassDefinition createNestedBuilderClass(
isDefaultClass ? Collections.emptyList() : Arrays.asList(betaAnnotation);

return ClassDefinition.builder()
.setHeaderCommentStatements(
CommentStatement.withComment(
JavaDocComment.withComment(
String.format(BUILDER_CLASS_HEADER_PATTERN, resourceNamePattern))))
.setAnnotations(classAnnotations)
.setIsNested(true)
.setScope(ScopeNode.PUBLIC)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,7 @@ private ClassDefinition createNestedClassNovel() {
+ " this.seriesNum = seriesNum;\n"
+ " }\n"
+ " }\n"
+ "\n"
+ " // Test nested abstract class and abstract method.\n"
+ " public abstract class Book {\n"
+ " public BookKind bookKind;\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ public void generateResourceNameClass_testingSessionOnePattern() {
+ "import java.util.Objects;\n"
+ "import javax.annotation.Generated;\n"
+ "\n"
+ "// AUTO-GENERATED DOCUMENTATION AND CLASS.\n"
+ "@Generated(\"by gapic-generator-java\")\n"
+ "public class FoobarName implements ResourceName {\n"
+ " private static final PathTemplate PROJECT_FOOBAR =\n"
Expand Down Expand Up @@ -324,15 +325,13 @@ public void generateResourceNameClass_testingSessionOnePattern() {
+ " }\n"
+ "\n"
+ " public static String format(String project, String foobar) {\n"
+ " return"
+ " newBuilder().setProject(project).setFoobar(foobar).build().toString();\n"
+ " return newBuilder().setProject(project).setFoobar(foobar).build().toString();\n"
+ " }\n"
+ "\n"
+ " @BetaApi(\"The static format methods are not stable yet and may be changed in the"
+ " future.\")\n"
+ " public static String formatProjectFoobarBuilder(String project, String foobar) {\n"
+ " return"
+ " newBuilder().setProject(project).setFoobar(foobar).build().toString();\n"
+ " return newBuilder().setProject(project).setFoobar(foobar).build().toString();\n"
+ " }\n"
+ "\n"
+ " @BetaApi(\"The static format methods are not stable yet and may be changed in the"
Expand Down Expand Up @@ -435,6 +434,7 @@ public void generateResourceNameClass_testingSessionOnePattern() {
+ " : fixedValue;\n"
+ " }\n"
+ "\n"
+ " /** Builder for projects/{project}/foobars/{foobar}. */\n"
+ " public static class Builder {\n"
+ " private String project;\n"
+ " private String foobar;\n"
Expand Down Expand Up @@ -473,6 +473,8 @@ public void generateResourceNameClass_testingSessionOnePattern() {
+ " }\n"
+ " }\n"
+ "\n"
+ " /** Builder for projects/{project}/chocolate/variants/{variant}/foobars/{foobar}."
+ " */\n"
+ " @BetaApi(\"The per-pattern Builders are not stable yet and may be changed in the"
+ " future.\")\n"
+ " public static class ProjectVariantFoobarBuilder {\n"
Expand Down Expand Up @@ -514,6 +516,7 @@ public void generateResourceNameClass_testingSessionOnePattern() {
+ " }\n"
+ " }\n"
+ "\n"
+ " /** Builder for foobars/{foobar}. */\n"
+ " @BetaApi(\"The per-pattern Builders are not stable yet and may be changed in the"
+ " future.\")\n"
+ " public static class FoobarBuilder {\n"
Expand Down Expand Up @@ -549,6 +552,7 @@ public void generateResourceNameClass_testingSessionOnePattern() {
+ "import java.util.Objects;\n"
+ "import javax.annotation.Generated;\n"
+ "\n"
+ "// AUTO-GENERATED DOCUMENTATION AND CLASS.\n"
+ "@Generated(\"by gapic-generator-java\")\n"
+ "public class SessionName implements ResourceName {\n"
+ " private static final PathTemplate SESSION =\n"
Expand Down Expand Up @@ -641,6 +645,7 @@ public void generateResourceNameClass_testingSessionOnePattern() {
+ " return SESSION.instantiate(\"session\", session);\n"
+ " }\n"
+ "\n"
+ " /** Builder for sessions/{session}. */\n"
+ " public static class Builder {\n"
+ " private String session;\n"
+ "\n"
Expand Down