fix JavaPoet formating (#4583)

apollographql · Dec 16, 2022 · 4f4ed66 · 4f4ed66
1 parent 76f7f70
commit 4f4ed66
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 16 deletions.
diff --git a/...rc/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/InputObjectBuilder.kt b/...rc/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/InputObjectBuilder.kt
@@ -7,6 +7,7 @@ import com.apollographql.apollo3.compiler.codegen.java.JavaContext
 import com.apollographql.apollo3.compiler.codegen.java.L
 import com.apollographql.apollo3.compiler.codegen.java.helpers.BuilderBuilder
 import com.apollographql.apollo3.compiler.codegen.java.helpers.makeDataClassFromParameters
+import com.apollographql.apollo3.compiler.codegen.java.helpers.maybeAddDescription
 import com.apollographql.apollo3.compiler.codegen.java.helpers.toNamedType
 import com.apollographql.apollo3.compiler.codegen.java.helpers.toParameterSpec
 import com.apollographql.apollo3.compiler.ir.IrInputObject
@@ -40,7 +41,7 @@ internal class InputObjectBuilder(
       TypeSpec
           .classBuilder(simpleName)
           .addModifiers(Modifier.PUBLIC)
-          .applyIf(description?.isNotBlank() == true) { addJavadoc("$L\n", description!!) }
+          .maybeAddDescription(description)
           .makeDataClassFromParameters(fields.map {
             it.toNamedType().toParameterSpec(context)
           })
@@ -54,9 +55,7 @@ internal class InputObjectBuilder(
     } else {
       val builderFields = inputObject.fields.map {
         FieldSpec.builder(context.resolver.resolveIrType(it.type).withoutAnnotations(), context.layout.propertyName(it.name))
-            .applyIf(!it.description.isNullOrBlank()) {
-              addJavadoc(it.description)
-            }
+            .maybeAddDescription(it.description)
             .build()
       }
       return addMethod(BuilderBuilder.builderFactoryMethod())

diff --git a/...ler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/SchemaBuilder.kt b/...ler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/SchemaBuilder.kt
@@ -66,7 +66,7 @@ internal class SchemaBuilder(
 
   private fun typeSpec(): TypeSpec {
     return TypeSpec.classBuilder(generatedSchemaName)
-        .addJavadoc("A Schema object containing all the composite types and a possibleTypes helper function")
+        .addJavadoc(L, "A Schema object containing all the composite types and a possibleTypes helper function")
         .addModifiers(Modifier.PUBLIC)
         .addField(customScalarAdaptersFieldSpec())
         .addField(typesFieldSpec())

diff --git a/...src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/BuilderBuilder.kt b/...src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/BuilderBuilder.kt
@@ -59,7 +59,9 @@ internal class BuilderBuilder(
                 }
                 .build()
         )
-        .addJavadoc(field.javadoc)
+        .applyIf(!field.javadoc.isEmpty) {
+          addJavadoc(L, field.javadoc)
+        }
         .returns(JavaClassNames.Builder)
         .addStatement("this.$L = $L", field.name, context.wrapValueInOptional(value = CodeBlock.of(L, field.name), fieldType = field.type))
         .addStatement("return this")

diff --git a/...ple/input_object_type/java/operationBased/input_object_type/type/ColorInput.java.expected b/...ple/input_object_type/java/operationBased/input_object_type/type/ColorInput.java.expected
diff --git a/...mple/input_object_type/kotlin/responseBased/input_object_type/type/ColorInput.kt.expected b/...mple/input_object_type/kotlin/responseBased/input_object_type/type/ColorInput.kt.expected
diff --git a/...on_create_review/java/operationBased/mutation_create_review/type/ColorInput.java.expected b/...on_create_review/java/operationBased/mutation_create_review/type/ColorInput.java.expected
diff --git a/...ion_create_review/kotlin/responseBased/mutation_create_review/type/ColorInput.kt.expected b/...ion_create_review/kotlin/responseBased/mutation_create_review/type/ColorInput.kt.expected
diff --git a/.../java/operationBased/mutation_create_review_semantic_naming/type/ColorInput.java.expected b/.../java/operationBased/mutation_create_review_semantic_naming/type/ColorInput.java.expected
diff --git a/...g/kotlin/responseBased/mutation_create_review_semantic_naming/type/ColorInput.kt.expected b/...g/kotlin/responseBased/mutation_create_review_semantic_naming/type/ColorInput.kt.expected
diff --git a/libraries/apollo-compiler/src/test/graphql/schema.sdl b/libraries/apollo-compiler/src/test/graphql/schema.sdl
@@ -60,7 +60,9 @@ interface Character {
 
 """The input object sent when passing in a color"""
 input colorInput {
-  """Red color"""
+  """
+  A description with a dollar sign: $10
+  """
   red: Int! = 1
 
   """Green color"""

diff --git a/tests/compiler-hooks/build.gradle.kts b/tests/compiler-hooks/build.gradle.kts
@@ -251,7 +251,7 @@ class PrefixNamesJavaHooks(private val prefix: String) : DefaultApolloCompilerJa
     return when (kind) {
       com.squareup.javapoet.TypeSpec.Kind.CLASS -> {
         com.squareup.javapoet.TypeSpec.classBuilder(name)
-            .addJavadoc(javadoc)
+            .addJavadoc("\$L", javadoc)
             .addAnnotations(annotations)
             .addModifiers(*modifiers.toTypedArray())
             .addTypeVariables(typeVariables)
@@ -267,7 +267,7 @@ class PrefixNamesJavaHooks(private val prefix: String) : DefaultApolloCompilerJa
 
       com.squareup.javapoet.TypeSpec.Kind.ENUM -> {
         com.squareup.javapoet.TypeSpec.enumBuilder(name)
-            .addJavadoc(javadoc)
+            .addJavadoc("\$L", javadoc)
             .addAnnotations(annotations)
             .addModifiers(*modifiers.toTypedArray())
             .addTypeVariables(typeVariables)
@@ -284,7 +284,7 @@ class PrefixNamesJavaHooks(private val prefix: String) : DefaultApolloCompilerJa
 
       com.squareup.javapoet.TypeSpec.Kind.INTERFACE -> {
         com.squareup.javapoet.TypeSpec.interfaceBuilder(name)
-            .addJavadoc(javadoc)
+            .addJavadoc("\$L", javadoc)
             .addAnnotations(annotations)
             .addModifiers(*modifiers.toTypedArray())
             .addTypeVariables(typeVariables)