From bdfe70e9208bd8ab381d261d935c4e8a2692bb55 Mon Sep 17 00:00:00 2001 From: Mariusz Smykula Date: Sun, 27 Mar 2016 09:26:03 +0200 Subject: [PATCH] more configuration options --- .../accurest/maven/GenerateSpecsMojo.java | 18 ++++++++++++------ .../accurest/maven/GenerateStubsMojo.java | 8 ++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/codearte/accurest/maven/GenerateSpecsMojo.java b/src/main/java/io/codearte/accurest/maven/GenerateSpecsMojo.java index 9019e87d68..4d68e341d9 100644 --- a/src/main/java/io/codearte/accurest/maven/GenerateSpecsMojo.java +++ b/src/main/java/io/codearte/accurest/maven/GenerateSpecsMojo.java @@ -19,20 +19,26 @@ import io.codearte.accurest.config.AccurestConfigProperties; public class GenerateSpecsMojo extends AbstractMojo { @Parameter(defaultValue = "${basedir}") - protected File baseDir; + private File baseDir; @Parameter(defaultValue = "${project.build.directory}") - protected File projectBuildDirectory; + private File projectBuildDirectory; @Parameter(property = "contractsDir", defaultValue = "/src/test/resources/stubs", required = false) - private String contractsDir = "/src/test/resources/stubs"; + private String contractsDir; + + @Parameter(property = "generatedTestSourcesDir", defaultValue = "/generated-sources/accurest", required = false) + private String generatedTestSourcesDir; + + @Parameter(property = "basePackageForTests", defaultValue = "io.codearte.accurest.tests", required = false) + private String basePackageForTests; public void execute() throws MojoExecutionException, MojoFailureException { AccurestConfigProperties config = new AccurestConfigProperties(); config.setContractsDslDir(new File(baseDir, contractsDir)); - config.setBasePackageForTests("io.codearte.accurest.tests"); - config.setGeneratedTestSourcesDir(new File(projectBuildDirectory, "/generated-sources/accurest")); + config.setBasePackageForTests(basePackageForTests); + config.setGeneratedTestSourcesDir(new File(projectBuildDirectory, generatedTestSourcesDir)); getLog().info("Accurest Plugin: Invoking test sources generation"); getLog().info(format("Registering %s as test source directory", config.getGeneratedTestSourcesDir())); @@ -40,7 +46,7 @@ public class GenerateSpecsMojo extends AbstractMojo { try { TestGenerator generator = new TestGenerator(config); int generatedClasses = generator.generate(); - getLog().info(String.format("Generated %s test classes.", generatedClasses)); + getLog().info(format("Generated %s test classes.", generatedClasses)); } catch (AccurestException e) { throw new MojoExecutionException(format("Accurest Plugin exception: %s", e.getMessage()), e); } diff --git a/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java b/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java index 4fed9aa6c8..852cc64f91 100644 --- a/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java +++ b/src/main/java/io/codearte/accurest/maven/GenerateStubsMojo.java @@ -17,16 +17,16 @@ import io.codearte.accurest.wiremock.RecursiveFilesConverter; public class GenerateStubsMojo extends AbstractMojo { @Parameter(defaultValue = "${basedir}") - protected File baseDir; + private File baseDir; @Parameter(defaultValue = "${project.build.directory}") - protected File projectBuildDirectory; + private File projectBuildDirectory; @Parameter(property = "mappingsDir", defaultValue = "mappings", required = false) - private String mappingsDir = "mappings"; + private String mappingsDir; @Parameter(property = "contractsDir", defaultValue = "/src/test/resources/stubs", required = false) - private String contractsDir = "/src/test/resources/stubs"; + private String contractsDir; public void execute() throws MojoExecutionException, MojoFailureException { AccurestConfigProperties config = new AccurestConfigProperties();