Skip to content

Commit e81d781

Browse files
vam-googlevam-google
committed
chore: Address PR feedback.
Mainly introduce TransportContex and all related stuff.
1 parent 052ffb7 commit e81d781

6 files changed

Lines changed: 38 additions & 17 deletions

File tree

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private static List<CommentStatement> createClassHeaderComments(
140140
classType);
141141
}
142142

143-
private List<AnnotationNode> createClassAnnotations(Service service) {
143+
private static List<AnnotationNode> createClassAnnotations(Service service) {
144144
List<AnnotationNode> annotations = new ArrayList<>();
145145
if (!PackageChecker.isGaApi(service.pakkage())) {
146146
annotations.add(AnnotationNode.withType(FIXED_TYPESTORE.get("BetaApi")));
@@ -158,7 +158,7 @@ private List<AnnotationNode> createClassAnnotations(Service service) {
158158
return annotations;
159159
}
160160

161-
protected List<MethodDefinition> createClassMethods(
161+
private static List<MethodDefinition> createClassMethods(
162162
TransportContext transportContext, Service service, TypeStore typeStore) {
163163
List<MethodDefinition> javaMethods = new ArrayList<>();
164164
javaMethods.addAll(createSettingsGetterMethods(service, typeStore));
@@ -169,7 +169,7 @@ protected List<MethodDefinition> createClassMethods(
169169
return javaMethods;
170170
}
171171

172-
private MethodDefinition createConstructorMethod(Service service, TypeStore typeStore) {
172+
private static MethodDefinition createConstructorMethod(Service service, TypeStore typeStore) {
173173
VariableExpr settingsBuilderVarExpr =
174174
VariableExpr.withVariable(
175175
Variable.builder()
@@ -193,7 +193,7 @@ private MethodDefinition createConstructorMethod(Service service, TypeStore type
193193
}
194194

195195
// TODO(miraleung): Consider merging this with createNestedBuilderSettingsGetterMethods.
196-
private List<MethodDefinition> createSettingsGetterMethods(Service service, TypeStore typeStore) {
196+
private static List<MethodDefinition> createSettingsGetterMethods(Service service, TypeStore typeStore) {
197197
TypeNode stubSettingsType = typeStore.get(ClassNames.getServiceStubSettingsClassName(service));
198198
BiFunction<TypeNode, String, MethodDefinition.Builder> methodMakerFn =
199199
(retType, javaMethodName) ->
@@ -252,7 +252,7 @@ private List<MethodDefinition> createSettingsGetterMethods(Service service, Type
252252
return javaMethods;
253253
}
254254

255-
private MethodDefinition createCreatorMethod(Service service, TypeStore typeStore) {
255+
private static MethodDefinition createCreatorMethod(Service service, TypeStore typeStore) {
256256
TypeNode stubClassType = typeStore.get(ClassNames.getServiceStubSettingsClassName(service));
257257
VariableExpr stubVarExpr =
258258
VariableExpr.withVariable(
@@ -295,7 +295,7 @@ private MethodDefinition createCreatorMethod(Service service, TypeStore typeStor
295295
.build();
296296
}
297297

298-
protected List<MethodDefinition> createDefaultGetterMethods(
298+
private static List<MethodDefinition> createDefaultGetterMethods(
299299
TransportContext transportContext, Service service, TypeStore typeStore) {
300300
BiFunction<String, TypeNode, MethodDefinition.Builder> methodStarterFn =
301301
(mName, retType) ->
@@ -375,7 +375,7 @@ protected List<MethodDefinition> createDefaultGetterMethods(
375375
return javaMethods;
376376
}
377377

378-
private List<MethodDefinition> createBuilderHelperMethods(Service service, TypeStore typeStore) {
378+
private static List<MethodDefinition> createBuilderHelperMethods(Service service, TypeStore typeStore) {
379379
TypeNode builderType = typeStore.get(BUILDER_CLASS_NAME);
380380
MethodDefinition newBuilderMethodOne =
381381
MethodDefinition.builder()
@@ -433,7 +433,7 @@ private List<MethodDefinition> createBuilderHelperMethods(Service service, TypeS
433433
return Arrays.asList(newBuilderMethodOne, newBuilderMethodTwo, toBuilderMethod);
434434
}
435435

436-
private ClassDefinition createNestedBuilderClass(Service service, TypeStore typeStore) {
436+
private static ClassDefinition createNestedBuilderClass(Service service, TypeStore typeStore) {
437437
return ClassDefinition.builder()
438438
.setHeaderCommentStatements(
439439
SettingsCommentComposer.createBuilderClassComment(
@@ -457,7 +457,7 @@ private ClassDefinition createNestedBuilderClass(Service service, TypeStore type
457457
.build();
458458
}
459459

460-
private List<MethodDefinition> createNestedBuilderClassMethods(
460+
private static List<MethodDefinition> createNestedBuilderClassMethods(
461461
Service service, TypeStore typeStore) {
462462
List<MethodDefinition> javaMethods = new ArrayList<>();
463463
javaMethods.addAll(createNestedBuilderConstructorMethods(service, typeStore));
@@ -469,7 +469,7 @@ private List<MethodDefinition> createNestedBuilderClassMethods(
469469
return javaMethods;
470470
}
471471

472-
private List<MethodDefinition> createNestedBuilderConstructorMethods(
472+
private static List<MethodDefinition> createNestedBuilderConstructorMethods(
473473
Service service, TypeStore typeStore) {
474474
TypeNode builderType = typeStore.get(BUILDER_CLASS_NAME);
475475
MethodDefinition noArgCtor =
@@ -567,7 +567,7 @@ private static MethodDefinition createNestedBuilderCreatorMethod(
567567
.build();
568568
}
569569

570-
private MethodDefinition createNestedBuilderStubSettingsBuilderMethod(
570+
private static MethodDefinition createNestedBuilderStubSettingsBuilderMethod(
571571
Service service, TypeStore typeStore) {
572572
TypeNode retType = getStubSettingsBuilderType(service);
573573
return MethodDefinition.builder()
@@ -586,7 +586,7 @@ private MethodDefinition createNestedBuilderStubSettingsBuilderMethod(
586586
.build();
587587
}
588588

589-
private MethodDefinition createNestedBuilderApplyToAllUnaryMethod(
589+
private static MethodDefinition createNestedBuilderApplyToAllUnaryMethod(
590590
Service service, TypeStore typeStore) {
591591
TypeNode builderType = typeStore.get(BUILDER_CLASS_NAME);
592592
String javaMethodName = "applyToAllUnaryMethods";
@@ -700,7 +700,7 @@ private static List<MethodDefinition> createNestedBuilderSettingsGetterMethods(
700700
return javaMethods;
701701
}
702702

703-
private MethodDefinition createNestedBuilderClassBuildMethod(
703+
private static MethodDefinition createNestedBuilderClassBuildMethod(
704704
Service service, TypeStore typeStore) {
705705
TypeNode builderType = typeStore.get(BUILDER_CLASS_NAME);
706706
TypeNode returnType = typeStore.get(ClassNames.getServiceSettingsClassName(service));

‎src/main/java/com/google/api/generator/gapic/model/TransportContext.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,32 @@ public static Transport parse(String name) {
3232

3333
// For AbstractServiceStubClassComposer
3434
public abstract Transport transport();
35+
3536
public abstract Class<?> callSettingsClass();
37+
3638
public abstract TypeNode stubCallableFactoryType();
39+
3740
public abstract Class<?> methodDescriptorClass();
41+
3842
public abstract TypeNode transportOperationsStubType();
3943

4044
// For AbstractServiceSettingsClassComposer
4145
public abstract Class<?> instantiatingChannelProviderClass();
46+
4247
public abstract String defaultTransportProviderBuilderName();
4348

4449
// For AbstractServiceStubSettingsClassComposer
4550
public abstract TypeNode transportChannelType();
51+
4652
public abstract String transportGetterName();
4753

4854
// For AbstractServiceCallableFactoryClassComposer
4955
public abstract TypeNode transportCallSettingsType();
56+
5057
public abstract TypeNode transportCallableFactoryType();
58+
5159
public abstract TypeNode operationsStubType();
60+
5261
public abstract String transportCallSettingsName();
5362

5463
protected static TypeNode classToType(Class<?> clazz) {

‎src/main/java/com/google/api/generator/gapic/protoparser/Parser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import com.google.api.ResourceDescriptor;
1919
import com.google.api.ResourceProto;
2020
import com.google.api.generator.engine.ast.TypeNode;
21+
import com.google.api.generator.gapic.composer.grpc.GrpcContext;
2122
import com.google.api.generator.gapic.model.Field;
2223
import com.google.api.generator.gapic.model.GapicBatchingSettings;
2324
import com.google.api.generator.gapic.model.GapicContext;
2425
import com.google.api.generator.gapic.model.GapicLanguageSettings;
2526
import com.google.api.generator.gapic.model.GapicLroRetrySettings;
2627
import com.google.api.generator.gapic.model.GapicServiceConfig;
27-
import com.google.api.generator.gapic.composer.grpc.GrpcContext;
2828
import com.google.api.generator.gapic.model.LongrunningOperation;
2929
import com.google.api.generator.gapic.model.Message;
3030
import com.google.api.generator.gapic.model.Method;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ TEST_DEPS = [
1616
"//src/main/java/com/google/api/generator/engine/writer",
1717
"//src/main/java/com/google/api/generator/gapic/composer",
1818
"//src/main/java/com/google/api/generator/gapic/composer/common",
19+
"//src/main/java/com/google/api/generator/gapic/composer/grpc",
1920
"//src/test/java/com/google/api/generator/test/framework:asserts",
2021
"//src/test/java/com/google/api/generator/test/framework:utils",
2122
"//src/main/java/com/google/api/generator/gapic/composer/samplecode",

‎src/test/java/com/google/api/generator/gapic/composer/common/TestProtoLoader.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
import static junit.framework.Assert.assertEquals;
1818
import static junit.framework.Assert.assertTrue;
1919

20+
import com.google.api.generator.gapic.composer.grpc.GrpcContext;
2021
import com.google.api.generator.gapic.model.GapicBatchingSettings;
2122
import com.google.api.generator.gapic.model.GapicContext;
2223
import com.google.api.generator.gapic.model.GapicServiceConfig;
2324
import com.google.api.generator.gapic.model.Message;
2425
import com.google.api.generator.gapic.model.ResourceName;
2526
import com.google.api.generator.gapic.model.Service;
27+
import com.google.api.generator.gapic.model.TransportContext;
2628
import com.google.api.generator.gapic.protoparser.BatchingSettingsConfigParser;
2729
import com.google.api.generator.gapic.protoparser.Parser;
2830
import com.google.api.generator.gapic.protoparser.ServiceConfigParser;
@@ -50,11 +52,14 @@
5052

5153
public class TestProtoLoader {
5254
private static final TestProtoLoader INSTANCE =
53-
new TestProtoLoader("src/test/java/com/google/api/generator/gapic/testdata/");
55+
new TestProtoLoader(
56+
GrpcContext.instance(), "src/test/java/com/google/api/generator/gapic/testdata/");
5457
private final String testFilesDirectory;
58+
private final TransportContext transportContext;
5559

56-
protected TestProtoLoader(String testFilesDirectory) {
60+
protected TestProtoLoader(TransportContext transportContext, String testFilesDirectory) {
5761
this.testFilesDirectory = testFilesDirectory;
62+
this.transportContext = transportContext;
5863
}
5964

6065
public static TestProtoLoader instance() {
@@ -85,6 +90,7 @@ public GapicContext parseDeprecatedService() {
8590
.setServices(services)
8691
.setServiceConfig(config)
8792
.setHelperResourceNames(outputResourceNames)
93+
.setTransportContext(transportContext)
8894
.build();
8995
}
9096

@@ -112,6 +118,7 @@ public GapicContext parseShowcaseEcho() {
112118
.setServices(services)
113119
.setServiceConfig(config)
114120
.setHelperResourceNames(outputResourceNames)
121+
.setTransportContext(transportContext)
115122
.build();
116123
}
117124

@@ -132,6 +139,7 @@ public GapicContext parseShowcaseIdentity() {
132139
.setResourceNames(resourceNames)
133140
.setServices(services)
134141
.setHelperResourceNames(outputResourceNames)
142+
.setTransportContext(transportContext)
135143
.build();
136144
}
137145

@@ -156,6 +164,7 @@ public GapicContext parseShowcaseTesting() {
156164
.setResourceNames(resourceNames)
157165
.setServices(services)
158166
.setHelperResourceNames(outputResourceNames)
167+
.setTransportContext(transportContext)
159168
.build();
160169
}
161170

@@ -198,6 +207,7 @@ public GapicContext parsePubSubPublisher() {
198207
.setServices(services)
199208
.setServiceConfig(config)
200209
.setHelperResourceNames(outputResourceNames)
210+
.setTransportContext(transportContext)
201211
.build();
202212
}
203213

@@ -252,6 +262,7 @@ public GapicContext parseLogging() {
252262
.setServices(services)
253263
.setServiceConfig(config)
254264
.setHelperResourceNames(outputResourceNames)
265+
.setTransportContext(transportContext)
255266
.build();
256267
}
257268

‎src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcTestProtoLoader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class GrpcTestProtoLoader extends TestProtoLoader {
2020
private static GrpcTestProtoLoader INSTANCE = new GrpcTestProtoLoader();
2121

2222
protected GrpcTestProtoLoader() {
23-
super("src/test/java/com/google/api/generator/gapic/testdata/");
23+
super(GrpcContext.instance(), "src/test/java/com/google/api/generator/gapic/testdata/");
2424
}
2525

2626
public static GrpcTestProtoLoader instance() {

0 commit comments

Comments
 (0)