bjornvester#8 Support multiple binding files

lkoe · May 19, 2021 · 52b5f97 · 52b5f97
1 parent e1ba046
commit 52b5f97
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Here is a list of all available properties:
 | wsdlDir               | DirectoryProperty     | "$projectDir/src<br>/main/resources"             | The directory holding the WSDL and referenced XSD files to compile.                                                  |
 | includes              | ListProperty\<String> | \["**/*.wsdl"]                                   | The inclusion filer (Ant style) for which WSDLs to include                                                           |
 | generatedSourceDir    | DirectoryProperty     | "$buildDir/generated<br>/sources/wsdl2java/java" | The output directory for the generated Java sources.<br>Note that it will be deleted when running XJC.               |
-| bindingFile           | RegularFileProperty   | \[not set\]                                      | A binding file to use in the schema compiler                                                                         |
+| bindingFiles          | FileCollection        | \[empty\]                                        | Binding files to use in the schema compiler                                                                          |
 | cxfVersion            | Provider\<String>     | "3.4.3"                                          | The version of CXF to use.                                                                                           |
 | verbose               | Provider\<Boolean>    | true                                             | Enables verbose output from CXF.                                                                                     |
 | suppressGeneratedDate | Provider\<Boolean>    | true                                             | Suppresses generating dates in CXF. Default is true to support reproducible builds and to work with the build cache. |
@@ -90,11 +90,12 @@ wsdl2java {
 Note that the directory will be wiped completely on each run, so don't put other source files in it.
 
 ### Configure binding files
-A binding file can be added like this:
+A binding file can be added like this, multiple binding files are supported:
 
 ```kotlin
 wsdl2java {
-    bindingFile.set(layout.projectDirectory.file("src/main/bindings/binding.xjb"))
+    bindingFile("src/main/bindings/binding.xjb")
+    bindingFile("src/main/bindings/another-binding.xjb")
 }
 ```
 
@@ -120,7 +121,7 @@ dependencies {
 }
 
 wsdl2java {
-    bindingFile.set(layout.projectDirectory.file("src/main/bindings/bindings.xjb"))
+    bindingFile("src/main/bindings/bindings.xjb")
 }
 ```
 

diff --git a/integration-test/bindings-datetime-test/build.gradle.kts b/integration-test/bindings-datetime-test/build.gradle.kts
@@ -9,6 +9,6 @@ dependencies {
 }
 
 wsdl2java {
-    bindingFile.set(layout.projectDirectory.file("src/main/bindings/bindings.xml"))
+    bindingFile("src/main/bindings/bindings.xml")
     markGenerated.set("yes-jdk8")
 }
diff --git a/src/main/kotlin/com/github/bjornvester/wsdl2java/Wsdl2JavaPluginExtension.kt b/src/main/kotlin/com/github/bjornvester/wsdl2java/Wsdl2JavaPluginExtension.kt
@@ -7,7 +7,7 @@ import javax.inject.Inject
 open class Wsdl2JavaPluginExtension @Inject constructor(objects: ObjectFactory, layout: ProjectLayout) {
     val wsdlDir = objects.directoryProperty().convention(layout.projectDirectory.dir("src/main/resources"))
     val includes = objects.listProperty(String::class.java).convention(listOf("**/*.wsdl"))
-    val bindingFile = objects.fileProperty()
+    val bindingFiles = objects.fileCollection()
     val generatedSourceDir = objects.directoryProperty().convention(layout.buildDirectory.dir("generated/sources/wsdl2java"))
     val cxfVersion = objects.property(String::class.java).convention("3.4.3")
     val options = objects.listProperty(String::class.java)
@@ -25,4 +25,14 @@ open class Wsdl2JavaPluginExtension @Inject constructor(objects: ObjectFactory,
         @JvmStatic
         val MARK_GENERATED_YES_JDK9 = "yes-jdk9"
     }
+
+    /**
+     * Adds a binding file. The given path is evaluated as per [org.gradle.api.Project.file].
+     *
+     * @param path The binding file to add.
+     * @return this
+     */
+    fun bindingFile(path: Any) {
+        bindingFiles.from(path)
+    }
 }
diff --git a/src/main/kotlin/com/github/bjornvester/wsdl2java/Wsdl2JavaTask.kt b/src/main/kotlin/com/github/bjornvester/wsdl2java/Wsdl2JavaTask.kt
@@ -31,10 +31,9 @@ open class Wsdl2JavaTask @Inject constructor(
     @get:Input
     val includes = objects.listProperty(String::class.java).convention(getWsdl2JavaExtension().includes)
 
-    @get:InputFile
+    @get:InputFiles
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    @Optional
-    val bindingFile = objects.fileProperty().convention(getWsdl2JavaExtension().bindingFile)
+    val bindingFiles = objects.fileCollection().from(getWsdl2JavaExtension().bindingFiles)
 
     @get:Input
     @Optional
@@ -157,11 +156,11 @@ open class Wsdl2JavaTask @Inject constructor(
             defaultArgs.add("-verbose")
         }
 
-        if (bindingFile.isPresent) {
+        bindingFiles.forEach {
             defaultArgs.addAll(
                 listOf(
                     "-b",
-                    bindingFile.get().asFile.absolutePath
+                    it.absolutePath
                 )
             )
         }