From 10f888449ddd16b1af828425ea3ebd17d0c9ab4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Smyku=C5=82a?= Date: Sat, 16 Apr 2016 10:26:08 +0200 Subject: [PATCH] Fix issue with conversion without pom (#7) --- .../codearte/accurest/maven/ConvertMojo.groovy | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/groovy/io/codearte/accurest/maven/ConvertMojo.groovy b/src/main/groovy/io/codearte/accurest/maven/ConvertMojo.groovy index 662911053e..e1bbe75a00 100644 --- a/src/main/groovy/io/codearte/accurest/maven/ConvertMojo.groovy +++ b/src/main/groovy/io/codearte/accurest/maven/ConvertMojo.groovy @@ -46,8 +46,13 @@ class ConvertMojo extends AbstractMojo { AccurestConfigProperties config = new AccurestConfigProperties() - config.contractsDslDir = resolveFile(baseDir, contractsDir, isInsideProject() ? 'src/test/accurest' : '') - config.stubsOutputDir = resolveFile(projectBuildDirectory, mappingsDir, isInsideProject() ? 'mappings' : '') + if (insideProject) { + config.contractsDslDir = resolveFile(baseDir, contractsDir, 'src/test/accurest') + config.stubsOutputDir = resolveFile(projectBuildDirectory, mappingsDir, 'mappings') + } else { + config.contractsDslDir = resolveFile(baseDir, contractsDir, '') + config.stubsOutputDir = resolveFile(baseDir, mappingsDir, '') + } log.info('Converting from accurest contracts written in GroovyDSL to WireMock stubs mappings') log.info(" Accurest contracts directory: ${config.contractsDslDir}") @@ -58,15 +63,15 @@ class ConvertMojo extends AbstractMojo { } private boolean isInsideProject() { - mavenSession.getRequest().isProjectPresent() + return mavenSession.getRequest().isProjectPresent() } private File resolveFile(File baseDir, String requestedPath, String defaultPath) { - requestedPath ? alignToBaseDirectory(requestedPath, baseDir) : alignToBaseDirectory(defaultPath, baseDir) + return requestedPath ? alignToBaseDirectory(baseDir, requestedPath) : alignToBaseDirectory(baseDir, defaultPath) } - private File alignToBaseDirectory(String dir1, File dir) { - return new File(translator.alignToBaseDirectory(dir1, dir)) + private File alignToBaseDirectory(File baseDir, String path) { + return new File(translator.alignToBaseDirectory(path, baseDir)) } }