From 6cf969ca0b3130bf5e6358c7ab612dbb3c69ac69 Mon Sep 17 00:00:00 2001 From: Maciej Ziarko Date: Thu, 26 Feb 2015 14:03:11 +0100 Subject: [PATCH 1/2] Commons IO instead of custom solution --- .../src/main/groovy/io/coderate/accurest/TestGenerator.groovy | 3 ++- build.gradle | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy index aad644fed1..20bde442ae 100755 --- a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy @@ -2,6 +2,7 @@ package io.coderate.accurest import groovy.transform.PackageScope import io.coderate.accurest.config.AccurestConfigProperties +import org.apache.commons.io.FilenameUtils import org.codehaus.plexus.util.DirectoryScanner import java.util.concurrent.atomic.AtomicInteger @@ -71,6 +72,6 @@ class TestGenerator { } private String normalizePath(String path) { - return path.replaceAll(/\\+/, '/') + return FilenameUtils.normalize(path, true) } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index d488248174..3a76dfeea2 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,7 @@ project(':accurest-core') { dependencies { compile 'org.slf4j:slf4j-api:[1.6.0,)' compile 'org.codehaus.plexus:plexus-utils:3.0.21' + compile 'commons-io:commons-io:2.4' testCompile 'cglib:cglib-nodep:2.2' testCompile 'org.objenesis:objenesis:2.1' } From 0972cb893c8568eeb4c0329128358f9ee98f7bc3 Mon Sep 17 00:00:00 2001 From: Maciej Ziarko Date: Thu, 26 Feb 2015 15:23:47 +0100 Subject: [PATCH 2/2] FilenameUtils.separatorsToUnix --- .../src/main/groovy/io/coderate/accurest/TestGenerator.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy index 20bde442ae..45ba0ff497 100755 --- a/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy @@ -1,5 +1,4 @@ package io.coderate.accurest - import groovy.transform.PackageScope import io.coderate.accurest.config.AccurestConfigProperties import org.apache.commons.io.FilenameUtils @@ -8,7 +7,6 @@ import org.codehaus.plexus.util.DirectoryScanner import java.util.concurrent.atomic.AtomicInteger import static io.coderate.accurest.util.NamesUtil.afterLast - /** * @author Jakub Kubrynski */ @@ -72,6 +70,6 @@ class TestGenerator { } private String normalizePath(String path) { - return FilenameUtils.normalize(path, true) + return FilenameUtils.separatorsToUnix(path) } } \ No newline at end of file