support sub directories in maven client plugin

Author: RobpMobX

integration/maven-plugin-integration-tests/integration/generate-client/src/main/resources/subDir/SubDirQuery.graphql

@@ -0,0 +1,11 @@
+query subDirQuery {
+    enumQuery
+    scalarQuery {
+        count
+        custom
+        id
+        name
+        rating
+        valid
+    }
+}

integration/maven-plugin-integration-tests/integration/generate-client/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateClientMojoTest.kt

@@ -29,5 +29,7 @@ class GenerateClientMojoTest {
         assertTrue(queryFilePath.toFile().exists(), "graphql client query file was generated")
         val typeAliasesFilePath = Paths.get(buildDirectory, "generated-sources", "graphql", "com", "expediagroup", "graphql", "plugin", "generated", "GraphQLTypeAliases.kt")
         assertTrue(typeAliasesFilePath.toFile().exists(), "graphql client type aliases were generated")
+        val queryFilePathSubDir = Paths.get(buildDirectory, "generated-sources", "graphql", "com", "expediagroup", "graphql", "plugin", "generated", "SubDirQuery.kt")
+        assertTrue(queryFilePathSubDir.toFile().exists(), "graphql client query sub dir file was generated")
     }
 }

plugins/graphql-kotlin-maven-plugin/README.md

@@ -110,7 +110,7 @@ Generate GraphQL client code based on the provided GraphQL schema and target que
 | `customScalars` | List<CustomScalar> | | Custom GraphQL scalar to converter mapping containing information about corresponding Java type and converter that should be used to serialize/deserialize values. |
 | `outputDirectory` | File | | Target directory where to store generated files.<br/>**Default value is**: `${project.build.directory}/generated-sources/graphql` |
 | `packageName` | String | yes | Target package name for generated code.<br/>**User property is**: `graphql.packageName`. |
-| `queryFileDirectory` | File | | Directory file containing GraphQL queries. Instead of specifying a directory you can also specify list of query file by using `queryFiles` property instead.<br/>**Default value is:** `src/main/resources`. |
+| `queryFileDirectory` | File | | Directory file containing GraphQL queries. They are resolved recursively. Instead of specifying a directory you can also specify list of query file by using `queryFiles` property instead.<br/>**Default value is:** `src/main/resources`. |
 | `queryFiles` | List<File> | | List of query files to be processed. Instead of a list of files to be processed you can also specify `queryFileDirectory` directory containing all the files. If this property is specified it will take precedence over the corresponding directory property. |
 | `serializer` | GraphQLSerializer | | JSON serializer that will be used to generate the data classes.<br/>**Default value is:** `GraphQLSerializer.JACKSON`. |
 | `schemaFile` | String | | GraphQL schema file that will be used to generate client code.<br/>**Default value is**: `${project.build.directory}/schema.graphql`<br/>**User property is**: `graphql.schemaFile`. |

plugins/graphql-kotlin-maven-plugin/src/main/kotlin/com/expediagroup/graphql/plugin/maven/GenerateClientAbstractMojo.kt

@@ -150,7 +150,7 @@ abstract class GenerateClientAbstractMojo : AbstractMojo() {
     }
 
     private fun locateQueryFiles(files: List<File>?, directory: File): List<File> {
-        val targetQueryFiles: List<File> = files ?: directory.listFiles { file -> file.extension == "graphql" }?.toList() ?: throw RuntimeException("exception while looking up the query files")
+        val targetQueryFiles: List<File> = files ?: directory.walkBottomUp().filter { file -> file.extension == "graphql" }.toList()
         if (targetQueryFiles.isEmpty()) {
             throw RuntimeException("no query files specified")
         }