Improve error reporting if outputDirectory is not set

fixes #15
unbroken-dome · Jun 7, 2019 · be63ad7 · be63ad7
1 parent b11c641
commit be63ad7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/groovy/org/unbrokendome/gradle/plugins/xjc/XjcGenerate.groovy b/src/main/groovy/org/unbrokendome/gradle/plugins/xjc/XjcGenerate.groovy
@@ -22,7 +22,7 @@ class XjcGenerate extends SourceTask {
 
     private static final Pattern LOCALE_PATTERN = ~/(?<language>\p{Alpha}{2,3})(-(?<region>\p{Alpha}{2}|\d{3}))?/
 
-    @Internal('Represented as part of packageOutputDirectory')
+    @Input
     File outputDirectory
 
     @InputFiles
@@ -114,9 +114,14 @@ class XjcGenerate extends SourceTask {
 
     @OutputDirectory
     @CheckForNull
+    @Optional
     File getPackageOutputDirectory() {
+
         File baseOutputDirectory = getOutputDirectory()
-        if (targetPackage == null) {
+
+        if (baseOutputDirectory == null) {
+            return null
+        } else if (targetPackage == null) {
             return baseOutputDirectory
         } else {
             String targetPackagePath = targetPackage.replace('.' as char, File.separatorChar)