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 7871465b73..eea185b777 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 @@ -370,7 +370,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);