From a3c89f53a5a159be955dc392d74836185a22d5cd Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Tue, 17 Nov 2020 13:29:40 -0800 Subject: [PATCH 1/5] fix: Update LRO initial_retry_delayo o 5s (discussion in doc) --- .../gapic/composer/RetrySettingsComposer.java | 2 +- .../gapic/composer/RetrySettingsComposerTest.java | 2 +- .../gapic/composer/goldens/EchoStubSettings.golden | 2 +- .../goldens/redis/CloudRedisStubSettings.java | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java b/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java index 7f599c9d8b..a1f9acd2d2 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java @@ -60,7 +60,7 @@ public class RetrySettingsComposer { TypeNode.withReference(ConcreteReference.withClazz(StatusCode.Code.class)); // Default values for LongRunningConfig fields. - private static final long LRO_DEFAULT_INITIAL_POLL_DELAY_MILLIS = 20000; + private static final long LRO_DEFAULT_INITIAL_POLL_DELAY_MILLIS = 5000; private static final double LRO_DEFAULT_POLL_DELAY_MULTIPLIER = 1.5; private static final long LRO_DEFAULT_MAX_POLL_DELAY_MILLIS = 45000; private static final long LRO_DEFAULT_TOTAL_POLL_TIMEOUT_MILLS = 86400000; // 24 hours. 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 07fd8bbdc2..476592d4ac 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 @@ -356,7 +356,7 @@ public void lroBuilderExpr() { + "WaitResponse.class))" + ".setMetadataTransformer(ProtoOperationTransformers.MetadataTransformer.create(" + "WaitMetadata.class)).setPollingAlgorithm(OperationTimedPollAlgorithm.create(" - + "RetrySettings.newBuilder().setInitialRetryDelay(Duration.ofMillis(20000L))" + + "RetrySettings.newBuilder().setInitialRetryDelay(Duration.ofMillis(5000L))" + ".setRetryDelayMultiplier(1.5).setMaxRetryDelay(Duration.ofMillis(45000L))" + ".setInitialRpcTimeout(Duration.ZERO).setRpcTimeoutMultiplier(1.0)" + ".setMaxRpcTimeout(Duration.ZERO).setTotalTimeout(Duration.ofMillis(86400000L))" diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoStubSettings.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoStubSettings.golden index 9bb853eee2..1cf711874b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoStubSettings.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoStubSettings.golden @@ -415,7 +415,7 @@ public class EchoStubSettings extends StubSettings { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(5000L)) .setRetryDelayMultiplier(1.5) .setMaxRetryDelay(Duration.ofMillis(45000L)) .setInitialRpcTimeout(Duration.ZERO) diff --git a/test/integration/goldens/redis/CloudRedisStubSettings.java b/test/integration/goldens/redis/CloudRedisStubSettings.java index 0ab9d31bae..5c4955ef25 100644 --- a/test/integration/goldens/redis/CloudRedisStubSettings.java +++ b/test/integration/goldens/redis/CloudRedisStubSettings.java @@ -552,7 +552,7 @@ private static Builder initDefaults(Builder builder) { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(5000L)) .setRetryDelayMultiplier(1.5) .setMaxRetryDelay(Duration.ofMillis(45000L)) .setInitialRpcTimeout(Duration.ZERO) @@ -576,7 +576,7 @@ private static Builder initDefaults(Builder builder) { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(5000L)) .setRetryDelayMultiplier(1.5) .setMaxRetryDelay(Duration.ofMillis(45000L)) .setInitialRpcTimeout(Duration.ZERO) @@ -600,7 +600,7 @@ private static Builder initDefaults(Builder builder) { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(5000L)) .setRetryDelayMultiplier(1.5) .setMaxRetryDelay(Duration.ofMillis(45000L)) .setInitialRpcTimeout(Duration.ZERO) @@ -624,7 +624,7 @@ private static Builder initDefaults(Builder builder) { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(5000L)) .setRetryDelayMultiplier(1.5) .setMaxRetryDelay(Duration.ofMillis(45000L)) .setInitialRpcTimeout(Duration.ZERO) @@ -648,7 +648,7 @@ private static Builder initDefaults(Builder builder) { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(5000L)) .setRetryDelayMultiplier(1.5) .setMaxRetryDelay(Duration.ofMillis(45000L)) .setInitialRpcTimeout(Duration.ZERO) @@ -672,7 +672,7 @@ private static Builder initDefaults(Builder builder) { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(5000L)) .setRetryDelayMultiplier(1.5) .setMaxRetryDelay(Duration.ofMillis(45000L)) .setInitialRpcTimeout(Duration.ZERO) @@ -696,7 +696,7 @@ private static Builder initDefaults(Builder builder) { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(5000L)) .setRetryDelayMultiplier(1.5) .setMaxRetryDelay(Duration.ofMillis(45000L)) .setInitialRpcTimeout(Duration.ZERO) From b4a1ba9c42bcc7232ae9afa09170cd4505508c3f Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Tue, 17 Nov 2020 14:43:50 -0800 Subject: [PATCH 2/5] fix: correct some common typos --- .../ClientLibraryPackageInfoComposer.java | 2 +- .../ResourceNameHelperClassComposer.java | 22 +++++++++---------- .../ServiceClientCommentComposer.java | 2 +- .../ServiceClientTestClassComposer.java | 2 +- .../ServiceStubSettingsClassComposer.java | 6 ++--- .../generator/gapic/protoparser/Parser.java | 2 +- .../ast/AssignmentOperationExprTest.java | 4 ++-- .../engine/ast/JavaDocCommentTest.java | 2 +- .../composer/DefaultValueComposerTest.java | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java index c4332baeb8..32f0c5b0f2 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java @@ -76,7 +76,7 @@ private static CommentStatement createPackageInfoJavadoc(GapicContext context) { javaDocCommentBuilder.addParagraph( String.format("%s %s %s", DIVIDER, javaClientName, DIVIDER)); - // TODO(miraleung): Replace this with a comment converter when we upport CommonMark. + // TODO(miraleung): Replace this with a comment converter when we support CommonMark. if (service.hasDescription()) { String[] descriptionParagraphs = service.description().split("\\n\\n"); for (int i = 0; i < descriptionParagraphs.length; i++) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposer.java index 00c8f03c34..543b297a66 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposer.java @@ -1199,7 +1199,7 @@ private static MethodDefinition createEqualsMethod( Set tokenSet = getTokenSet(tokenHierarchies); Iterator itToken = tokenSet.iterator(); Expr curTokenExpr = - createObjectsEqualsForTokenMethodEpxr( + createObjectsEqualsForTokenMethodExpr( thisValueExpr, thatVariableExpr, Variable.builder() @@ -1208,7 +1208,7 @@ private static MethodDefinition createEqualsMethod( .build()); while (itToken.hasNext()) { Expr nextTokenExpr = - createObjectsEqualsForTokenMethodEpxr( + createObjectsEqualsForTokenMethodExpr( thisValueExpr, thatVariableExpr, Variable.builder() @@ -1252,7 +1252,7 @@ private static MethodDefinition createEqualsMethod( .build(); } - private static MethodInvocationExpr createObjectsEqualsForTokenMethodEpxr( + private static MethodInvocationExpr createObjectsEqualsForTokenMethodExpr( Expr thisExpr, Expr thatExpr, Variable tokenVar) { VariableExpr varThisExpr = VariableExpr.builder().setVariable(tokenVar).setExprReferenceExpr(thisExpr).build(); @@ -1267,7 +1267,7 @@ private static MethodInvocationExpr createObjectsEqualsForTokenMethodEpxr( } private static MethodDefinition createHashCodeMethod(List> tokenHierarchies) { - List asgmtBody = new ArrayList<>(); + List assignmentBody = new ArrayList<>(); // code: int h = 1; Variable hVar = Variable.builder().setType(TypeNode.INT).setName("h").build(); VariableExpr hVarExpr = VariableExpr.builder().setVariable(hVar).build(); @@ -1278,20 +1278,20 @@ private static MethodDefinition createHashCodeMethod(List> tokenHie .setVariableExpr(hVarExpr.toBuilder().setIsDecl(true).build()) .setValueExpr(hValueExpr) .build(); - asgmtBody.add(ExprStatement.withExpr(hAssignmentExpr)); + assignmentBody.add(ExprStatement.withExpr(hAssignmentExpr)); // code: h *= 1000003; // code: h ^= Objects.hashCode(...); ValueExpr numValueExpr = ValueExpr.withValue( PrimitiveValue.builder().setType(TypeNode.INT).setValue("1000003").build()); - AssignmentOperationExpr multiplyAsgmtOpExpr = + AssignmentOperationExpr multiplyAssignmentOpExpr = AssignmentOperationExpr.multiplyAssignmentWithExprs(hVarExpr, numValueExpr); // If it has variants, add the multiply and xor assignment operation exprs for fixedValue. boolean hasVariants = tokenHierarchies.size() > 1; if (hasVariants) { VariableExpr fixedValueVarExpr = FIXED_CLASS_VARS.get("fixedValue"); - asgmtBody.add(ExprStatement.withExpr(multiplyAsgmtOpExpr)); - asgmtBody.add( + assignmentBody.add(ExprStatement.withExpr(multiplyAssignmentOpExpr)); + assignmentBody.add( ExprStatement.withExpr( AssignmentOperationExpr.xorAssignmentWithExprs( hVarExpr, createObjectsHashCodeForVarMethod(fixedValueVarExpr)))); @@ -1307,8 +1307,8 @@ private static MethodDefinition createHashCodeMethod(List> tokenHie .setName(JavaStyle.toLowerCamelCase(token)) .setType(TypeNode.STRING) .build()); - asgmtBody.add(ExprStatement.withExpr(multiplyAsgmtOpExpr)); - asgmtBody.add( + assignmentBody.add(ExprStatement.withExpr(multiplyAssignmentOpExpr)); + assignmentBody.add( ExprStatement.withExpr( AssignmentOperationExpr.xorAssignmentWithExprs( hVarExpr, createObjectsHashCodeForVarMethod(tokenVarExpr)))); @@ -1319,7 +1319,7 @@ private static MethodDefinition createHashCodeMethod(List> tokenHie .setScope(ScopeNode.PUBLIC) .setReturnType(TypeNode.INT) .setName("hashCode") - .setBody(asgmtBody) + .setBody(assignmentBody) .setReturnExpr(hVarExpr) .build(); } diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index 1a0f8f2b0f..dfe76dffa2 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -217,7 +217,7 @@ private static CommentStatement toSimpleComment(String comment) { return CommentStatement.withComment(JavaDocComment.withComment(comment)); } - // TODO(miraleung): Replace this with a comment converter when we upport CommonMark. + // TODO(miraleung): Replace this with a comment converter when we support CommonMark. private static JavaDocComment.Builder processProtobufComment( String rawComment, JavaDocComment.Builder originalCommentBuilder, String firstPattern) { JavaDocComment.Builder commentBuilder = originalCommentBuilder; 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 03033af23c..9e9119032c 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 @@ -657,7 +657,7 @@ private static MethodDefinition createRpcTestMethod( .build()); if (method.isPaged()) { - // Assign the resources variaqble. + // Assign the resources variable. VariableExpr resourcesVarExpr = VariableExpr.withVariable( Variable.builder() diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java index c31bec5317..0c471392b5 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java @@ -433,7 +433,7 @@ private static Expr createPagedListDescriptorAssignExpr( VariableExpr pageSizeVarExpr = VariableExpr.withVariable( Variable.builder().setType(TypeNode.INT).setName("pageSize").build()); - // Re-declare for clarity and easier readeability. + // Re-declare for clarity and easier readability. returnType = method.inputType(); returnExpr = MethodInvocationExpr.builder() @@ -1431,7 +1431,7 @@ private static List createNestedClassConstructorMethods( .setBody(ctorBodyStatements) .build()); - // Third constructor that takes a ServivceStubSettings. + // Third constructor that takes a ServiceStubSettings. TypeNode outerSettingsType = types.get(getThisClassName(service.name())); VariableExpr settingsVarExpr = VariableExpr.withVariable( @@ -1882,7 +1882,7 @@ private static TypeNode getCallSettingsType( : typeMakerFn.apply( isSettingsBuilder ? UnaryCallSettings.Builder.class : UnaryCallSettings.class); - // Streaming takes precendence over paging, as per the monolith's existing behavior. + // Streaming takes precedence over paging, as per the monolith's existing behavior. switch (method.stream()) { case SERVER: callSettingsType = diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java index b46c94cc9d..d3ed868bff 100644 --- a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java +++ b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java @@ -372,7 +372,7 @@ static List parseMethods( .setIsPaged(parseIsPaged(protoMethod, messageTypes)) .build()); - // Any input type that has a resource reference will need a resource name helper calss. + // Any input type that has a resource reference will need a resource name helper class. Message inputMessage = messageTypes.get(inputType.reference().name()); for (Field field : inputMessage.fields()) { if (field.hasResourceReference()) { diff --git a/src/test/java/com/google/api/generator/engine/ast/AssignmentOperationExprTest.java b/src/test/java/com/google/api/generator/engine/ast/AssignmentOperationExprTest.java index a3ef39c4c2..df767ed2f3 100644 --- a/src/test/java/com/google/api/generator/engine/ast/AssignmentOperationExprTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/AssignmentOperationExprTest.java @@ -132,7 +132,7 @@ public void invalidMultiplyAndAssignmentOperationExpr_numericWithBooleanType() { @Test public void invalidMultiplyAndAssignmentOperationExpr_numericWithReferenceType() { - // Swap test case in "invalidMultiplyAndAssignmentOperationExpr_feferencedWithNumericType". + // Swap test case in "invalidMultiplyAndAssignmentOperationExpr_referencedWithNumericType". VariableExpr lhsExpr = createVariableExpr(TypeNode.INT, "x"); VariableExpr rhsExpr = createVariableExpr(TypeNode.STRING, "y"); assertThrows( @@ -470,7 +470,7 @@ public void invalidMultiplyAndAssignmentOperationExpr_doubleBoxedWithNullType() } @Test - public void invalidMultiplyAndAssignmentOperationExpr_doubleBoxedWithOjectType() { + public void invalidMultiplyAndAssignmentOperationExpr_doubleBoxedWithObjectType() { // No need swap test. VariableExpr lhsExpr = createVariableExpr(TypeNode.DOUBLE_OBJECT, "x"); NewObjectExpr rhsExpr = NewObjectExpr.withType(TypeNode.OBJECT); diff --git a/src/test/java/com/google/api/generator/engine/ast/JavaDocCommentTest.java b/src/test/java/com/google/api/generator/engine/ast/JavaDocCommentTest.java index 967b5ad575..3a27c10da9 100644 --- a/src/test/java/com/google/api/generator/engine/ast/JavaDocCommentTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/JavaDocCommentTest.java @@ -172,7 +172,7 @@ public void createJavaDocComment_throwsAndDeprecated() { } @Test - public void createavaDocComment_allComponents() { + public void createJavaDocComment_allComponents() { // No matter what order `setThrows`, `setDeprecated` are called, // They will be printed at the end. And `@param` should be grouped, // they should always be printed right before `@throws` and `@deprecated`. diff --git a/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java index 0c397692b1..c0f67e9946 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java @@ -60,7 +60,7 @@ public void defaultValue_mapField() { writerVisitor.clear(); - // isMap() and isRepeated() will be set by protoc simulataneoulsy, but we check this edge case + // isMap() and isRepeated() will be set by protoc simultaneously, but we check this edge case. // for completeness. field = Field.builder().setName("foobar").setType(TypeNode.STRING).setIsMap(true).build(); expr = DefaultValueComposer.createDefaultValue(field); From 8c9d12dd3bfc323fa381b1a0da7730d6ed4f2633 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Tue, 17 Nov 2020 14:49:16 -0800 Subject: [PATCH 3/5] fix: switch assertEquals (actual,expected) args order in JavaDocCommentTest --- .../generator/engine/ast/JavaDocCommentTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/com/google/api/generator/engine/ast/JavaDocCommentTest.java b/src/test/java/com/google/api/generator/engine/ast/JavaDocCommentTest.java index 3a27c10da9..90a019c795 100644 --- a/src/test/java/com/google/api/generator/engine/ast/JavaDocCommentTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/JavaDocCommentTest.java @@ -25,7 +25,7 @@ public class JavaDocCommentTest { public void createJavaDocComment_basic() { String content = "this is a test comment"; JavaDocComment javaDocComment = JavaDocComment.builder().addComment(content).build(); - assertEquals(javaDocComment.comment(), content); + assertEquals(content, javaDocComment.comment()); } @Test @@ -51,7 +51,7 @@ public void createJavaDocComment_specialCharacter() { + " libraryClient.createShelfCallable().futureCall(request);\n" + "}\n" + "@throws Exception This is an exception."; - assertEquals(javaDocComment.comment(), expected); + assertEquals(expected, javaDocComment.comment()); } @Test @@ -65,7 +65,7 @@ public void createJavaDocComment_sampleCode() { + "
{@code\n"
             + "resource = project/{project}/shelfId/{shelfId}\n"
             + "}
"; - assertEquals(javaDocComment.comment(), expected); + assertEquals(expected, javaDocComment.comment()); } @Test @@ -122,7 +122,7 @@ public void createJavaDocComment_multipleComments() { + "
  • A request object method.\n" + "
  • A callable method.\n" + ""; - assertEquals(javaDocComment.comment(), expected); + assertEquals(expected, javaDocComment.comment()); } @Test @@ -143,7 +143,7 @@ public void createJavaDocComment_multipleParams() { "This is a block comment.\n" + "@param shelfName The name of the shelf where books are published to.\n" + "@param shelfId The shelfId of the shelf where books are published to."; - assertEquals(javaDocComment.comment(), expected); + assertEquals(expected, javaDocComment.comment()); } @Test @@ -168,7 +168,7 @@ public void createJavaDocComment_throwsAndDeprecated() { String expected = "@throws java.lang.RuntimeException if the remote call fails.\n" + "@deprecated Use the {@link ShelfBookName} class instead."; - assertEquals(javaDocComment.comment(), expected); + assertEquals(expected, javaDocComment.comment()); } @Test @@ -219,7 +219,7 @@ public void createJavaDocComment_allComponents() { + "@param shelf The shelf to create.\n" + "@throws com.google.api.gax.rpc.ApiException if the remote call fails.\n" + "@deprecated Use the {@link ArchivedBookName} class instead."; - assertEquals(javaDocComment.comment(), expected); + assertEquals(expected, javaDocComment.comment()); } private static String createLines(int numLines) { From 58d27180f39436282299cc9e99fd82147242a407 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Tue, 17 Nov 2020 15:14:02 -0800 Subject: [PATCH 4/5] fix: switch assertEquals (actual,expected) args order in AST tests --- .../engine/ast/AnonymousClassExprTest.java | 4 +- .../engine/ast/ConcreteReferenceTest.java | 16 ++++---- .../engine/ast/IdentifierNodeTest.java | 2 +- .../generator/engine/ast/IfStatementTest.java | 8 ++-- .../engine/ast/NullObjectValueTest.java | 2 +- .../engine/ast/PrimitiveValueTest.java | 2 +- .../generator/engine/ast/ReferenceTest.java | 8 ++-- .../generator/engine/ast/TernaryExprTest.java | 40 +++++++++---------- .../engine/ast/VaporReferenceTest.java | 18 ++++----- .../generator/engine/ast/VariableTest.java | 4 +- .../engine/ast/WhileStatementTest.java | 6 +-- 11 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java b/src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java index dd7bb8f80a..b53fa9e77b 100644 --- a/src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java @@ -41,7 +41,7 @@ public void validAnonymousClass_basic() { AnonymousClassExpr anonymousClassExpr = AnonymousClassExpr.builder().setType(type).setMethods(Arrays.asList(method)).build(); assertTrue(TypeNode.isReferenceType(anonymousClassExpr.type())); - assertEquals(anonymousClassExpr.type(), type); + assertEquals(type, anonymousClassExpr.type()); } @Test @@ -96,7 +96,7 @@ public void validAnonymousClass_genericAndVariableExpr() { .setMethods(Arrays.asList(method)) .build(); assertTrue(TypeNode.isReferenceType(anonymousClassExpr.type())); - assertEquals(anonymousClassExpr.type(), type); + assertEquals(type, anonymousClassExpr.type()); } @Test diff --git a/src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java b/src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java index 7083cc280b..d45c9bdc37 100644 --- a/src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java @@ -29,7 +29,7 @@ public class ConcreteReferenceTest { @Test public void basicConcreteReference() { Reference reference = ConcreteReference.builder().setClazz(Integer.class).build(); - assertEquals(reference.name(), Integer.class.getSimpleName()); + assertEquals(Integer.class.getSimpleName(), reference.name()); assertFalse(reference.isStaticImport()); } @@ -37,14 +37,14 @@ public void basicConcreteReference() { public void basicConcreteReference_setIsStaticImport() { Reference reference = ConcreteReference.builder().setClazz(Integer.class).setIsStaticImport(true).build(); - assertEquals(reference.name(), Integer.class.getSimpleName()); + assertEquals(Integer.class.getSimpleName(), reference.name()); assertFalse(reference.isStaticImport()); } @Test public void basicConcreteReference_nested() { Reference reference = ConcreteReference.builder().setClazz(Map.Entry.class).build(); - assertEquals(reference.name(), "Map.Entry"); + assertEquals("Map.Entry", reference.name()); assertFalse(reference.isStaticImport()); } @@ -52,7 +52,7 @@ public void basicConcreteReference_nested() { public void basicConcreteReference_nestedAndStaticImport() { Reference reference = ConcreteReference.builder().setClazz(Map.Entry.class).setIsStaticImport(true).build(); - assertEquals(reference.name(), Map.Entry.class.getSimpleName()); + assertEquals(Map.Entry.class.getSimpleName(), reference.name()); assertTrue(reference.isStaticImport()); } @@ -67,7 +67,7 @@ public void parameterizedConcreteReference() { ConcreteReference.withClazz(Integer.class))) .build(); assertEquals(reference.name(), "HashMap"); - assertEquals(reference.fullName(), "java.util.HashMap"); + assertEquals("java.util.HashMap", reference.fullName()); } @Test @@ -91,8 +91,8 @@ public void nestedParameterizedConcreteReference() { .setGenerics(Arrays.asList(outerMapReference)) .build(); assertEquals( - listReference.name(), "List, HashMap>>"); - assertEquals(listReference.fullName(), "java.util.List"); + "List, HashMap>>", listReference.name()); + assertEquals("java.util.List", listReference.fullName()); } @Test @@ -143,7 +143,7 @@ public void isSupertype_nestedGenerics() { @Test public void wildcards() { - assertEquals("?", ConcreteReference.wildcard().name()); + assertEquals(ConcreteReference.wildcard().name(), "?"); assertEquals( "? extends String", ConcreteReference.wildcardWithUpperBound(TypeNode.STRING.reference()).name()); diff --git a/src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java b/src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java index 917ea7df93..b4a7453337 100644 --- a/src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java @@ -113,6 +113,6 @@ private static void assertInvalidIdentifier(String idName) { } private static void assertValidIdentifier(String idName) { - assertEquals(IdentifierNode.builder().setName(idName).build().name(), idName); + assertEquals(idName, IdentifierNode.builder().setName(idName).build().name()); } } diff --git a/src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java b/src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java index f43799b475..46e183d6e0 100644 --- a/src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java @@ -28,7 +28,7 @@ public void validIfStatement_simple() { .setConditionExpr(createConditionExpr("condition")) .setBody(createAssignmentExprList()) .build(); - assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN); + assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type()); } @Test @@ -43,7 +43,7 @@ public void validIfStatement_booleanObjectCondition() { .setConditionExpr(condExpr) .setBody(createAssignmentExprList()) .build(); - assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN); + assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type()); } @Test @@ -60,7 +60,7 @@ public void validIfStatement_elseIfsAndElse() { .addElseIf(thirdCondExpr, createAssignmentExprList()) .setElseBody(createAssignmentExprList()) .build(); - assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN); + assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type()); } @Test @@ -78,7 +78,7 @@ public void validIfStatement_nested() { .setConditionExpr(condExpr) .setBody(Arrays.asList(nestedIfStatement)) .build(); - assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN); + assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type()); } private static List createAssignmentExprList() { diff --git a/src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java b/src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java index 6afe35a5e0..22e3434ea3 100644 --- a/src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java @@ -25,7 +25,7 @@ public class NullObjectValueTest { @Test public void createNullObjectValue_valid() { NullObjectValue nullValue = NullObjectValue.create(); - assertEquals(nullValue.value(), NULL_VALUE); + assertEquals(NULL_VALUE, nullValue.value()); assertThat(nullValue.type()).isEqualTo(TypeNode.NULL); } } diff --git a/src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java b/src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java index 81494a905c..9c2f034d4c 100644 --- a/src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java @@ -49,7 +49,7 @@ public void createPrimitiveValue_unsupported() { private static void assertValidValue(TypeKind typeKind, String value) { TypeNode type = TypeNode.builder().setTypeKind(typeKind).build(); PrimitiveValue primitiveValue = PrimitiveValue.builder().setType(type).setValue(value).build(); - assertEquals(primitiveValue.value(), value); + assertEquals(value, primitiveValue.value()); assertThat(primitiveValue.type()).isEqualTo(type); } diff --git a/src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java b/src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java index daf93c5313..4fb0dca02d 100644 --- a/src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java @@ -45,8 +45,8 @@ public void nestedGenerics_concreteReferenceOuter() { .setGenerics(Arrays.asList(outerMapReference)) .build(); assertEquals( - listReference.name(), "List, HashMap>>"); - assertEquals(listReference.fullName(), "java.util.List"); + "List, HashMap>>", listReference.name()); + assertEquals("java.util.List", listReference.fullName()); } @Test @@ -72,8 +72,8 @@ public void nestedGenerics_vaporReferenceOuter() { .setGenerics(Arrays.asList(outerMapReference)) .build(); assertEquals( - listReference.name(), "List, HashMap>>"); - assertEquals(listReference.fullName(), "java.util.List"); + "List, HashMap>>", listReference.name()); + assertEquals("java.util.List", listReference.fullName()); } @Test diff --git a/src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java b/src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java index 19fa9cfb63..b16fded214 100644 --- a/src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java @@ -37,9 +37,9 @@ public void validTernaryExpr_primitiveType() { .setThenExpr(thenExpr) .setElseExpr(elseExpr) .build(); - assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN); - assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type()); - assertEquals(ternaryExpr.type(), TypeNode.INT); + assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); + assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type()); + assertEquals(TypeNode.INT, ternaryExpr.type()); } @Test @@ -59,9 +59,9 @@ public void validTernaryExpr_objectType() { .setThenExpr(thenExpr) .setElseExpr(elseExpr) .build(); - assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN); - assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type()); - assertEquals(ternaryExpr.type(), TypeNode.STRING); + assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); + assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type()); + assertEquals(TypeNode.STRING, ternaryExpr.type()); } @Test @@ -82,9 +82,9 @@ public void validTernaryExpr_primitiveAndBoxedType() { .setThenExpr(thenExpr) .setElseExpr(elseExpr) .build(); - assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN); - assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type()); - assertEquals(ternaryExpr.type(), TypeNode.INT_OBJECT); + assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); + assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type()); + assertEquals(TypeNode.INT_OBJECT, ternaryExpr.type()); } @Test @@ -106,9 +106,9 @@ public void validTernaryExpr_boxedAndPrimitiveType() { .setThenExpr(thenExpr) .setElseExpr(elseExpr) .build(); - assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN); - assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type()); - assertEquals(ternaryExpr.type(), TypeNode.DOUBLE_OBJECT); + assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); + assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type()); + assertEquals(TypeNode.DOUBLE_OBJECT, ternaryExpr.type()); } @Test @@ -121,8 +121,8 @@ public void validTernaryExpr_objectAndNull() { .setThenExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar"))) .setElseExpr(ValueExpr.withValue(NullObjectValue.create())) .build(); - assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN); - assertEquals(ternaryExpr.type(), TypeNode.STRING); + assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); + assertEquals(TypeNode.STRING, ternaryExpr.type()); } @Test @@ -135,8 +135,8 @@ public void validTernaryExpr_nullAndObject() { .setThenExpr(ValueExpr.withValue(NullObjectValue.create())) .setElseExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar"))) .build(); - assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN); - assertEquals(ternaryExpr.type(), TypeNode.STRING); + assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); + assertEquals(TypeNode.STRING, ternaryExpr.type()); } @Test @@ -151,8 +151,8 @@ public void validTernaryExpr_superAndSubtype() { Variable.builder().setName("anObject").setType(TypeNode.OBJECT).build())) .setElseExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar"))) .build(); - assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN); - assertEquals(ternaryExpr.type(), TypeNode.OBJECT); + assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); + assertEquals(TypeNode.OBJECT, ternaryExpr.type()); } @Test @@ -167,8 +167,8 @@ public void validTernaryExpr_subAndSupertype() { VariableExpr.withVariable( Variable.builder().setName("anObject").setType(TypeNode.OBJECT).build())) .build(); - assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN); - assertEquals(ternaryExpr.type(), TypeNode.OBJECT); + assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); + assertEquals(TypeNode.OBJECT, ternaryExpr.type()); } @Test diff --git a/src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java b/src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java index 042e4b4582..c8a662fdc9 100644 --- a/src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java @@ -26,8 +26,8 @@ public void basic() { String pkg = "com.google.example.examples.library.v1"; String name = "Babbage"; Reference ref = VaporReference.builder().setName(name).setPakkage(pkg).build(); - assertEquals(ref.name(), name); - assertEquals(ref.fullName(), String.format("%s.%s", pkg, name)); + assertEquals(name, ref.name()); + assertEquals(String.format("%s.%s", pkg, name), ref.fullName()); assertFalse(ref.hasEnclosingClass()); assertTrue(ref.isFromPackage(pkg)); assertFalse(ref.isFromPackage("com.google.example.library")); @@ -39,8 +39,8 @@ public void basic_isStaticImport() { String name = "Babbage"; Reference ref = VaporReference.builder().setName(name).setPakkage(pkg).setIsStaticImport(true).build(); - assertEquals(ref.name(), name); - assertEquals(ref.fullName(), String.format("%s.%s", pkg, name)); + assertEquals(name, ref.name()); + assertEquals(String.format("%s.%s", pkg, name), ref.fullName()); assertFalse(ref.hasEnclosingClass()); assertTrue(ref.isFromPackage(pkg)); // isStaticImport is automatically false for non-nested classes. @@ -60,9 +60,9 @@ public void basic_nested() { .setPakkage(pkg) .build(); - assertEquals(ref.name(), "Babbage.Ada.Charles"); + assertEquals("Babbage.Ada.Charles", ref.name()); assertTrue(ref.hasEnclosingClass()); - assertEquals(ref.fullName(), String.format("%s.%s.%s.%s", pkg, "Babbage", "Ada", name)); + assertEquals(String.format("%s.%s.%s.%s", pkg, "Babbage", "Ada", name), ref.fullName()); assertTrue(ref.hasEnclosingClass()); assertTrue(ref.isFromPackage(pkg)); assertFalse(ref.isFromPackage("com.google.example.library")); @@ -81,8 +81,8 @@ public void basic_nestedAndStaticImport() { .setPakkage(pkg) .setIsStaticImport(true) .build(); - assertEquals(ref.name(), name); - assertEquals(ref.fullName(), String.format("%s.%s.%s", pkg, enclosingClassName, name)); + assertEquals(name, ref.name()); + assertEquals(String.format("%s.%s.%s", pkg, enclosingClassName, name), ref.fullName()); assertTrue(ref.hasEnclosingClass()); assertTrue(ref.isFromPackage(pkg)); assertFalse(ref.isFromPackage("com.google.example.library")); @@ -114,6 +114,6 @@ public void enclosingClass() { .setEnclosingClassNames(enclosingName) .build(); assertTrue(ref.hasEnclosingClass()); - assertEquals(ref.fullName(), String.format("%s.%s.%s", pkg, enclosingName, name)); + assertEquals(String.format("%s.%s.%s", pkg, enclosingName, name), ref.fullName()); } } diff --git a/src/test/java/com/google/api/generator/engine/ast/VariableTest.java b/src/test/java/com/google/api/generator/engine/ast/VariableTest.java index d5fbb5b6f6..4f0b6c4743 100644 --- a/src/test/java/com/google/api/generator/engine/ast/VariableTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/VariableTest.java @@ -41,7 +41,7 @@ public void createVariable_setIdentifier() { .setIdentifier(identifierNode) .setName("y") .build(); - assertEquals(variable.name(), "y"); + assertEquals("y", variable.name()); assertThat(variable.type()).isEqualTo(TypeNode.STRING); } @@ -54,7 +54,7 @@ public void createVariable_invalidType() { private static void assertValidVariable(TypeKind typeKind, String name) { TypeNode type = TypeNode.builder().setTypeKind(typeKind).build(); Variable variable = Variable.builder().setType(type).setName(name).build(); - assertEquals(variable.name(), name); + assertEquals(name, variable.name()); assertThat(variable.type()).isEqualTo(type); } diff --git a/src/test/java/com/google/api/generator/engine/ast/WhileStatementTest.java b/src/test/java/com/google/api/generator/engine/ast/WhileStatementTest.java index 72466cf679..ebaedc31ef 100644 --- a/src/test/java/com/google/api/generator/engine/ast/WhileStatementTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/WhileStatementTest.java @@ -29,7 +29,7 @@ public void validWhileStatement_simple() { .setConditionExpr(createConditionExpr("condition")) .setBody(createAssignmentExprList()) .build(); - assertEquals(whileStatement.conditionExpr().type(), TypeNode.BOOLEAN); + assertEquals(TypeNode.BOOLEAN, whileStatement.conditionExpr().type()); } @Test @@ -43,7 +43,7 @@ public void validWhileStatement_booleanObjectCondition() { .setConditionExpr(condExpr) .setBody(createAssignmentExprList()) .build(); - assertEquals(whileStatement.conditionExpr().type(), TypeNode.BOOLEAN); + assertEquals(TypeNode.BOOLEAN, whileStatement.conditionExpr().type()); } @Test @@ -58,7 +58,7 @@ public void validWhileStatement_nested() { .setConditionExpr(createConditionExpr("condition")) .setBody(Arrays.asList(nestedWhileStatement)) .build(); - assertEquals(whileStatement.conditionExpr().type(), TypeNode.BOOLEAN); + assertEquals(TypeNode.BOOLEAN, whileStatement.conditionExpr().type()); } @Test From 7fdee882fa30674a0f0e737611c2fa6901fcb7a8 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Tue, 17 Nov 2020 15:30:01 -0800 Subject: [PATCH 5/5] fix: merge master --- test/integration/goldens/asset/AssetServiceStubSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/goldens/asset/AssetServiceStubSettings.java b/test/integration/goldens/asset/AssetServiceStubSettings.java index c535fa3857..bf1c0e2984 100644 --- a/test/integration/goldens/asset/AssetServiceStubSettings.java +++ b/test/integration/goldens/asset/AssetServiceStubSettings.java @@ -601,7 +601,7 @@ private static Builder initDefaults(Builder builder) { .setPollingAlgorithm( OperationTimedPollAlgorithm.create( RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(20000L)) + .setInitialRetryDelay(Duration.ofMillis(5000L)) .setRetryDelayMultiplier(1.5) .setMaxRetryDelay(Duration.ofMillis(45000L)) .setInitialRpcTimeout(Duration.ZERO)