Skip to content

Commit b7d9399

Browse files
vam-googlevam-google
authored
chore: fix formatting and formatting validation logic (#768)
1 parent 6d14628 commit b7d9399

24 files changed

Lines changed: 164 additions & 154 deletions

‎BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ JAVA_SRCS = [
1111
"//src/main/java/com/google/api/generator:generator_files",
1212
"//src/main/java/com/google/api/generator/engine:engine_files",
1313
"//src/main/java/com/google/api/generator/gapic:gapic_files",
14+
"//src/main/java/com/google/api/generator/util:util_files",
1415
]
1516

1617
TEST_SRCS = [
1718
"//src/test/java/com/google/api/generator/engine:engine_files",
1819
"//src/test/java/com/google/api/generator/gapic:gapic_files",
20+
"//src/test/java/com/google/api/generator/testutils:testutils_files",
1921
"//src/test/java/com/google/api/generator/util:util_files",
2022
"//src/test/java/com/google/api/generator/test/framework:framework_files",
2123
]

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ filegroup(
77
srcs = glob(["*.java"]) + [
88
"//src/main/java/com/google/api/generator/gapic/composer:composer_files",
99
"//src/main/java/com/google/api/generator/gapic/composer/comment:comment_files",
10+
"//src/main/java/com/google/api/generator/gapic/composer/defaultvalue:defaultvalue_files",
11+
"//src/main/java/com/google/api/generator/gapic/composer/grpc:grpc_files",
12+
"//src/main/java/com/google/api/generator/gapic/composer/resourcename:resourcename_files",
13+
"//src/main/java/com/google/api/generator/gapic/composer/rest:rest_files",
1014
"//src/main/java/com/google/api/generator/gapic/composer/samplecode:samplecode_files",
1115
"//src/main/java/com/google/api/generator/gapic/composer/store:store_files",
16+
"//src/main/java/com/google/api/generator/gapic/composer/utils:utils_files",
1217
"//src/main/java/com/google/api/generator/gapic/model:model_files",
1318
"//src/main/java/com/google/api/generator/gapic/protoparser:protoparser_files",
1419
"//src/main/java/com/google/api/generator/gapic/protowriter:protowriter_files",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2020
import com.google.api.gax.grpc.GrpcTransportChannel;
2121
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
22+
import com.google.api.generator.gapic.composer.common.TransportContext;
2223
import com.google.api.generator.gapic.composer.utils.ClassNames;
2324
import com.google.api.generator.gapic.model.Transport;
24-
import com.google.api.generator.gapic.composer.common.TransportContext;
2525
import com.google.longrunning.stub.GrpcOperationsStub;
2626
import com.google.longrunning.stub.OperationsStub;
2727
import io.grpc.MethodDescriptor;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ protected Statement createMethodDescriptorVariableDecl(
153153
return ExprStatement.withExpr(
154154
AssignmentExpr.builder()
155155
.setVariableExpr(
156-
methodDescriptorVarExpr.toBuilder()
156+
methodDescriptorVarExpr
157+
.toBuilder()
157158
.setIsDecl(true)
158159
.setScope(ScopeNode.PRIVATE)
159160
.setIsStatic(true)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ public GapicClass generate(GapicContext context, Service service) {
9898

9999
// Use the full name java.lang.Object if there is a proto message that is also named "Object".
100100
// Affects GCS.
101-
if (context.messages().keySet().stream().anyMatch(s -> s.equals("Object") || s.endsWith(".Object"))) {
101+
if (context.messages().keySet().stream()
102+
.anyMatch(s -> s.equals("Object") || s.endsWith(".Object"))) {
102103
javaObjectReference =
103104
ConcreteReference.builder().setClazz(Object.class).setUseFullName(true).build();
104105
}
@@ -213,7 +214,8 @@ private static MethodDefinition createSetResponsesMethod(Service service) {
213214
Expr responseAssignExpr =
214215
AssignmentExpr.builder()
215216
.setVariableExpr(
216-
responsesVarExpr.toBuilder()
217+
responsesVarExpr
218+
.toBuilder()
217219
.setExprReferenceExpr(
218220
ValueExpr.withValue(ThisObjectValue.withType(getThisClassType(service))))
219221
.build())

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
import com.google.api.generator.gapic.composer.common.AbstractServiceSettingsClassComposer;
1818

1919
public class ServiceSettingsClassComposer extends AbstractServiceSettingsClassComposer {
20-
private static final ServiceSettingsClassComposer INSTANCE =
21-
new ServiceSettingsClassComposer();
20+
private static final ServiceSettingsClassComposer INSTANCE = new ServiceSettingsClassComposer();
2221

2322
protected ServiceSettingsClassComposer() {
2423
super(GrpcContext.instance());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import com.google.api.generator.engine.ast.ValueExpr;
2929
import com.google.api.generator.engine.ast.Variable;
3030
import com.google.api.generator.engine.ast.VariableExpr;
31-
import com.google.api.generator.gapic.composer.common.AbstractServiceStubSettingsClassComposer;
3231
import com.google.api.generator.gapic.composer.comment.SettingsCommentComposer;
32+
import com.google.api.generator.gapic.composer.common.AbstractServiceStubSettingsClassComposer;
3333
import com.google.api.generator.gapic.composer.store.TypeStore;
3434
import com.google.api.generator.gapic.composer.utils.ClassNames;
3535
import com.google.api.generator.gapic.model.Service;

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@ private static List<Statement> createClassStatements(
200200
// "projects/{project}/locations/{location}/autoscalingPolicies/{autoscaling_policy}");
201201
for (int i = 0; i < patterns.size(); i++) {
202202
VariableExpr varExpr =
203-
templateFinalVarExprs.get(i).toBuilder()
203+
templateFinalVarExprs
204+
.get(i)
205+
.toBuilder()
204206
.setIsDecl(true)
205207
.setScope(ScopeNode.PRIVATE)
206208
.setIsStatic(true)
@@ -224,7 +226,9 @@ private static List<Statement> createClassStatements(
224226
}
225227

226228
memberVars.add(
227-
FIXED_CLASS_VARS.get("fieldValuesMap").toBuilder()
229+
FIXED_CLASS_VARS
230+
.get("fieldValuesMap")
231+
.toBuilder()
228232
.setIsDecl(true)
229233
.setScope(ScopeNode.PRIVATE)
230234
.setIsVolatile(true)
@@ -1603,7 +1607,9 @@ private static ClassDefinition createNestedBuilderClass(
16031607
.setStaticReferenceType(FIXED_TYPESTORE.get("Objects"))
16041608
.setMethodName("equals")
16051609
.setArguments(
1606-
FIXED_CLASS_VARS.get("pathTemplate").toBuilder()
1610+
FIXED_CLASS_VARS
1611+
.get("pathTemplate")
1612+
.toBuilder()
16071613
.setExprReferenceExpr(outerClassVarExpr)
16081614
.build(),
16091615
templateFinalVarExpr)
@@ -1631,7 +1637,8 @@ private static ClassDefinition createNestedBuilderClass(
16311637
AssignmentExpr.builder()
16321638
.setVariableExpr(currClassTokenVarExpr)
16331639
.setValueExpr(
1634-
currClassTokenVarExpr.toBuilder()
1640+
currClassTokenVarExpr
1641+
.toBuilder()
16351642
.setExprReferenceExpr(outerClassVarExpr)
16361643
.build())
16371644
.build());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import com.google.api.generator.gapic.model.Method;
4646
import com.google.api.generator.gapic.model.Service;
4747
import com.google.api.generator.gapic.utils.JavaStyle;
48-
import com.google.common.base.Preconditions;
4948
import com.google.common.collect.ImmutableList;
5049
import java.util.ArrayList;
5150
import java.util.Arrays;
@@ -125,7 +124,8 @@ protected Statement createMethodDescriptorVariableDecl(
125124
return ExprStatement.withExpr(
126125
AssignmentExpr.builder()
127126
.setVariableExpr(
128-
methodDescriptorVarExpr.toBuilder()
127+
methodDescriptorVarExpr
128+
.toBuilder()
129129
.setIsDecl(true)
130130
.setScope(ScopeNode.PRIVATE)
131131
.setIsStatic(true)

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

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,7 @@ protected MethodDefinition createStartStaticServerMethod(
229229
.build();
230230

231231
return MethodDefinition.builder()
232-
.setAnnotations(
233-
Arrays.asList(AnnotationNode.withType(FIXED_TYPESTORE.get("BeforeClass"))))
232+
.setAnnotations(Arrays.asList(AnnotationNode.withType(FIXED_TYPESTORE.get("BeforeClass"))))
234233
.setScope(ScopeNode.PUBLIC)
235234
.setReturnType(TypeNode.VOID)
236235
.setName("startStaticServer")
@@ -247,8 +246,7 @@ protected MethodDefinition createStartStaticServerMethod(
247246
protected MethodDefinition createStopServerMethod(
248247
Service service, Map<String, VariableExpr> classMemberVarExprs) {
249248
return MethodDefinition.builder()
250-
.setAnnotations(
251-
Arrays.asList(AnnotationNode.withType(FIXED_TYPESTORE.get("AfterClass"))))
249+
.setAnnotations(Arrays.asList(AnnotationNode.withType(FIXED_TYPESTORE.get("AfterClass"))))
252250
.setScope(ScopeNode.PUBLIC)
253251
.setIsStatic(true)
254252
.setReturnType(TypeNode.VOID)
@@ -313,8 +311,7 @@ protected List<Statement> constructRpcTestCheckerLogic(
313311
TypeNode.withReference(
314312
ConcreteReference.builder()
315313
.setClazz(List.class)
316-
.setGenerics(
317-
Arrays.asList(TypeNode.STRING.reference()))
314+
.setGenerics(Arrays.asList(TypeNode.STRING.reference()))
318315
.build()))
319316
.setName("actualRequests")
320317
.build());
@@ -353,10 +350,7 @@ protected List<Statement> constructRpcTestCheckerLogic(
353350

354351
VariableExpr apiClientHeaderKeyVarExpr =
355352
VariableExpr.withVariable(
356-
Variable.builder()
357-
.setType(TypeNode.STRING)
358-
.setName("apiClientHeaderKey")
359-
.build());
353+
Variable.builder().setType(TypeNode.STRING).setName("apiClientHeaderKey").build());
360354

361355
AssignmentExpr apiClientHeaderKeyAssignExpr =
362356
AssignmentExpr.builder()
@@ -429,7 +423,6 @@ protected MethodDefinition createStreamingRpcTestMethod(
429423
return null;
430424
}
431425

432-
433426
@Override
434427
protected MethodDefinition createRpcExceptionTestMethod(
435428
Method method,
@@ -513,10 +506,10 @@ protected MethodDefinition createRpcExceptionTestMethod(
513506

514507
@Override
515508
protected List<Statement> createStreamingRpcExceptionTestStatements(
516-
Method method,
517-
Map<String, VariableExpr> classMemberVarExprs,
518-
Map<String, ResourceName> resourceNames,
519-
Map<String, Message> messageTypes) {
509+
Method method,
510+
Map<String, VariableExpr> classMemberVarExprs,
511+
Map<String, ResourceName> resourceNames,
512+
Map<String, Message> messageTypes) {
520513
return Collections.emptyList();
521514
}
522515

0 commit comments

Comments
 (0)