Merge pull request #310 from chali/MoreSpecificCodegenOutputDir

Use more specific output directory to avoid conflicts between output directories with other code generating tools (mapstruts)
Netflix · Jan 5, 2022 · a7aded5 · a7aded5
2 parents 7aa9014 + 019beea
commit a7aded5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt b/...codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt
@@ -80,12 +80,12 @@ open class GenerateJavaTask : DefaultTask() {
 
     @OutputDirectory
     fun getOutputDir(): File {
-        return Paths.get("$generatedSourcesDir/generated").toFile()
+        return Paths.get("$generatedSourcesDir/generated/sources/dgs-codegen").toFile()
     }
 
     @OutputDirectory
     fun getExampleOutputDir(): File {
-        return Paths.get("$generatedSourcesDir/generated-examples").toFile()
+        return Paths.get("$generatedSourcesDir/generated/sources/dgs-codegen-generated-examples").toFile()
     }
 
     @Input

diff --git a/...hql-dgs-codegen-gradle/src/test/kotlin/com/netflix/graphql/dgs/CodegenGradlePluginTest.kt b/...hql-dgs-codegen-gradle/src/test/kotlin/com/netflix/graphql/dgs/CodegenGradlePluginTest.kt
@@ -115,7 +115,7 @@ class CodegenGradlePluginTest {
     }
 
     companion object {
-        const val EXPECTED_PATH = "src/test/resources/test-project/build/graphql/generated/com/netflix/testproject/graphql/types/"
-        const val EXPECTED_DEFAULT_PATH = "src/test/resources/test-project/build/generated/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/"
     }
 }