Added typeMapping from Upload to MultipartFile. This ensures that the Upload scalar can be used with no additional setup when added to a schema, as is detailed in the documentation. (#529)

* Add typeMapping from Upload scalar to MultipartFile

---------

Co-authored-by: Grace <[email protected]>

Author: gracecding

graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/TypeUtils.kt

@@ -46,7 +46,8 @@ class TypeUtils(private val packageName: String, private val config: CodeGenConf
         "RelayPageInfo" to ClassName.get(PageInfo::class.java),
         "PageInfo" to ClassName.get(PageInfo::class.java),
         "PresignedUrlResponse" to ClassName.get("com.netflix.graphql.types.core.resolvers", "PresignedUrlResponse"),
-        "Header" to ClassName.get("com.netflix.graphql.types.core.resolvers", "PresignedUrlResponse", "Header")
+        "Header" to ClassName.get("com.netflix.graphql.types.core.resolvers", "PresignedUrlResponse", "Header"),
+        "Upload" to ClassName.get("org.springframework.web.multipart", "MultipartFile")
     )
 
     fun qualifyName(name: String): String {

graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinTypeUtils.kt

@@ -46,7 +46,8 @@ class KotlinTypeUtils(private val packageName: String, private val config: CodeG
         "RelayPageInfo" to PageInfo::class.asTypeName(),
         "PageInfo" to PageInfo::class.asTypeName(),
         "PresignedUrlResponse" to "com.netflix.graphql.types.core.resolvers.PresignedUrlResponse".toKtTypeName(),
-        "Header" to "com.netflix.graphql.types.core.resolvers.PresignedUrlResponse.Header".toKtTypeName()
+        "Header" to "com.netflix.graphql.types.core.resolvers.PresignedUrlResponse.Header".toKtTypeName(),
+        "Upload" to "org.springframework.web.multipart.MultipartFile".toKtTypeName()
     )
 
     fun qualifyName(name: String): String {

graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt

@@ -4101,4 +4101,54 @@ It takes a title and such.
         assertThat(dataTypes[0].typeSpec.fieldSpecs[1].type.toString()).contains(basePackageName)
         assertThat(dataTypes[0].typeSpec.fieldSpecs[2].type.toString()).isEqualTo("java.time.LocalDate")
     }
+
+    @Test
+    fun `The Upload scalar typeMapping works by default`() {
+        val schema = """
+            scalar Upload
+            type Person {
+                name: String
+                age: Int
+                uploadFile: Upload
+            }
+        """.trimIndent()
+
+        val (dataTypes) = CodeGen(
+            CodeGenConfig(
+                schemas = setOf(schema),
+                packageName = basePackageName
+            )
+        ).generate()
+
+        assertThat(dataTypes.size).isEqualTo(1)
+        assertThat(dataTypes[0].typeSpec.fieldSpecs[2].type.toString()).isEqualTo("org.springframework.web.multipart.MultipartFile")
+    }
+
+    @Test
+    fun `The default Upload scalar can be overridden`() {
+        val schema = """
+            scalar Upload
+            type Person {
+                name: String
+                age: Int
+                uploadFile: Upload
+            }
+        """.trimIndent()
+
+        val (dataTypes, javaInterfaces) = CodeGen(
+            CodeGenConfig(
+                schemas = setOf(schema),
+                packageName = basePackageName,
+                typeMapping = mapOf(
+                    "Upload" to "java.lang.Integer"
+                )
+            )
+        ).generate()
+
+        // Check that the Person type is generated
+        assertThat(dataTypes.size).isEqualTo(1)
+
+        // Check that the third field of the Person type is an Integer
+        assertThat(dataTypes[0].typeSpec.fieldSpecs[2].type.toString()).isEqualTo("java.lang.Integer")
+    }
 }

graphql-dgs-codegen-gradle/src/test/kotlin/com/netflix/graphql/dgs/CodegenGradlePluginTest.kt

@@ -193,8 +193,11 @@ class CodegenGradlePluginTest {
     }
 
     companion object {
-        const val EXPECTED_PATH = "src/test/resources/test-project/build/graphql/generated/sources/dgs-codegen/com/netflix/testproject/graphql/types/"
-        const val EXPECTED_DEFAULT_PATH = "src/test/resources/test-project/build/generated/sources/dgs-codegen/com/netflix/testproject/graphql/types/"
-        const val EXPECTED_PATH_EMPTY_SCHEMA = "src/test/resources/test-project-no-schema-files/build/graphql/generated/sources/dgs-codegen/com/netflix/testproject/graphql/types/"
+        const val EXPECTED_PATH =
+            "src/test/resources/test-project/build/graphql/generated/sources/dgs-codegen/com/netflix/testproject/graphql/types/"
+        const val EXPECTED_DEFAULT_PATH =
+            "src/test/resources/test-project/build/generated/sources/dgs-codegen/com/netflix/testproject/graphql/types/"
+        const val EXPECTED_PATH_EMPTY_SCHEMA =
+            "src/test/resources/test-project-no-schema-files/build/graphql/generated/sources/dgs-codegen/com/netflix/testproject/graphql/types/"
     }
 }