Including language in generated source path

guardrail-dev · Feb 20, 2021 · 2ff6c93 · 2ff6c93
1 parent 471e9c0
commit 2ff6c93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/functionalTest/groovy/com/twilio/guardrail/GuardrailGradlePluginFunctionalTest.groovy b/src/functionalTest/groovy/com/twilio/guardrail/GuardrailGradlePluginFunctionalTest.groovy
@@ -64,8 +64,8 @@ guardrail {
         !result.output.contains("Error")
 
         [
-            file('functionalTest/build/guardrail-petstoreClient'),
-            file('functionalTest/build/guardrail-petstoreServer')
+            file('functionalTest/build/guardrail-sources/scala/com/foobar/generated/petstore/client/pets'),
+            file('functionalTest/build/guardrail-sources/java/com/foobar/generated/petstore/server/pet')
         ].each {
             it.exists()
             it.directorySize() > 0

diff --git a/src/main/groovy/com/twilio/guardrail/GuardrailGen.groovy b/src/main/groovy/com/twilio/guardrail/GuardrailGen.groovy
@@ -15,6 +15,7 @@ class GuardrailGen extends DefaultTask {
 
     @OutputDirectory
     File outputDir
+    private File defaultOutputDir = null
 
     @Input
     @Optional
@@ -55,6 +56,7 @@ class GuardrailGen extends DefaultTask {
 
     GuardrailGen() {
         outputDir = new File(project.buildDir, 'guardrail-sources')
+        defaultOutputDir = outputDir
     }
 
     @TaskAction
@@ -67,7 +69,12 @@ class GuardrailGen extends DefaultTask {
 
         args << "--$kind"
         args << '--specPath' << inputFile.path
-        args << '--outputPath' << outputDir.path
+        // Why do builds need to be able to override this?
+        if (outputDir != defaultOutputDir) {
+            args << '--outputPath' << outputDir.path
+        } else {
+            args << '--outputPath' << new File(outputDir, language).path
+        }
         args << '--packageName' << packageName
 
         if (tracing) {

diff --git a/src/main/groovy/com/twilio/guardrail/GuardrailGradlePlugin.groovy b/src/main/groovy/com/twilio/guardrail/GuardrailGradlePlugin.groovy
@@ -19,8 +19,6 @@ class GuardrailGradlePlugin implements Plugin<Project> {
             guardrail.gen = createGuardrailGen(project, guardrail.name)
 
             project.tasks.guardrail.dependsOn(guardrail.gen)
-
-            guardrail.gen.outputDir = new File(project.buildDir, "guardrail-${guardrail.name}")
         }
     }