simpler

Author: hauner

src/main/groovy/io/openapiprocessor/gradle/OpenApiProcessorExtension.groovy

@@ -120,52 +120,16 @@ class OpenApiProcessorExtension {
 
         // should be a nested processor configuration
         if (arg instanceof Closure) {
-
             // apply it to a new Processor () entry
             def processor = new Processor (name)
-            arg.delegate = processor
-            arg.resolveStrategy = Closure.DELEGATE_FIRST
-
-            project.configure (project, wrapWithProjectDelegate (arg))
+            project.configure (processor, arg)
             processors.put (name, processor)
             return processor
         }
 
         throw new MissingMethodException(name, OpenApiProcessorExtension, args)
     }
 
-    /**
-     * wraps the given closure with a closure that delegates to the project.
-     *
-     * this makes it possible to use any of the different dependency formats as value to the
-     * 'processor' property in a processor configuration block, e.g.
-     * <pre>
-     *     ...
-     *     spring {
-     *         processor files ("../some/lib.jar")
-     *         ....
-     *     }
-     *     ...
-     * </pre>
-     * or
-     * <pre>
-     *     ...
-     *     spring {
-     *         processor "group:artifact:version"
-     *         ....
-     *     }
-     *     ...
-     * </pre>
-     *
-     * @param processor configuration closure
-     * @return the created wrapper closure
-     */
-    private static Closure wrapWithProjectDelegate (Closure processor) {
-        return {
-            processor.run ()
-        }
-    }
-
     void apiPath (String apiPath) {
         api.set (apiPath)
     }

src/main/groovy/io/openapiprocessor/gradle/Processor.groovy

@@ -87,6 +87,15 @@ class Processor {
     }
 
     def methodMissing (String name, def args) {
+        /*
+        this way we could use processor (file ("...")) instead of processor (project.file ("..."))
+
+        def ignore =  ['files']
+        if (ignore.contains (name)) {
+            throw new MissingMethodException(name, Processor, args)
+        }
+         */
+
         if (args[0] instanceof Closure) {
             def builder = new MapBuilder()
             builder.with (args[0] as Closure)

src/testInt/groovy/io/openapiprocessor/gradle/KotlinDslSpec.groovy

@@ -29,7 +29,7 @@ class KotlinDslSpec extends PluginSpec {
             apiPath("\$projectDir/src/api/openapi.yaml")
         
             process("v1") {
-                processor(files("$projectDir/processor-v1/build/libs/processor-v1.jar"))
+                processor(project.files("$projectDir/processor-v1/build/libs/processor-v1.jar"))
                 targetDir("\$buildDir/v1")
         
                 prop("v1", "value v1")

src/testInt/groovy/io/openapiprocessor/gradle/OpenApiProcessorPluginSpec.groovy

@@ -30,21 +30,21 @@ class OpenApiProcessorPluginSpec extends PluginSpec {
             apiPath "\${projectDir}/src/api/openapi.yaml"
         
             v1 {
-                processor files("${projectDir}/processor-v1/build/libs/processor-v1.jar")
+                processor project.files("${projectDir}/processor-v1/build/libs/processor-v1.jar")
         
                 targetDir "\${buildDir}/v1"
                 v1 "value v1"
             }
             
             one {
-                processor files("${projectDir}/processor-one/build/libs/processor-one.jar")
+                processor project.files("${projectDir}/processor-one/build/libs/processor-one.jar")
         
                 targetDir "\${buildDir}/one"
                 other1 "value one"
             }
         
             two {
-                processor files("${projectDir}/processor-two/build/libs/processor-two.jar")
+                processor project.files("${projectDir}/processor-two/build/libs/processor-two.jar")
         
                 targetDir "\${buildDir}/two"
                 other2 "value two"