Skip to content

Commit 0561d5b

Browse files
vam-googlevam-google
committed
chore: Pre-DIREGAPIC Refactoring
1 parent 36bc9ca commit 0561d5b

23 files changed

Lines changed: 80 additions & 1776 deletions

‎BUILD.bazel‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,32 +45,6 @@ java_binary(
4545
],
4646
)
4747

48-
java_binary(
49-
name = "protoc-gen-java_dumper",
50-
main_class = "com.google.api.generator.MainDumper",
51-
runtime_deps = [
52-
"//src/main/java/com/google/api/generator",
53-
"//src/main/java/com/google/api/generator/gapic",
54-
"@com_google_googleapis//google/api:api_java_proto",
55-
"@com_google_googleapis//google/longrunning:longrunning_java_proto",
56-
"@com_google_guava_guava",
57-
"@com_google_protobuf//:protobuf_java",
58-
],
59-
)
60-
61-
java_binary(
62-
name = "protoc-gen-java_gapicfromfile",
63-
main_class = "com.google.api.generator.MainFromFile",
64-
runtime_deps = [
65-
"//src/main/java/com/google/api/generator",
66-
"//src/main/java/com/google/api/generator/gapic",
67-
"@com_google_googleapis//google/api:api_java_proto",
68-
"@com_google_googleapis//google/longrunning:longrunning_java_proto",
69-
"@com_google_guava_guava",
70-
"@com_google_protobuf//:protobuf_java",
71-
],
72-
)
73-
7448
# google-java-format
7549
java_binary(
7650
name = "google_java_format_binary",

‎rules_java_gapic/java_gapic.bzl‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,12 @@ def java_gapic_library(
127127
service_yaml = None,
128128
deps = [],
129129
test_deps = [],
130-
transport = None,
131-
java_generator_name = "java_gapic",
132130
**kwargs):
133131
file_args_dict = {}
134132

135133
if grpc_service_config:
136134
file_args_dict[grpc_service_config] = "grpc-service-config"
137-
elif transport != "rest":
135+
else:
138136
for keyword in NO_GRPC_CONFIG_ALLOWLIST:
139137
if keyword not in name:
140138
fail("Missing a gRPC service config file")
@@ -159,25 +157,21 @@ def java_gapic_library(
159157
srcjar_name = name + "_srcjar"
160158
raw_srcjar_name = srcjar_name + "_raw"
161159
output_suffix = ".srcjar"
162-
opt_args = []
163-
164-
if transport:
165-
opt_args.append("transport=%s" % transport)
166160

167161
# Produces the GAPIC metadata file if this flag is set. to any value.
168162
# Protoc invocation: --java_gapic_opt=metadata
169163
plugin_args = ["metadata"]
170164

165+
_java_generator_name = "java_gapic"
171166
proto_custom_library(
172167
name = raw_srcjar_name,
173168
deps = srcs,
174-
plugin = Label("@gapic_generator_java//:protoc-gen-%s" % java_generator_name),
169+
plugin = Label("@gapic_generator_java//:protoc-gen-%s" % _java_generator_name),
175170
plugin_args = plugin_args,
176171
plugin_file_args = {},
177172
opt_file_args = file_args_dict,
178-
output_type = java_generator_name,
173+
output_type = _java_generator_name,
179174
output_suffix = output_suffix,
180-
opt_args = opt_args,
181175
**kwargs
182176
)
183177

‎src/main/java/com/google/api/generator/MainDumper.java‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/main/java/com/google/api/generator/MainFromFile.java‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ java_library(
2121
"//src/main/java/com/google/api/generator/gapic/composer/common",
2222
"//src/main/java/com/google/api/generator/gapic/composer/defaultvalue",
2323
"//src/main/java/com/google/api/generator/gapic/composer/grpc",
24-
"//src/main/java/com/google/api/generator/gapic/composer/httpjson",
2524
"//src/main/java/com/google/api/generator/gapic/composer/resourcename",
2625
"//src/main/java/com/google/api/generator/gapic/composer/samplecode",
2726
"//src/main/java/com/google/api/generator/gapic/composer/store",

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

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,13 @@
2626
import com.google.api.generator.gapic.composer.grpc.ServiceClientTestClassComposer;
2727
import com.google.api.generator.gapic.composer.grpc.ServiceSettingsClassComposer;
2828
import com.google.api.generator.gapic.composer.grpc.ServiceStubSettingsClassComposer;
29-
import com.google.api.generator.gapic.composer.httpjson.HttpJsonServiceCallableFactoryClassComposer;
30-
import com.google.api.generator.gapic.composer.httpjson.HttpJsonServiceStubClassComposer;
3129
import com.google.api.generator.gapic.composer.resourcename.ResourceNameHelperClassComposer;
3230
import com.google.api.generator.gapic.model.GapicClass;
3331
import com.google.api.generator.gapic.model.GapicClass.Kind;
3432
import com.google.api.generator.gapic.model.GapicContext;
3533
import com.google.api.generator.gapic.model.GapicPackageInfo;
3634
import com.google.api.generator.gapic.model.ResourceName;
3735
import com.google.api.generator.gapic.model.Service;
38-
import com.google.api.generator.gapic.model.Transport;
3936
import com.google.common.annotations.VisibleForTesting;
4037
import java.util.ArrayList;
4138
import java.util.List;
@@ -83,20 +80,9 @@ public static List<GapicClass> generateStubClasses(GapicContext context) {
8380
.forEach(
8481
s -> {
8582
clazzes.add(ServiceStubClassComposer.instance().generate(context, s));
86-
if (context.transport() == Transport.REST) {
87-
clazzes.add(
88-
com.google.api.generator.gapic.composer.httpjson
89-
.ServiceStubSettingsClassComposer.instance()
90-
.generate(context, s));
91-
clazzes.add(
92-
HttpJsonServiceCallableFactoryClassComposer.instance().generate(context, s));
93-
clazzes.add(HttpJsonServiceStubClassComposer.instance().generate(context, s));
94-
} else {
95-
clazzes.add(ServiceStubSettingsClassComposer.instance().generate(context, s));
96-
clazzes.add(
97-
GrpcServiceCallableFactoryClassComposer.instance().generate(context, s));
98-
clazzes.add(GrpcServiceStubClassComposer.instance().generate(context, s));
99-
}
83+
clazzes.add(ServiceStubSettingsClassComposer.instance().generate(context, s));
84+
clazzes.add(GrpcServiceCallableFactoryClassComposer.instance().generate(context, s));
85+
clazzes.add(GrpcServiceStubClassComposer.instance().generate(context, s));
10086
});
10187
return clazzes;
10288
}
@@ -108,14 +94,7 @@ public static List<GapicClass> generateClientSettingsClasses(GapicContext contex
10894
.forEach(
10995
s -> {
11096
clazzes.add(ServiceClientClassComposer.instance().generate(context, s));
111-
if (context.transport() == Transport.REST) {
112-
clazzes.add(
113-
com.google.api.generator.gapic.composer.httpjson.ServiceSettingsClassComposer
114-
.instance()
115-
.generate(context, s));
116-
} else {
117-
clazzes.add(ServiceSettingsClassComposer.instance().generate(context, s));
118-
}
97+
clazzes.add(ServiceSettingsClassComposer.instance().generate(context, s));
11998
});
12099
return clazzes;
121100
}
@@ -124,28 +103,15 @@ public static List<GapicClass> generateMockClasses(GapicContext context, List<Se
124103
List<GapicClass> clazzes = new ArrayList<>();
125104
services.forEach(
126105
s -> {
127-
if (context.transport() == Transport.REST) {
128-
// REST transport tests donot not use mock services.
129-
} else {
130-
clazzes.add(MockServiceClassComposer.instance().generate(context, s));
131-
clazzes.add(MockServiceImplClassComposer.instance().generate(context, s));
132-
}
106+
clazzes.add(MockServiceClassComposer.instance().generate(context, s));
107+
clazzes.add(MockServiceImplClassComposer.instance().generate(context, s));
133108
});
134109
return clazzes;
135110
}
136111

137112
public static List<GapicClass> generateTestClasses(GapicContext context) {
138113
return context.services().stream()
139-
.map(
140-
s -> {
141-
if (context.transport() == Transport.REST) {
142-
return com.google.api.generator.gapic.composer.httpjson
143-
.ServiceClientTestClassComposer.instance()
144-
.generate(context, s);
145-
} else {
146-
return ServiceClientTestClassComposer.instance().generate(context, s);
147-
}
148-
})
114+
.map(s -> ServiceClientTestClassComposer.instance().generate(context, s))
149115
.collect(Collectors.toList());
150116
}
151117

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private AnonymousClassExpr createRequestParamsExtractorAnonClass(Method method)
265265
VariableExpr.withVariable(
266266
Variable.builder().setType(method.inputType()).setName("request").build());
267267

268-
for (String httpBindingFieldName : method.httpBindings().pathParameters()) {
268+
for (String httpBindingFieldName : method.httpBindings()) {
269269
// Handle foo.bar cases by descending into the subfields.
270270
MethodInvocationExpr.Builder requestFieldGetterExprBuilder =
271271
MethodInvocationExpr.builder().setExprReferenceExpr(requestVarExpr);

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)