Updated schema generator to support return DataFetcherResult of list …

…of DataFetcherResult (#1338)
ExpediaGroup · Jan 14, 2022 · a747e3d · a747e3d
1 parent fe745dc
commit a747e3d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/...ain/kotlin/com/expediagroup/graphql/generator/internal/types/utils/functionReturnTypes.kt b/...ain/kotlin/com/expediagroup/graphql/generator/internal/types/utils/functionReturnTypes.kt
@@ -42,9 +42,11 @@ import kotlin.reflect.full.createType
  *      CompletableFuture<T>
  *      CompletableFuture<DataFetcherResult<T>>
  *      List<DataFetcherResult<T>>
+ *      DataFetcherResult<List<DataFetcherResult<T>>>
  */
 internal fun getWrappedReturnType(returnType: KType): KType {
     return when {
+        returnType.isSubclassOf(DataFetcherResult::class) && returnType.getTypeOfFirstArgument().isSubclassOf(List::class) -> getWrappedReturnType(returnType.getTypeOfFirstArgument())
         returnType.isSubclassOf(DataFetcherResult::class) -> returnType.getTypeOfFirstArgument()
         returnType.isSubclassOf(Publisher::class) -> { checkTypeForDataFetcherResult(returnType) }
         returnType.isSubclassOf(CompletableFuture::class) -> { checkTypeForDataFetcherResult(returnType) }

diff --git a/...tlin/com/expediagroup/graphql/generator/internal/types/utils/FunctionReturnTypesKtTest.kt b/...tlin/com/expediagroup/graphql/generator/internal/types/utils/FunctionReturnTypesKtTest.kt
@@ -32,6 +32,8 @@ class FunctionReturnTypesKtTest {
         val listOfListString: List<List<String>> = listOf(listOf(string))
         val dataFetcherResult: DataFetcherResult<String> = DataFetcherResult.newResult<String>().data(string).build()
         val listDataFetcherResult: List<DataFetcherResult<String>> = listOf(DataFetcherResult.newResult<String>().data(string).build())
+        val dataFetcherResultListDataFetcherResult: DataFetcherResult<List<DataFetcherResult<String>>> =
+            DataFetcherResult.newResult<List<DataFetcherResult<String>>>().data(listOf(DataFetcherResult.newResult<String>().data(string).build())).build()
         val dataFetcherResultListString: DataFetcherResult<List<String>> = DataFetcherResult.newResult<List<String>>().data(listOf(string)).build()
         val listDataFetcherResultListString: List<DataFetcherResult<List<String>>> = listOf(DataFetcherResult.newResult<List<String>>().data(listOf(string)).build())
         val publisher: Publisher<String> = Flowable.just(string)
@@ -72,6 +74,11 @@ class FunctionReturnTypesKtTest {
         assertEquals(MyClass::listOfListString.returnType, actual = getWrappedReturnType(MyClass::listDataFetcherResultListString.returnType))
     }
 
+    @Test
+    fun `getWrappedReturnType of DataFetcherResult of List of DataFetcherResult`() {
+        assertEquals(MyClass::listOfString.returnType, actual = getWrappedReturnType(MyClass::dataFetcherResultListDataFetcherResult.returnType))
+    }
+
     @Test
     fun `getWrappedReturnType of CompletableFuture`() {
         assertEquals(MyClass::string.returnType, actual = getWrappedReturnType(MyClass::completableFuture.returnType))

diff --git a/...t/kotlin/com/expediagroup/graphql/generator/test/integration/DataFetcherResultListTest.kt b/...t/kotlin/com/expediagroup/graphql/generator/test/integration/DataFetcherResultListTest.kt
@@ -34,6 +34,7 @@ class DataFetcherResultListTest {
         assertEquals("String!", schema.queryType.getFieldDefinition("getString").type.toString())
         assertEquals("String!", schema.queryType.getFieldDefinition("getDataFetcherResultString").type.toString())
         assertEquals("[String!]!", schema.queryType.getFieldDefinition("getListString").type.toString())
+        assertEquals("[String!]!", schema.queryType.getFieldDefinition("getDataFetcherListOfDataFetcherString").type.toString())
     }
 
     class SimpleQuery {
@@ -43,5 +44,8 @@ class DataFetcherResultListTest {
         fun getDataFetcherResultString(): DataFetcherResult<String> =
             DataFetcherResult.newResult<String>().data(string).build()
         fun getListString(): List<DataFetcherResult<String>> = listOf(DataFetcherResult.newResult<String>().data(string).build())
+        fun getDataFetcherListOfDataFetcherString(): DataFetcherResult<List<DataFetcherResult<String>>> = DataFetcherResult.newResult<List<DataFetcherResult<String>>>().data(
+            listOf(DataFetcherResult.newResult<String>().data(string).build())
+        ).build()
     }
 }