diff --git a/src/main/java/com/google/api/generator/engine/ast/ValueExpr.java b/src/main/java/com/google/api/generator/engine/ast/ValueExpr.java index e7dd296aa3..9ade6a5d63 100644 --- a/src/main/java/com/google/api/generator/engine/ast/ValueExpr.java +++ b/src/main/java/com/google/api/generator/engine/ast/ValueExpr.java @@ -34,6 +34,10 @@ public static ValueExpr withValue(Value value) { return builder().setValue(value).build(); } + public static ValueExpr createNullExpr() { + return withValue(NullObjectValue.create()); + } + public static Builder builder() { return new AutoValue_ValueExpr.Builder(); } diff --git a/src/main/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposer.java b/src/main/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposer.java index 006f93e248..c2509b2e6c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposer.java @@ -29,7 +29,6 @@ import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; -import com.google.api.generator.engine.ast.NullObjectValue; import com.google.api.generator.engine.ast.PrimitiveValue; import com.google.api.generator.engine.ast.Reference; import com.google.api.generator.engine.ast.RelationalOperationExpr; @@ -205,7 +204,7 @@ private static MethodDefinition createGetRequestBuilderMethod( IfStatement.builder() .setConditionExpr( RelationalOperationExpr.equalToWithExprs( - builderVarExpr, ValueExpr.withValue(NullObjectValue.create()))) + builderVarExpr, ValueExpr.createNullExpr())) .setBody(Arrays.asList(ExprStatement.withExpr(toBuilderExpr))) .setElseBody(Arrays.asList(ExprStatement.withExpr(addAllExpr))) .build())) 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 cd19fd00ee..a791064865 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 @@ -31,7 +31,6 @@ import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; -import com.google.api.generator.engine.ast.NullObjectValue; import com.google.api.generator.engine.ast.PrimitiveValue; import com.google.api.generator.engine.ast.Reference; import com.google.api.generator.engine.ast.RelationalOperationExpr; @@ -288,7 +287,7 @@ private static List createConstructorMethods( boolean hasVariants = tokenHierarchies.size() > 1; List javaMethods = new ArrayList<>(); - final ValueExpr nullExpr = ValueExpr.withValue(NullObjectValue.create()); + final ValueExpr nullExpr = ValueExpr.createNullExpr(); Function assignTokenToNullExpr = t -> AssignmentExpr.builder() @@ -622,8 +621,7 @@ private static MethodDefinition createParseMethod( .build()) .setBody( Arrays.asList( - ExprStatement.withExpr( - ReturnExpr.withExpr(ValueExpr.withValue(NullObjectValue.create()))))) + ExprStatement.withExpr(ReturnExpr.withExpr(ValueExpr.createNullExpr())))) .build()); List formattedStringArgList = Arrays.asList(formattedStringArgExpr); @@ -864,8 +862,7 @@ private static MethodDefinition createToStringListMethod(TypeNode thisClassType) Variable.builder().setName("value").setType(thisClassType).build()); // We use an equality check instead of Objects.isNull() for Java 7 compatibility. Expr isNullCheck = - RelationalOperationExpr.equalToWithExprs( - valueVarExpr, ValueExpr.withValue(NullObjectValue.create())); + RelationalOperationExpr.equalToWithExprs(valueVarExpr, ValueExpr.createNullExpr()); Statement listAddEmptyStringStatement = ExprStatement.withExpr( MethodInvocationExpr.builder() @@ -1002,8 +999,7 @@ private static MethodDefinition createGetFieldValuesMapMethod( .setArguments(ValueExpr.withValue(tokenStrVal), tokenVarExpr) .build(); Expr notNullCheckExpr = - RelationalOperationExpr.notEqualToWithExprs( - tokenVarExpr, ValueExpr.withValue(NullObjectValue.create())); + RelationalOperationExpr.notEqualToWithExprs(tokenVarExpr, ValueExpr.createNullExpr()); tokenIfStatements.add( IfStatement.builder() .setConditionExpr(notNullCheckExpr) @@ -1031,8 +1027,7 @@ private static MethodDefinition createGetFieldValuesMapMethod( // Middle if-block, i.e. `if (fieldValuesMap == null)`. Expr fieldValuesMapNullCheckExpr = - RelationalOperationExpr.equalToWithExprs( - fieldValuesMapVarExpr, ValueExpr.withValue(NullObjectValue.create())); + RelationalOperationExpr.equalToWithExprs(fieldValuesMapVarExpr, ValueExpr.createNullExpr()); IfStatement fieldValuesMapIfStatement = IfStatement.builder() .setConditionExpr(fieldValuesMapNullCheckExpr) @@ -1125,8 +1120,7 @@ private static MethodDefinition createToStringMethod( VariableExpr fixedValueVarExpr = FIXED_CLASS_VARS.get("fixedValue"); // Code: return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap()) Expr fixedValueNullCheck = - RelationalOperationExpr.notEqualToWithExprs( - fixedValueVarExpr, ValueExpr.withValue(NullObjectValue.create())); + RelationalOperationExpr.notEqualToWithExprs(fixedValueVarExpr, ValueExpr.createNullExpr()); MethodInvocationExpr instantiateExpr = MethodInvocationExpr.builder() @@ -1171,8 +1165,7 @@ private static MethodDefinition createEqualsMethod( RelationalOperationExpr oEqualsThisExpr = RelationalOperationExpr.equalToWithExprs(argVarExpr, thisValueExpr); RelationalOperationExpr oNotEqualsNullExpr = - RelationalOperationExpr.notEqualToWithExprs( - argVarExpr, ValueExpr.withValue(NullObjectValue.create())); + RelationalOperationExpr.notEqualToWithExprs(argVarExpr, ValueExpr.createNullExpr()); MethodInvocationExpr getClassMethodInvocationExpr = MethodInvocationExpr.builder().setMethodName("getClass").build(); RelationalOperationExpr getClassEqualsExpr = 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 295dd0d639..e2d0cb4080 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 @@ -30,7 +30,6 @@ import com.google.api.generator.engine.ast.Expr; import com.google.api.generator.engine.ast.ExprStatement; import com.google.api.generator.engine.ast.MethodInvocationExpr; -import com.google.api.generator.engine.ast.NullObjectValue; import com.google.api.generator.engine.ast.PrimitiveValue; import com.google.api.generator.engine.ast.StringObjectValue; import com.google.api.generator.engine.ast.TypeNode; @@ -108,7 +107,7 @@ public static BlockStatement createRetryParamDefinitionsBlock( bodyExprs.add( AssignmentExpr.builder() .setVariableExpr(settingsVarExpr.toBuilder().setIsDecl(true).build()) - .setValueExpr(ValueExpr.withValue(NullObjectValue.create())) + .setValueExpr(ValueExpr.createNullExpr()) .build()); // Build the settings object for each config. diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java index 23b3b5e1d7..e6fec42bd9 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java @@ -40,7 +40,6 @@ import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; -import com.google.api.generator.engine.ast.NullObjectValue; import com.google.api.generator.engine.ast.PrimitiveValue; import com.google.api.generator.engine.ast.Reference; import com.google.api.generator.engine.ast.ReferenceConstructorExpr; @@ -390,7 +389,7 @@ private static List createConstructorMethods( ctorAssignmentExprs.add( AssignmentExpr.builder() .setVariableExpr(settingsVarExpr.toBuilder().setExprReferenceExpr(thisExpr).build()) - .setValueExpr(ValueExpr.withValue(NullObjectValue.create())) + .setValueExpr(ValueExpr.createNullExpr()) .build()); ctorAssignmentExprs.add( AssignmentExpr.builder() @@ -1125,7 +1124,7 @@ private static ClassDefinition createNestedRpcPageClass( .build(); // createEmptyPage method. - ValueExpr nullExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr nullExpr = ValueExpr.createNullExpr(); MethodDefinition createEmptyPageMethod = MethodDefinition.builder() .setScope(ScopeNode.PRIVATE) @@ -1276,7 +1275,7 @@ private static ClassDefinition createNestedRpcFixedSizeCollectionClass( NewObjectExpr.builder() .setType(classType) .setArguments( - ValueExpr.withValue(NullObjectValue.create()), + ValueExpr.createNullExpr(), ValueExpr.withValue( PrimitiveValue.builder().setType(TypeNode.INT).setValue("0").build())) .build()) @@ -1348,7 +1347,7 @@ static MethodInvocationExpr buildNestedSetterInvocationExpr( VariableExpr.withVariable( Variable.builder().setName(argumentName).setType(argumentType).build()); if (argument.isResourceNameHelper()) { - Expr nullExpr = ValueExpr.withValue(NullObjectValue.create()); + Expr nullExpr = ValueExpr.createNullExpr(); Expr isNullCheckExpr = RelationalOperationExpr.equalToWithExprs(argVarExpr, nullExpr); MethodInvocationExpr toStringExpr = MethodInvocationExpr.builder() diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java index 9bdfe9e40f..7e8aec2b25 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java @@ -39,7 +39,6 @@ import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; -import com.google.api.generator.engine.ast.NullObjectValue; import com.google.api.generator.engine.ast.Reference; import com.google.api.generator.engine.ast.ReferenceConstructorExpr; import com.google.api.generator.engine.ast.ScopeNode; @@ -452,7 +451,7 @@ private static List createNestedBuilderConstructorMethods( .setArguments( CastExpr.builder() .setType(staticTypes.get("ClientContext")) - .setExpr(ValueExpr.withValue(NullObjectValue.create())) + .setExpr(ValueExpr.createNullExpr()) .build()) .build()))) .build(); 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 cfb4a0df55..8f9d0730b4 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 @@ -65,7 +65,6 @@ import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; -import com.google.api.generator.engine.ast.NullObjectValue; import com.google.api.generator.engine.ast.Reference; import com.google.api.generator.engine.ast.ReferenceConstructorExpr; import com.google.api.generator.engine.ast.RelationalOperationExpr; @@ -546,8 +545,7 @@ private static Expr createPagedListDescriptorAssignExpr( .setReturnType(returnType) .build(); Expr conditionExpr = - RelationalOperationExpr.equalToWithExprs( - getResponsesListExpr, ValueExpr.withValue(NullObjectValue.create())); + RelationalOperationExpr.equalToWithExprs(getResponsesListExpr, ValueExpr.createNullExpr()); Expr thenExpr = MethodInvocationExpr.builder() .setStaticReferenceType( @@ -1345,7 +1343,7 @@ private static List createNestedClassConstructorMethods( .setArguments( CastExpr.builder() .setType(STATIC_TYPES.get("ClientContext")) - .setExpr(ValueExpr.withValue(NullObjectValue.create())) + .setExpr(ValueExpr.createNullExpr()) .build()) .build()))) .build()); @@ -1597,7 +1595,7 @@ private static MethodDefinition createNestedClassCreateDefaultMethod( .setArguments( CastExpr.builder() .setType(STATIC_TYPES.get("ClientContext")) - .setExpr(ValueExpr.withValue(NullObjectValue.create())) + .setExpr(ValueExpr.createNullExpr()) .build()) .build()) .build())); diff --git a/src/test/java/com/google/api/generator/engine/ast/ArithmeticOperationExprTest.java b/src/test/java/com/google/api/generator/engine/ast/ArithmeticOperationExprTest.java index b582bd77d2..4505064472 100644 --- a/src/test/java/com/google/api/generator/engine/ast/ArithmeticOperationExprTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/ArithmeticOperationExprTest.java @@ -38,7 +38,7 @@ public void concatOperator_validWithNull() { // Type-checking for String variable x and null object value. VariableExpr lhsExpr = VariableExpr.withVariable(Variable.builder().setType(TypeNode.STRING).setName("x").build()); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); ArithmeticOperationExpr.concatWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. } 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 df767ed2f3..64a6077706 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 @@ -349,7 +349,7 @@ public void invalidMultiplyAndAssignmentOperationExpr_floatBoxedWithObjectType() public void invalidMultiplyAndAssignmentOperationExpr_floatBoxedWithNullType() { // No need swap case. VariableExpr lhsExpr = createVariableExpr(TypeNode.FLOAT_OBJECT, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> AssignmentOperationExpr.multiplyAssignmentWithExprs(lhsExpr, rhsExpr)); @@ -463,7 +463,7 @@ public void invalidMultiplyAndAssignmentOperationExpr_doubleBoxedWithReferenceTy public void invalidMultiplyAndAssignmentOperationExpr_doubleBoxedWithNullType() { // No need swap case. VariableExpr lhsExpr = createVariableExpr(TypeNode.DOUBLE_OBJECT, "x"); - ValueExpr valueExprExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr valueExprExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> AssignmentOperationExpr.multiplyAssignmentWithExprs(lhsExpr, valueExprExpr)); @@ -533,7 +533,7 @@ public void invalidMultiplyAndAssignmentOperationExpr_longBoxedWithDoubleType() public void invalidMultiplyAndAssignmentOperationExpr_longBoxedWithNullType() { // Swap test case in "invalidMultiplyAndAssignmentOperationExpr_nullWithLongBoxedType". VariableExpr lhsExpr = createVariableExpr(TypeNode.LONG_OBJECT, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> AssignmentOperationExpr.multiplyAssignmentWithExprs(lhsExpr, rhsExpr)); @@ -715,7 +715,7 @@ public void invalidXorAssignmentOperationExpr_booleanWithReferencedTypes() { public void invalidXorAssignmentOperationExpr_booleanWithNullTypes() { // No valid swap case. VariableExpr lhsExpr = createVariableExpr(TypeNode.BOOLEAN, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> AssignmentOperationExpr.xorAssignmentWithExprs(lhsExpr, rhsExpr)); @@ -894,7 +894,7 @@ public void invalidXorAssignmentOperationExpr_integerWithBooleanTypes() { public void invalidXorAssignmentOperationExpr_integerWithNullTypes() { // No need swap case. VariableExpr lhsExpr = createVariableExpr(TypeNode.INT, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> AssignmentOperationExpr.xorAssignmentWithExprs(lhsExpr, rhsExpr)); @@ -1091,7 +1091,7 @@ public void invalidXorAssignmentOperationExpr_integerBoxedTypeWithBooleanTypes() public void invalidXorAssignmentOperationExpr_integerBoxedWithNullTypes() { // No need swap case. VariableExpr lhsExpr = createVariableExpr(TypeNode.INT_OBJECT, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> AssignmentOperationExpr.xorAssignmentWithExprs(lhsExpr, rhsExpr)); diff --git a/src/test/java/com/google/api/generator/engine/ast/CastExprTest.java b/src/test/java/com/google/api/generator/engine/ast/CastExprTest.java index 163aa5f4b1..f39bff072a 100644 --- a/src/test/java/com/google/api/generator/engine/ast/CastExprTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/CastExprTest.java @@ -36,7 +36,7 @@ public void validCastExpr_basicNull() { VariableExpr variableExpr = VariableExpr.builder().setVariable(variable).build(); CastExpr.builder() .setType(TypeNode.withReference(ConcreteReference.withClazz(Object.class))) - .setExpr(ValueExpr.withValue(NullObjectValue.create())) + .setExpr(ValueExpr.createNullExpr()) .build(); // No exception thrown, so we succeeded. } diff --git a/src/test/java/com/google/api/generator/engine/ast/LogicalOperationExprTest.java b/src/test/java/com/google/api/generator/engine/ast/LogicalOperationExprTest.java index 9ea489ef27..3a54cb2706 100644 --- a/src/test/java/com/google/api/generator/engine/ast/LogicalOperationExprTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/LogicalOperationExprTest.java @@ -99,7 +99,7 @@ public void logicalOr_invalidNullType() { VariableExpr lhsExpr = VariableExpr.withVariable( Variable.builder().setType(TypeNode.BOOLEAN).setName("x").build()); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> LogicalOperationExpr.logicalOrWithExprs(lhsExpr, rhsExpr)); diff --git a/src/test/java/com/google/api/generator/engine/ast/RelationalOperationExprTest.java b/src/test/java/com/google/api/generator/engine/ast/RelationalOperationExprTest.java index fcb999716e..f1b3f1f424 100644 --- a/src/test/java/com/google/api/generator/engine/ast/RelationalOperationExprTest.java +++ b/src/test/java/com/google/api/generator/engine/ast/RelationalOperationExprTest.java @@ -93,7 +93,7 @@ public void notEqualToOperationExpr_invalidNumericNullType() { // Swapping LHS and RHS test case is covered in // "equalToOperationExpr_invalidNullWithNumericType". VariableExpr lhsExpr = createVariableExpr(TypeNode.DOUBLE, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> RelationalOperationExpr.notEqualToWithExprs(lhsExpr, rhsExpr)); @@ -163,7 +163,7 @@ public void equalToOperationExpr_validNumericBoxedWithNullType() { // Swapping LHS and RHS test case is covered in // "equalToOperationExpr_validNullWithNumericBoxedType". VariableExpr lhsExpr = createVariableExpr(TypeNode.FLOAT_OBJECT, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. } @@ -252,7 +252,7 @@ public void notEqualToOperationExpr_validBooleanBoxedToNullType() { // Swapping LHS and RHS test case is covered in // "equalToOperationExpr_validNullWithBooleanBoxedType". VariableExpr lhsExpr = createVariableExpr(TypeNode.BOOLEAN_OBJECT, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. } @@ -310,7 +310,7 @@ public void equalToOperationExpr_invalidBooleanWithNullType() { // Swapping LHS and RHS test case is covered in // "equalToOperationExpr_invalidNullWithBooleanType". VariableExpr lhsExpr = createVariableExpr(TypeNode.BOOLEAN, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr)); @@ -452,7 +452,7 @@ public void equalToOperationExpr_validReferenceWithNullType() { // Swapping LHS and RHS test case is covered in // "equalToOperationExpr_validNullWithReferenceType". VariableExpr lhsExpr = createVariableExpr(TypeNode.STRING, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. } @@ -497,7 +497,7 @@ public void equalToOperationExpr_validAnyReferenceTypeWithNull() { .setPakkage("com.google.api.some.pakkage") .build()); VariableExpr lhsExpr = createVariableExpr(someType, "y"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. } @@ -590,7 +590,7 @@ public void equalToOperationExpr_validNullWithAnyReferenceType() { // LHS: Null type, RHS: any reference type // Swapping LHS and RHS test case is covered in // "equalToOperationExpr_validAnyReferenceTypeWithNull". - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); TypeNode someType = TypeNode.withReference( VaporReference.builder() @@ -607,7 +607,7 @@ public void equalToOperationExpr_validObjectWithNullType() { // LHS: Object, RHS: Null. // Swapping LHS and RHS test case is covered in "equalToOperationExpr_validNullWithObjectType". VariableExpr lhsExpr = createVariableExpr(TypeNode.OBJECT, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. } @@ -617,7 +617,7 @@ public void equalToOperationExpr_validNullWithObjectType() { // LHS: Null, RHS: Object. // Swapping LHS and RHS test case is covered in "equalToOperationExpr_validObjectWithNullType". VariableExpr rhsExpr = createVariableExpr(TypeNode.OBJECT, "x"); - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. } @@ -626,8 +626,8 @@ public void equalToOperationExpr_validNullWithObjectType() { public void equalToOperationExpr_validNullWithNullType() { // LHS: Null, RHS: Null. // No need swap LHS and RHS test case. - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. } @@ -670,7 +670,7 @@ public void equalToOperationExpr_validNullWithReferenceType() { // LHS: Null type, RHS: Reference type. // Swapping LHS and RHS test case is covered in // "equalToOperationExpr_validNullWithReferenceType". - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); VariableExpr rhsExpr = createVariableExpr(TypeNode.STRING, "y"); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. @@ -681,7 +681,7 @@ public void equalToOperationExpr_validNullWithBooleanBoxedType() { // LHS: Object type, RHS: Any Boxed type // Swapping LHS and RHS test case is covered in // "notEqualToOperationExpr_validBooleanBoxedToNullType". - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); VariableExpr rhsExpr = createVariableExpr(TypeNode.BOOLEAN_OBJECT, "y"); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. @@ -692,7 +692,7 @@ public void equalToOperationExpr_validNullWithNumericBoxedType() { // LHS: Object type, RHS: Any Boxed type. // Swapping LHS and RHS test case is covered in // "equalToOperationExpr_validNumericBoxedWithNullType". - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); VariableExpr rhsExpr = createVariableExpr(TypeNode.DOUBLE_OBJECT, "y"); RelationalOperationExpr.equalToWithExprs(lhsExpr, rhsExpr); // No exception thrown, so we succeeded. @@ -716,7 +716,7 @@ public void equalToOperationExpr_invalidNullWithNumericType() { // LHS: Null type, RHS: Nny Numeric type. // Swapping LHS and RHS test case is covered in // "notEqualToOperationExpr_invalidNumericNullType". - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); VariableExpr rhsExpr = createVariableExpr(TypeNode.INT, "y"); assertThrows( IllegalStateException.class, @@ -728,7 +728,7 @@ public void equalToOperationExpr_invalidNullWithBooleanType() { // LHS: Null type, RHS: Boolean type. // Swapping LHS and RHS test case is covered in // "equalToOperationExpr_invalidBooleanWithNullType". - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); VariableExpr rhsExpr = createVariableExpr(TypeNode.BOOLEAN, "y"); assertThrows( IllegalStateException.class, @@ -860,7 +860,7 @@ public void lessThanOperationExpr_invalidNumericTypeWithNullType() { // LHS: Null type, RHS: Numeric type. // Swap case in "lessThanOperationExpr_invalidNumericWithNullType". VariableExpr lhsExpr = createVariableExpr(TypeNode.INT, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> RelationalOperationExpr.lessThanWithExprs(lhsExpr, rhsExpr)); @@ -871,7 +871,7 @@ public void lessThanOperationExpr_invalidNumericBoxedTypeWithNullType() { // LHS: Numeric boxed type, RHS: Null type. // Swap case in "lessThanOperationExpr_invalidNullWithNumericBoxedType". VariableExpr lhsExpr = createVariableExpr(TypeNode.INT_OBJECT, "x"); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); assertThrows( IllegalStateException.class, () -> RelationalOperationExpr.lessThanWithExprs(lhsExpr, rhsExpr)); @@ -947,7 +947,7 @@ public void lessThanOperationExpr_invalidObjectNumericBoxedType() { public void lessThanOperationExpr_invalidNumericWithNullType() { // LHS: Null type, RHS: Numeric box type. - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); VariableExpr rhsExpr = createVariableExpr(TypeNode.INT, "x"); assertThrows( IllegalStateException.class, @@ -958,7 +958,7 @@ public void lessThanOperationExpr_invalidNumericWithNullType() { public void lessThanOperationExpr_invalidNullWithNumericBoxedType() { // LHS: Null type, RHS: Numeric box type. // Swap case in "lessThanOperationExpr_invalidNumericTypeWithNullType". - ValueExpr lhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr lhsExpr = ValueExpr.createNullExpr(); VariableExpr rhsExpr = createVariableExpr(TypeNode.INT_OBJECT, "x"); assertThrows( IllegalStateException.class, 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 b16fded214..9cde2c39d3 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 @@ -119,7 +119,7 @@ public void validTernaryExpr_objectAndNull() { ValueExpr.withValue( PrimitiveValue.builder().setType(TypeNode.BOOLEAN).setValue("false").build())) .setThenExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar"))) - .setElseExpr(ValueExpr.withValue(NullObjectValue.create())) + .setElseExpr(ValueExpr.createNullExpr()) .build(); assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); assertEquals(TypeNode.STRING, ternaryExpr.type()); @@ -132,7 +132,7 @@ public void validTernaryExpr_nullAndObject() { .setConditionExpr( ValueExpr.withValue( PrimitiveValue.builder().setType(TypeNode.BOOLEAN).setValue("false").build())) - .setThenExpr(ValueExpr.withValue(NullObjectValue.create())) + .setThenExpr(ValueExpr.createNullExpr()) .setElseExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar"))) .build(); assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type()); diff --git a/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java b/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java index 595160055e..ad073f560e 100644 --- a/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java +++ b/src/test/java/com/google/api/generator/engine/writer/ImportWriterVisitorTest.java @@ -35,7 +35,6 @@ import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; -import com.google.api.generator.engine.ast.NullObjectValue; import com.google.api.generator.engine.ast.PackageInfoDefinition; import com.google.api.generator.engine.ast.Reference; import com.google.api.generator.engine.ast.ReferenceConstructorExpr; @@ -611,7 +610,7 @@ public void writeArithmeticOperationExprImports() { .setMethodName("getSomething") .setReturnType(TypeNode.STRING) .build(); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); ArithmeticOperationExpr arithmeticOperationExpr = ArithmeticOperationExpr.concatWithExprs(lhsExpr, rhsExpr); arithmeticOperationExpr.accept(writerVisitor); diff --git a/src/test/java/com/google/api/generator/engine/writer/JavaWriterVisitorTest.java b/src/test/java/com/google/api/generator/engine/writer/JavaWriterVisitorTest.java index 1f046c527c..e4b6672642 100644 --- a/src/test/java/com/google/api/generator/engine/writer/JavaWriterVisitorTest.java +++ b/src/test/java/com/google/api/generator/engine/writer/JavaWriterVisitorTest.java @@ -2136,7 +2136,7 @@ public void writeRelationOperationExpr_notEqualTo() { .setStaticReferenceType(someType) .setReturnType(TypeNode.STRING) .build(); - ValueExpr rhsExpr = ValueExpr.withValue(NullObjectValue.create()); + ValueExpr rhsExpr = ValueExpr.createNullExpr(); RelationalOperationExpr notEqualToOperationExpr = RelationalOperationExpr.notEqualToWithExprs(lhsExpr, rhsExpr);