From 6905e39dccb1ed080608cd11476ea2078b5f1c96 Mon Sep 17 00:00:00 2001 From: Jakub Kubrynski Date: Sat, 21 Feb 2015 21:28:10 +0100 Subject: [PATCH] Fixed plugin configuration properties --- .../accurest/plugin/AccurestGradlePlugin.groovy | 4 ++-- .../accurest/plugin/GenerateServerTestsTask.groovy | 2 +- .../GenerateWiremockClientStubsFromDslTask.groovy | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy index 27af3dab97..4b9ec6fe02 100644 --- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy +++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy @@ -64,8 +64,8 @@ class AccurestGradlePlugin implements Plugin { task.description = "Generate Wiremock client stubs from GroovyDSL" task.group = GROUP_NAME task.conventionMapping.with { - groovyDslDir = { extension.contractsDslDir } - generatedWiremockClientStubsDir = { extension.stubsOutputDir } + contractsDslDir = { extension.contractsDslDir } + stubsOutputDir = { extension.stubsOutputDir } } } } diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy index 3294fc22fe..37611c81b1 100644 --- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy +++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateServerTestsTask.groovy @@ -12,7 +12,7 @@ import org.gradle.api.tasks.TaskAction class GenerateServerTestsTask extends DefaultTask { @InputDirectory - File groovyDslDir + File contractsDslDir @OutputDirectory File generatedTestSourcesDir diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateWiremockClientStubsFromDslTask.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateWiremockClientStubsFromDslTask.groovy index 8805992dda..2ab2b704b4 100644 --- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateWiremockClientStubsFromDslTask.groovy +++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/GenerateWiremockClientStubsFromDslTask.groovy @@ -10,17 +10,17 @@ import org.gradle.api.tasks.TaskAction class GenerateWiremockClientStubsFromDslTask extends DefaultTask { @InputDirectory - File groovyDslDir + File contractsDslDir @InputDirectory - File generatedWiremockClientStubsDir + File stubsOutputDir @TaskAction void generate() { project.logger.info("Accurest Plugin: Invoking GroovyDSL to Wiremock client stubs conversion") - project.logger.debug("From '${getGroovyDslDir()}' to '${getGeneratedWiremockClientStubsDir()}'") + project.logger.debug("From '${getContractsDslDir()}' to '${getStubsOutputDir()}'") - RecursiveFilesConverter converter = new RecursiveFilesConverter(new DslToWiremockClientConverter(), getGroovyDslDir(), - getGeneratedWiremockClientStubsDir()) + RecursiveFilesConverter converter = new RecursiveFilesConverter(new DslToWiremockClientConverter(), getContractsDslDir(), + getStubsOutputDir()) converter.processFiles() } }