From 09cf63a60012177af7a83e4cac156a92c0fc2eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Smyku=C5=82a?= Date: Fri, 30 Sep 2016 07:55:35 +0200 Subject: [PATCH] stubs mappings directory should be the same for convert and run mojo (#95) --- .../cloud/contract/maven/verifier/ConvertMojo.java | 11 +++++++---- .../cloud/contract/maven/verifier/RunMojo.java | 2 +- .../cloud/contract/maven/verifier/PluginUnitTest.java | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java index df476d61b8..a097f94605 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java @@ -44,6 +44,9 @@ import org.springframework.cloud.contract.verifier.wiremock.RecursiveFilesConver defaultPhase = LifecyclePhase.PROCESS_TEST_RESOURCES) public class ConvertMojo extends AbstractMojo { + public static final String DEFAULT_STUBS_DIR = "${project.build.directory}/stubs/"; + public static final String MAPPINGS_PATH = "mappings"; + @Parameter(defaultValue = "${repositorySystemSession}", readonly = true) private RepositorySystemSession repoSession; @@ -57,8 +60,8 @@ public class ConvertMojo extends AbstractMojo { * Directory where the generated WireMock stubs from Groovy DSL should be placed. * You can then mention them in your packaging task to create jar with stubs */ - @Parameter(defaultValue = "${project.build.directory}/stubs") - private File outputDirectory; + @Parameter(defaultValue = DEFAULT_STUBS_DIR) + private File stubsDirectory; /** * Directory containing contracts written using the GroovyDSL @@ -132,11 +135,11 @@ public class ConvertMojo extends AbstractMojo { getLog().info("Directory with contract is present at [" + contractsDirectory + "]"); new CopyContracts(this.project, this.mavenSession, this.mavenResourcesFiltering) - .copy(contractsDirectory, this.outputDirectory); + .copy(contractsDirectory, this.stubsDirectory); config.setContractsDslDir(isInsideProject() ? contractsDirectory : this.source); config.setStubsOutputDir( - isInsideProject() ? new File(this.outputDirectory, "mappings") : this.destination); + isInsideProject() ? new File(this.stubsDirectory, MAPPINGS_PATH) : this.destination); getLog().info( "Converting from Spring Cloud Contract Verifier contracts to WireMock stubs mappings"); diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java index 5146c56a42..e89a38c566 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java @@ -44,7 +44,7 @@ public class RunMojo extends AbstractMojo { @Parameter(defaultValue = "${repositorySystemSession}", readonly = true) private RepositorySystemSession repoSession; - @Parameter(defaultValue = "${project.build.directory}/stubs/mappings") + @Parameter(defaultValue = ConvertMojo.DEFAULT_STUBS_DIR) private File stubsDirectory; @Parameter(property = "stubsDirectory", defaultValue = "${basedir}") diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java index 4889424662..9757bb9e62 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java @@ -64,7 +64,7 @@ public class PluginUnitTest { @Test public void shouldGenerateWireMockStubsInSelectedLocation() throws Exception { File basedir = this.resources.getBasedir("basic"); - this.maven.executeMojo(basedir, "convert", newParameter("outputDirectory", "target/foo")); + this.maven.executeMojo(basedir, "convert", newParameter("stubsDirectory", "target/foo")); assertFilesPresent(basedir, "target/foo/mappings/Sample.json"); }