Skip to content
This repository was archived by the owner on May 14, 2026. It is now read-only.

Commit 2085654

Browse files
summer-ji-engsummer-ji-eng
authored
seperate defalt value related files and same to resource name (#630)
1 parent c785470 commit 2085654

29 files changed

Lines changed: 197 additions & 19 deletions

‎src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ java_library(
1818
"//src/main/java/com/google/api/generator/engine/writer",
1919
"//src/main/java/com/google/api/generator/gapic:status_java_proto",
2020
"//src/main/java/com/google/api/generator/gapic/composer/comment",
21+
"//src/main/java/com/google/api/generator/gapic/composer/defaultvalue",
22+
"//src/main/java/com/google/api/generator/gapic/composer/resourcename",
2123
"//src/main/java/com/google/api/generator/gapic/composer/samplecode",
2224
"//src/main/java/com/google/api/generator/gapic/composer/store",
2325
"//src/main/java/com/google/api/generator/gapic/composer/utils",

‎src/main/java/com/google/api/generator/gapic/composer/Composer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.google.api.generator.engine.ast.ClassDefinition;
1818
import com.google.api.generator.engine.ast.ScopeNode;
1919
import com.google.api.generator.gapic.composer.comment.CommentComposer;
20+
import com.google.api.generator.gapic.composer.resourcename.ResourceNameHelperClassComposer;
2021
import com.google.api.generator.gapic.model.GapicClass;
2122
import com.google.api.generator.gapic.model.GapicClass.Kind;
2223
import com.google.api.generator.gapic.model.GapicContext;

‎src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import com.google.api.generator.engine.ast.VaporReference;
5858
import com.google.api.generator.engine.ast.Variable;
5959
import com.google.api.generator.engine.ast.VariableExpr;
60+
import com.google.api.generator.gapic.composer.defaultvalue.DefaultValueComposer;
6061
import com.google.api.generator.gapic.composer.store.TypeStore;
6162
import com.google.api.generator.gapic.composer.utils.ClassNames;
6263
import com.google.api.generator.gapic.model.Field;

‎src/main/java/com/google/api/generator/gapic/composer/defaultvalue/BUILD.bazel‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
load("@rules_java//java:defs.bzl", "java_library")
2+
3+
package(default_visibility = ["//visibility:public"])
4+
5+
filegroup(
6+
name = "defaultvalue_files",
7+
srcs = glob(["*.java"]),
8+
)
9+
10+
java_library(
11+
name = "defaultvalue",
12+
srcs = [
13+
":defaultvalue_files",
14+
],
15+
deps = [
16+
"//src/main/java/com/google/api/generator/engine/ast",
17+
"//src/main/java/com/google/api/generator/gapic/composer/resourcename",
18+
"//src/main/java/com/google/api/generator/gapic/model",
19+
"//src/main/java/com/google/api/generator/gapic/utils",
20+
"@com_google_googleapis//google/longrunning:longrunning_java_proto",
21+
"@com_google_guava_guava//jar",
22+
"@com_google_protobuf//java/core",
23+
"@google_java_format_all_deps//jar",
24+
],
25+
)

src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java renamed to src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.api.generator.gapic.composer;
15+
package com.google.api.generator.gapic.composer.defaultvalue;
1616

1717
import com.google.api.generator.engine.ast.ConcreteReference;
1818
import com.google.api.generator.engine.ast.Expr;
@@ -24,6 +24,7 @@
2424
import com.google.api.generator.engine.ast.ValueExpr;
2525
import com.google.api.generator.engine.ast.Variable;
2626
import com.google.api.generator.engine.ast.VariableExpr;
27+
import com.google.api.generator.gapic.composer.resourcename.ResourceNameTokenizer;
2728
import com.google.api.generator.gapic.model.Field;
2829
import com.google.api.generator.gapic.model.Message;
2930
import com.google.api.generator.gapic.model.MethodArgument;
@@ -49,7 +50,7 @@ public class DefaultValueComposer {
4950
private static TypeNode BYTESTRING_TYPE =
5051
TypeNode.withReference(ConcreteReference.withClazz(ByteString.class));
5152

52-
static Expr createDefaultValue(
53+
public static Expr createDefaultValue(
5354
MethodArgument methodArg, Map<String, ResourceName> resourceNames) {
5455
if (methodArg.isResourceNameHelper()) {
5556
Preconditions.checkState(
@@ -78,7 +79,7 @@ static Expr createDefaultValue(
7879
Field.builder().setName(methodArg.name()).setType(methodArg.type()).build());
7980
}
8081

81-
static Expr createDefaultValue(Field f) {
82+
public static Expr createDefaultValue(Field f) {
8283
return createDefaultValue(f, false);
8384
}
8485

@@ -154,7 +155,7 @@ static Expr createDefaultValue(Field f, boolean useExplicitInitTypeInGenerics) {
154155
"Default value for field %s with type %s not implemented yet.", f.name(), f.type()));
155156
}
156157

157-
static Expr createDefaultValue(
158+
public static Expr createDefaultValue(
158159
ResourceName resourceName, List<ResourceName> resnames, String fieldOrMessageName) {
159160
boolean hasOnePattern = resourceName.patterns().size() == 1;
160161
if (resourceName.isOnlyWildcard()) {
@@ -224,7 +225,7 @@ static Expr createDefaultValue(
224225
.build();
225226
}
226227

227-
static Expr createSimpleMessageBuilderExpr(
228+
public static Expr createSimpleMessageBuilderExpr(
228229
Message message, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes) {
229230
MethodInvocationExpr builderExpr =
230231
MethodInvocationExpr.builder()
@@ -275,7 +276,7 @@ static Expr createSimpleMessageBuilderExpr(
275276
.build();
276277
}
277278

278-
static Expr createSimpleOperationBuilderExpr(String name, VariableExpr responseExpr) {
279+
public static Expr createSimpleOperationBuilderExpr(String name, VariableExpr responseExpr) {
279280
Expr operationExpr =
280281
MethodInvocationExpr.builder()
281282
.setStaticReferenceType(OPERATION_TYPE)
@@ -313,7 +314,7 @@ static Expr createSimpleOperationBuilderExpr(String name, VariableExpr responseE
313314
.build();
314315
}
315316

316-
static Expr createSimplePagedResponse(
317+
public static Expr createSimplePagedResponse(
317318
TypeNode responseType, String repeatedFieldName, Expr responseElementVarExpr) {
318319
Expr pagedResponseExpr =
319320
MethodInvocationExpr.builder()

‎src/main/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
load("@rules_java//java:defs.bzl", "java_library")
2+
3+
package(default_visibility = ["//visibility:public"])
4+
5+
filegroup(
6+
name = "resourcename_files",
7+
srcs = glob(["*.java"]),
8+
)
9+
10+
java_library(
11+
name = "resourcename",
12+
srcs = [
13+
":resourcename_files",
14+
],
15+
deps = [
16+
"//src/main/java/com/google/api/generator/engine/ast",
17+
"//src/main/java/com/google/api/generator/gapic/composer/comment",
18+
"//src/main/java/com/google/api/generator/gapic/composer/store",
19+
"//src/main/java/com/google/api/generator/gapic/model",
20+
"//src/main/java/com/google/api/generator/gapic/utils",
21+
"@com_google_api_api_common",
22+
"@com_google_guava_guava",
23+
"@javax_annotation_javax_annotation_api",
24+
],
25+
)

src/main/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposer.java renamed to src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.api.generator.gapic.composer;
15+
package com.google.api.generator.gapic.composer.resourcename;
1616

1717
import com.google.api.core.BetaApi;
1818
import com.google.api.generator.engine.ast.AnnotationNode;

src/main/java/com/google/api/generator/gapic/composer/ResourceNameTokenizer.java renamed to src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.api.generator.gapic.composer;
15+
package com.google.api.generator.gapic.composer.resourcename;
1616

1717
import com.google.api.pathtemplate.PathTemplate;
1818
import com.google.common.base.Preconditions;
@@ -32,7 +32,7 @@ public class ResourceNameTokenizer {
3232

3333
private static final String NON_SLASH_SEP_REGEX = "\\}(_|\\-|\\.|~)\\{";
3434

35-
static List<List<String>> parseTokenHierarchy(List<String> patterns) {
35+
public static List<List<String>> parseTokenHierarchy(List<String> patterns) {
3636
List<List<String>> tokenHierachies = new ArrayList<>();
3737
for (String pattern : patterns) {
3838
List<String> hierarchy = new ArrayList<>();

‎src/test/java/com/google/api/generator/engine/writer/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ filegroup(
2222
"//src/test/java/com/google/api/generator/testutils",
2323
"@com_google_guava_guava//jar",
2424
"@com_google_truth_truth//jar",
25+
"@javax_annotation_javax_annotation_api",
2526
"@junit_junit//jar",
2627
],
2728
) for test_name in TESTS]

‎src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ UPDATE_GOLDENS_TESTS = [
1010
"GrpcServiceStubClassComposerTest",
1111
"MockServiceClassComposerTest",
1212
"MockServiceImplClassComposerTest",
13-
"ResourceNameHelperClassComposerTest",
1413
"ServiceClientClassComposerTest",
1514
"ServiceClientTestClassComposerTest",
1615
"ServiceSettingsClassComposerTest",
@@ -19,8 +18,6 @@ UPDATE_GOLDENS_TESTS = [
1918
]
2019

2120
TESTS = UPDATE_GOLDENS_TESTS + [
22-
"DefaultValueComposerTest",
23-
"ResourceNameTokenizerTest",
2421
"RetrySettingsComposerTest",
2522
]
2623

@@ -36,8 +33,10 @@ TEST_DEPS = [
3633
"//src/test/java/com/google/api/generator/testutils",
3734
"//src/main/java/com/google/api/generator/gapic/model",
3835
"//src/main/java/com/google/api/generator/gapic/protoparser",
36+
"//src/main/java/com/google/api/generator/gapic/composer/defaultvalue",
3937
"//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto",
4038
"//src/test/java/com/google/api/generator/gapic/testdata:testgapic_java_proto",
39+
"//src/test/java/com/google/api/generator/gapic/composer/constants",
4140
"@com_google_api_gax_java//gax",
4241
"@com_google_googleapis//google/logging/v2:logging_java_proto",
4342
"@com_google_googleapis//google/pubsub/v1:pubsub_java_proto",
@@ -71,7 +70,6 @@ java_proto_library(
7170
name = test_name,
7271
srcs = [
7372
"{0}.java".format(test_name),
74-
"ComposerConstants.java",
7573
],
7674
data = [
7775
"//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."
9189
name = "{0}_update".format(test_name),
9290
srcs = [
9391
"{0}.java".format(test_name),
94-
"ComposerConstants.java",
9592
],
9693
data = [
9794
"//src/test/java/com/google/api/generator/gapic/composer/goldens:goldens_files",

0 commit comments

Comments
 (0)