SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #176 - replace dash with underscore when building package name from directory

Browse Source
This commit is contained in:
Jakub Kubrynski
2015-11-20 12:34:54 +01:00
parent d8455cf6dd
commit d487312250
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accurest-core/src/main/groovy/io/codearte/accurest/FileSaver.groovy
View File

@@ -3,7 +3,6 @@ package io.codearte.accurest
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import io.codearte.accurest.config.TestFramework
import io.codearte.accurest.util.NamesUtil
import java.nio.file.Files
import java.nio.file.Path
@@ -24,9 +23,9 @@ class FileSaver {
this.framework = framework
}
void saveClassFile(String fileName, String packageName, byte[] classBytes) {
void saveClassFile(String fileName, String includedDirectoryRelativePath, byte[] classBytes) {
Path testBaseDir = Paths.get(targetDirectory.absolutePath, NamesUtil.packageToDirectory(packageName))
Path testBaseDir = Paths.get(targetDirectory.absolutePath, includedDirectoryRelativePath)
Files.createDirectories(testBaseDir)
Path classPath = Paths.get(testBaseDir.toString(), capitalize(fileName) + framework.classExtension).toAbsolutePath()
log.info("Creating new class file [$classPath]")

15
accurest-core/src/main/groovy/io/codearte/accurest/TestGenerator.groovy
View File

@@ -1,4 +1,5 @@
package io.codearte.accurest
import groovy.transform.PackageScope
import io.codearte.accurest.config.AccurestConfigProperties
import org.apache.commons.io.FilenameUtils
@@ -7,9 +8,7 @@ import org.codehaus.plexus.util.DirectoryScanner
import java.nio.charset.StandardCharsets
import java.util.concurrent.atomic.AtomicInteger
import static io.codearte.accurest.util.NamesUtil.afterLast
import static io.codearte.accurest.util.NamesUtil.beforeLast
import static io.codearte.accurest.util.NamesUtil.directoryToPackage
import static io.codearte.accurest.util.NamesUtil.*
/**
* @author Jakub Kubrynski
@@ -45,17 +44,17 @@ class TestGenerator {
}
@PackageScope
void generateTestClasses(final String packageName) {
void generateTestClasses(final String basePackageName) {
directoryScanner.scan()
directoryScanner.getIncludedDirectories()
.each { String includedDirectoryRelativePath ->
processIncludedDirectory(includedDirectoryRelativePath, packageName)
processIncludedDirectory(includedDirectoryRelativePath, basePackageName)
}
}
private void processIncludedDirectory(
final String includedDirectoryRelativePath, final String packageNameForClass) {
final String includedDirectoryRelativePath, final String basePackageNameForClass) {
if (!includedDirectoryRelativePath.isEmpty()) {
List<File> filesToClass = directoryScanner.includedFiles.
grep { String includedFile ->
@@ -66,9 +65,9 @@ class TestGenerator {
}
if (filesToClass.size()) {
def className = afterLast(includedDirectoryRelativePath, File.separator) + configProperties.targetFramework.classNameSuffix
def packageName = buildPackage(packageNameForClass, includedDirectoryRelativePath)
def packageName = buildPackage(basePackageNameForClass, includedDirectoryRelativePath)
def classBytes = generator.buildClass(filesToClass, className, packageName).getBytes(StandardCharsets.UTF_8)
saver.saveClassFile(className, packageName, classBytes)
saver.saveClassFile(className, includedDirectoryRelativePath, classBytes)
counter.incrementAndGet()
}
}

6
accurest-core/src/main/groovy/io/codearte/accurest/util/NamesUtil.groovy
View File

@@ -46,11 +46,7 @@ class NamesUtil {
return string
}
static String packageToDirectory(String packageName) {
return packageName.replace('.' as char, File.separatorChar)
}
static String directoryToPackage(String directory) {
return directory.replace(File.separator, '.')
return directory.replace(File.separator, '.').replace('-', '_')
}
}