From 019beeac365fe4313d82d20cbd684f95392fda3c Mon Sep 17 00:00:00 2001 From: Martin Chalupa Date: Wed, 5 Jan 2022 11:28:12 -0800 Subject: [PATCH] Use more specific output directory to avoid conflicts between output directories with other code generating tools (mapstruts) --- .../netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt | 4 ++-- .../kotlin/com/netflix/graphql/dgs/CodegenGradlePluginTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt index 3a45d054e..0f675a01d 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt +++ b/graphql-dgs-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/graphql-dgs-codegen-gradle/src/test/kotlin/com/netflix/graphql/dgs/CodegenGradlePluginTest.kt b/graphql-dgs-codegen-gradle/src/test/kotlin/com/netflix/graphql/dgs/CodegenGradlePluginTest.kt index 5afe72e7d..eaa676934 100644 --- a/graphql-dgs-codegen-gradle/src/test/kotlin/com/netflix/graphql/dgs/CodegenGradlePluginTest.kt +++ b/graphql-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/" } }