From 0d3c377af40c867a02488b7bc084e439c331954c Mon Sep 17 00:00:00 2001 From: summerji Date: Wed, 30 Dec 2020 16:36:04 -0800 Subject: [PATCH] seperate defalt value related files and same to resource name --- .../api/generator/gapic/composer/BUILD.bazel | 2 + .../generator/gapic/composer/Composer.java | 1 + .../ServiceClientTestClassComposer.java | 1 + .../gapic/composer/defaultvalue/BUILD.bazel | 25 +++++++++ .../DefaultValueComposer.java | 15 +++--- .../gapic/composer/resourcename/BUILD.bazel | 25 +++++++++ .../ResourceNameHelperClassComposer.java | 2 +- .../ResourceNameTokenizer.java | 4 +- .../api/generator/engine/writer/BUILD.bazel | 1 + .../api/generator/gapic/composer/BUILD.bazel | 7 +-- .../BatchingDescriptorComposerTest.java | 1 + .../gapic/composer/ComposerTest.java | 1 + ...rviceCallableFactoryClassComposerTest.java | 1 + .../GrpcServiceStubClassComposerTest.java | 1 + .../MockServiceClassComposerTest.java | 1 + .../MockServiceImplClassComposerTest.java | 1 + .../composer/RetrySettingsComposerTest.java | 1 + .../ServiceClientClassComposerTest.java | 1 + .../ServiceClientTestClassComposerTest.java | 1 + .../ServiceSettingsClassComposerTest.java | 1 + .../ServiceStubClassComposerTest.java | 1 + .../ServiceStubSettingsClassComposerTest.java | 1 + .../gapic/composer/constants/BUILD.bazel | 13 +++++ .../{ => constants}/ComposerConstants.java | 2 +- .../gapic/composer/defaultvalue/BUILD.bazel | 45 ++++++++++++++++ .../DefaultValueComposerTest.java | 3 +- .../gapic/composer/resourcename/BUILD.bazel | 52 +++++++++++++++++++ .../ResourceNameHelperClassComposerTest.java | 3 +- .../ResourceNameTokenizerTest.java | 3 +- 29 files changed, 197 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/google/api/generator/gapic/composer/defaultvalue/BUILD.bazel rename src/main/java/com/google/api/generator/gapic/composer/{ => defaultvalue}/DefaultValueComposer.java (96%) create mode 100644 src/main/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel rename src/main/java/com/google/api/generator/gapic/composer/{ => resourcename}/ResourceNameHelperClassComposer.java (99%) rename src/main/java/com/google/api/generator/gapic/composer/{ => resourcename}/ResourceNameTokenizer.java (95%) create mode 100644 src/test/java/com/google/api/generator/gapic/composer/constants/BUILD.bazel rename src/test/java/com/google/api/generator/gapic/composer/{ => constants}/ComposerConstants.java (93%) create mode 100644 src/test/java/com/google/api/generator/gapic/composer/defaultvalue/BUILD.bazel rename src/test/java/com/google/api/generator/gapic/composer/{ => defaultvalue}/DefaultValueComposerTest.java (98%) create mode 100644 src/test/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel rename src/test/java/com/google/api/generator/gapic/composer/{ => resourcename}/ResourceNameHelperClassComposerTest.java (98%) rename src/test/java/com/google/api/generator/gapic/composer/{ => resourcename}/ResourceNameTokenizerTest.java (97%) diff --git a/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel index 26874fbd13..c36330db97 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel +++ b/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel @@ -18,6 +18,8 @@ java_library( "//src/main/java/com/google/api/generator/engine/writer", "//src/main/java/com/google/api/generator/gapic:status_java_proto", "//src/main/java/com/google/api/generator/gapic/composer/comment", + "//src/main/java/com/google/api/generator/gapic/composer/defaultvalue", + "//src/main/java/com/google/api/generator/gapic/composer/resourcename", "//src/main/java/com/google/api/generator/gapic/composer/samplecode", "//src/main/java/com/google/api/generator/gapic/composer/store", "//src/main/java/com/google/api/generator/gapic/composer/utils", diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java index 58f57b93e9..2c8ac431e2 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/Composer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/Composer.java @@ -17,6 +17,7 @@ import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.gapic.composer.comment.CommentComposer; +import com.google.api.generator.gapic.composer.resourcename.ResourceNameHelperClassComposer; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.GapicContext; diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java index 7f5ae520f2..0b27868b1c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java @@ -57,6 +57,7 @@ import com.google.api.generator.engine.ast.VaporReference; import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; +import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; import com.google.api.generator.gapic.composer.store.TypeStore; import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.Field; diff --git a/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/BUILD.bazel new file mode 100644 index 0000000000..178459f813 --- /dev/null +++ b/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/BUILD.bazel @@ -0,0 +1,25 @@ +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "defaultvalue_files", + srcs = glob(["*.java"]), +) + +java_library( + name = "defaultvalue", + srcs = [ + ":defaultvalue_files", + ], + deps = [ + "//src/main/java/com/google/api/generator/engine/ast", + "//src/main/java/com/google/api/generator/gapic/composer/resourcename", + "//src/main/java/com/google/api/generator/gapic/model", + "//src/main/java/com/google/api/generator/gapic/utils", + "@com_google_googleapis//google/longrunning:longrunning_java_proto", + "@com_google_guava_guava//jar", + "@com_google_protobuf//java/core", + "@google_java_format_all_deps//jar", + ], +) diff --git a/src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java b/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java similarity index 96% rename from src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java rename to src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java index fdab242aa1..cf12accdd6 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.gapic.composer.defaultvalue; import com.google.api.generator.engine.ast.ConcreteReference; import com.google.api.generator.engine.ast.Expr; @@ -24,6 +24,7 @@ import com.google.api.generator.engine.ast.ValueExpr; import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; +import com.google.api.generator.gapic.composer.resourcename.ResourceNameTokenizer; import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.MethodArgument; @@ -49,7 +50,7 @@ public class DefaultValueComposer { private static TypeNode BYTESTRING_TYPE = TypeNode.withReference(ConcreteReference.withClazz(ByteString.class)); - static Expr createDefaultValue( + public static Expr createDefaultValue( MethodArgument methodArg, Map resourceNames) { if (methodArg.isResourceNameHelper()) { Preconditions.checkState( @@ -78,7 +79,7 @@ static Expr createDefaultValue( Field.builder().setName(methodArg.name()).setType(methodArg.type()).build()); } - static Expr createDefaultValue(Field f) { + public static Expr createDefaultValue(Field f) { return createDefaultValue(f, false); } @@ -154,7 +155,7 @@ static Expr createDefaultValue(Field f, boolean useExplicitInitTypeInGenerics) { "Default value for field %s with type %s not implemented yet.", f.name(), f.type())); } - static Expr createDefaultValue( + public static Expr createDefaultValue( ResourceName resourceName, List resnames, String fieldOrMessageName) { boolean hasOnePattern = resourceName.patterns().size() == 1; if (resourceName.isOnlyWildcard()) { @@ -224,7 +225,7 @@ static Expr createDefaultValue( .build(); } - static Expr createSimpleMessageBuilderExpr( + public static Expr createSimpleMessageBuilderExpr( Message message, Map resourceNames, Map messageTypes) { MethodInvocationExpr builderExpr = MethodInvocationExpr.builder() @@ -275,7 +276,7 @@ static Expr createSimpleMessageBuilderExpr( .build(); } - static Expr createSimpleOperationBuilderExpr(String name, VariableExpr responseExpr) { + public static Expr createSimpleOperationBuilderExpr(String name, VariableExpr responseExpr) { Expr operationExpr = MethodInvocationExpr.builder() .setStaticReferenceType(OPERATION_TYPE) @@ -313,7 +314,7 @@ static Expr createSimpleOperationBuilderExpr(String name, VariableExpr responseE .build(); } - static Expr createSimplePagedResponse( + public static Expr createSimplePagedResponse( TypeNode responseType, String repeatedFieldName, Expr responseElementVarExpr) { Expr pagedResponseExpr = MethodInvocationExpr.builder() diff --git a/src/main/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel new file mode 100644 index 0000000000..30732f3ed6 --- /dev/null +++ b/src/main/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel @@ -0,0 +1,25 @@ +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "resourcename_files", + srcs = glob(["*.java"]), +) + +java_library( + name = "resourcename", + srcs = [ + ":resourcename_files", + ], + deps = [ + "//src/main/java/com/google/api/generator/engine/ast", + "//src/main/java/com/google/api/generator/gapic/composer/comment", + "//src/main/java/com/google/api/generator/gapic/composer/store", + "//src/main/java/com/google/api/generator/gapic/model", + "//src/main/java/com/google/api/generator/gapic/utils", + "@com_google_api_api_common", + "@com_google_guava_guava", + "@javax_annotation_javax_annotation_api", + ], +) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java similarity index 99% rename from src/main/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposer.java rename to src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java index 3c6e87d191..ff9e205cfc 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.gapic.composer.resourcename; import com.google.api.core.BetaApi; import com.google.api.generator.engine.ast.AnnotationNode; diff --git a/src/main/java/com/google/api/generator/gapic/composer/ResourceNameTokenizer.java b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizer.java similarity index 95% rename from src/main/java/com/google/api/generator/gapic/composer/ResourceNameTokenizer.java rename to src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizer.java index 190b0d6c86..18cfd81c0c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ResourceNameTokenizer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.gapic.composer.resourcename; import com.google.api.pathtemplate.PathTemplate; import com.google.common.base.Preconditions; @@ -32,7 +32,7 @@ public class ResourceNameTokenizer { private static final String NON_SLASH_SEP_REGEX = "\\}(_|\\-|\\.|~)\\{"; - static List> parseTokenHierarchy(List patterns) { + public static List> parseTokenHierarchy(List patterns) { List> tokenHierachies = new ArrayList<>(); for (String pattern : patterns) { List hierarchy = new ArrayList<>(); diff --git a/src/test/java/com/google/api/generator/engine/writer/BUILD.bazel b/src/test/java/com/google/api/generator/engine/writer/BUILD.bazel index bc21b9de17..1d6ea84b09 100644 --- a/src/test/java/com/google/api/generator/engine/writer/BUILD.bazel +++ b/src/test/java/com/google/api/generator/engine/writer/BUILD.bazel @@ -22,6 +22,7 @@ filegroup( "//src/test/java/com/google/api/generator/testutils", "@com_google_guava_guava//jar", "@com_google_truth_truth//jar", + "@javax_annotation_javax_annotation_api", "@junit_junit//jar", ], ) for test_name in TESTS] diff --git a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel index 0e0e941a90..7c4b8715e4 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel +++ b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel @@ -10,7 +10,6 @@ UPDATE_GOLDENS_TESTS = [ "GrpcServiceStubClassComposerTest", "MockServiceClassComposerTest", "MockServiceImplClassComposerTest", - "ResourceNameHelperClassComposerTest", "ServiceClientClassComposerTest", "ServiceClientTestClassComposerTest", "ServiceSettingsClassComposerTest", @@ -19,8 +18,6 @@ UPDATE_GOLDENS_TESTS = [ ] TESTS = UPDATE_GOLDENS_TESTS + [ - "DefaultValueComposerTest", - "ResourceNameTokenizerTest", "RetrySettingsComposerTest", ] @@ -36,8 +33,10 @@ TEST_DEPS = [ "//src/test/java/com/google/api/generator/testutils", "//src/main/java/com/google/api/generator/gapic/model", "//src/main/java/com/google/api/generator/gapic/protoparser", + "//src/main/java/com/google/api/generator/gapic/composer/defaultvalue", "//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto", "//src/test/java/com/google/api/generator/gapic/testdata:testgapic_java_proto", + "//src/test/java/com/google/api/generator/gapic/composer/constants", "@com_google_api_gax_java//gax", "@com_google_googleapis//google/logging/v2:logging_java_proto", "@com_google_googleapis//google/pubsub/v1:pubsub_java_proto", @@ -71,7 +70,6 @@ java_proto_library( name = test_name, srcs = [ "{0}.java".format(test_name), - "ComposerConstants.java", ], data = [ "//src/test/java/com/google/api/generator/gapic/composer/goldens:goldens_files", @@ -91,7 +89,6 @@ TEST_CLASS_DIR = "com.google.api.generator.gapic.composer." name = "{0}_update".format(test_name), srcs = [ "{0}.java".format(test_name), - "ComposerConstants.java", ], data = [ "//src/test/java/com/google/api/generator/gapic/composer/goldens:goldens_files", diff --git a/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java index d3d447458c..1d674d9fdb 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java @@ -19,6 +19,7 @@ import com.google.api.generator.engine.ast.Expr; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicBatchingSettings; import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Message; diff --git a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java index 8baccad97c..d033c94f49 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java @@ -17,6 +17,7 @@ import com.google.api.generator.engine.ast.ClassDefinition; import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.test.framework.Assert; diff --git a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java index bc1f8d0c09..0e09a19956 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java @@ -17,6 +17,7 @@ import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java index 47c7767d45..fa56cad3b9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java @@ -17,6 +17,7 @@ import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java index 61785acb7b..4138e9bbdb 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java @@ -17,6 +17,7 @@ import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java index 624126bb96..83d8f10cd0 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java @@ -17,6 +17,7 @@ import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/RetrySettingsComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/RetrySettingsComposerTest.java index cc8a12facc..2179c28ab3 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/RetrySettingsComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/RetrySettingsComposerTest.java @@ -27,6 +27,7 @@ import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicBatchingSettings; import com.google.api.generator.gapic.model.GapicServiceConfig; import com.google.api.generator.gapic.model.Message; diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java index 1a882a6a30..3d70d64e1b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java @@ -18,6 +18,7 @@ import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java index a2d576066f..9e24372177 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java @@ -18,6 +18,7 @@ import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java index bd7b41eb16..be19c78d8b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java @@ -17,6 +17,7 @@ import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java index 2e7a390b0b..f7c6c37ecd 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java @@ -17,6 +17,7 @@ import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java index e9ee3b9505..df9636830b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java @@ -18,6 +18,7 @@ import static junit.framework.Assert.assertTrue; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicBatchingSettings; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicServiceConfig; diff --git a/src/test/java/com/google/api/generator/gapic/composer/constants/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/constants/BUILD.bazel new file mode 100644 index 0000000000..2288521d30 --- /dev/null +++ b/src/test/java/com/google/api/generator/gapic/composer/constants/BUILD.bazel @@ -0,0 +1,13 @@ +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "constants_files", + srcs = glob(["*.java"]), +) + +java_binary( + name = "constants", + srcs = ["constants_files"], +) diff --git a/src/test/java/com/google/api/generator/gapic/composer/ComposerConstants.java b/src/test/java/com/google/api/generator/gapic/composer/constants/ComposerConstants.java similarity index 93% rename from src/test/java/com/google/api/generator/gapic/composer/ComposerConstants.java rename to src/test/java/com/google/api/generator/gapic/composer/constants/ComposerConstants.java index 97d3b6b23b..c8247b10eb 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ComposerConstants.java +++ b/src/test/java/com/google/api/generator/gapic/composer/constants/ComposerConstants.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.gapic.composer.constants; public class ComposerConstants { public static final String GOLDENFILES_DIRECTORY = diff --git a/src/test/java/com/google/api/generator/gapic/composer/defaultvalue/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/defaultvalue/BUILD.bazel new file mode 100644 index 0000000000..dd73c0bef7 --- /dev/null +++ b/src/test/java/com/google/api/generator/gapic/composer/defaultvalue/BUILD.bazel @@ -0,0 +1,45 @@ +load("@rules_java//java:defs.bzl", "java_test") + +package(default_visibility = ["//visibility:public"]) + +TESTS = [ + "DefaultValueComposerTest", +] + +filegroup( + name = "defaultvalue_files", + srcs = ["{0}.java".format(f) for f in TESTS], +) + +[java_test( + name = test_name, + srcs = ["{0}.java".format(test_name)], + test_class = "com.google.api.generator.gapic.composer.defaultvalue.{0}".format(test_name), + deps = [ + ":common_resources_java_proto", + "//src/main/java/com/google/api/generator/engine/ast", + "//src/main/java/com/google/api/generator/engine/writer", + "//src/main/java/com/google/api/generator/gapic/composer/defaultvalue", + "//src/main/java/com/google/api/generator/gapic/model", + "//src/main/java/com/google/api/generator/gapic/protoparser", + "//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto", + "//src/test/java/com/google/api/generator/gapic/testdata:testgapic_java_proto", + "//src/test/java/com/google/api/generator/test/framework:asserts", + "//src/test/java/com/google/api/generator/test/framework:utils", + "//src/test/java/com/google/api/generator/testutils", + "@com_google_api_api_common//jar", + "@com_google_api_gax_java//gax", + "@com_google_googleapis//google/rpc:rpc_java_proto", + "@com_google_guava_guava", + "@com_google_protobuf//:protobuf_java", + "@com_google_truth_truth//jar", + "@junit_junit//jar", + ], +) for test_name in TESTS] + +java_proto_library( + name = "common_resources_java_proto", + deps = [ + "@com_google_googleapis//google/cloud:common_resources_proto", + ], +) diff --git a/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposerTest.java similarity index 98% rename from src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java rename to src/test/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposerTest.java index 5b2dc78522..2e80416d64 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.gapic.composer.defaultvalue; import static junit.framework.Assert.assertEquals; @@ -20,6 +20,7 @@ import com.google.api.generator.engine.ast.Expr; import com.google.api.generator.engine.ast.TypeNode; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer; import com.google.api.generator.gapic.model.Field; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel new file mode 100644 index 0000000000..16db1b17b0 --- /dev/null +++ b/src/test/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel @@ -0,0 +1,52 @@ +load("@rules_java//java:defs.bzl", "java_test") + +package(default_visibility = ["//visibility:public"]) + +TESTS = [ + "ResourceNameHelperClassComposerTest", + "ResourceNameTokenizerTest", +] + +filegroup( + name = "resourcename_files", + srcs = ["{0}.java".format(f) for f in TESTS], +) + +[java_test( + name = test_name, + srcs = ["{0}.java".format(test_name)], + data = [ + "//src/test/java/com/google/api/generator/gapic/composer/goldens:goldens_files", + "//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files", + "//src/test/java/com/google/api/generator/gapic/testdata:service_config_files", + ], + test_class = "com.google.api.generator.gapic.composer.resourcename.{0}".format(test_name), + deps = [ + ":common_resources_java_proto", + "//src/main/java/com/google/api/generator/engine/ast", + "//src/main/java/com/google/api/generator/engine/writer", + "//src/main/java/com/google/api/generator/gapic/composer/resourcename", + "//src/main/java/com/google/api/generator/gapic/model", + "//src/main/java/com/google/api/generator/gapic/protoparser", + "//src/test/java/com/google/api/generator/gapic/composer/constants", + "//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto", + "//src/test/java/com/google/api/generator/test/framework:asserts", + "//src/test/java/com/google/api/generator/test/framework:utils", + "//src/test/java/com/google/api/generator/testutils", + "@com_google_api_api_common//jar", + "@com_google_api_gax_java//gax", + "@com_google_googleapis//google/logging/v2:logging_java_proto", + "@com_google_googleapis//google/rpc:rpc_java_proto", + "@com_google_guava_guava", + "@com_google_protobuf//:protobuf_java", + "@com_google_truth_truth//jar", + "@junit_junit//jar", + ], +) for test_name in TESTS] + +java_proto_library( + name = "common_resources_java_proto", + deps = [ + "@com_google_googleapis//google/cloud:common_resources_proto", + ], +) diff --git a/src/test/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java similarity index 98% rename from src/test/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposerTest.java rename to src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java index acb47db274..cd918c865d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java @@ -12,12 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.gapic.composer.resourcename; import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.assertEquals; import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.constants.ComposerConstants; import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.ResourceName; diff --git a/src/test/java/com/google/api/generator/gapic/composer/ResourceNameTokenizerTest.java b/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizerTest.java similarity index 97% rename from src/test/java/com/google/api/generator/gapic/composer/ResourceNameTokenizerTest.java rename to src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizerTest.java index e7b5823725..6e17170841 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ResourceNameTokenizerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizerTest.java @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.gapic.composer.resourcename; import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.assertEquals; +import com.google.api.generator.gapic.composer.resourcename.ResourceNameTokenizer; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.protobuf.Descriptors.ServiceDescriptor; import com.google.showcase.v1beta1.EchoOuterClass;