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

stub downloader cleanup (#284)

Browse Source 
* ivy removed
* better logging
This commit is contained in:
Mariusz Smykuła
2016-05-31 21:45:27 +02:00
parent cc3bf2d838
commit b6a87ce1ae
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stub-runner/stub-runner/build.gradle
View File

@@ -6,7 +6,6 @@ mainClassName = 'io.codearte.accurest.stubrunner.StubRunnerMain'
dependencies {
compile project(':accurest-core')
compile project(':accurest-messaging-root:accurest-messaging-core')
compile 'org.apache.ivy:ivy:2.4.0'
compile 'org.codehaus.groovy:groovy-all:2.4.4'
compile "com.github.tomakehurst:wiremock:$wiremockVersion"
compile 'javax.servlet:javax.servlet-api:3.1.0'

24
stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/AetherStubDownloader.groovy
View File

@@ -38,22 +38,27 @@ class AetherStubDownloader implements StubDownloader {
private static final String ACCUREST_TEMP_DIR_PREFIX = 'accurest'
private static final String ARTIFACT_EXTENSION = 'jar'
private static final String LATEST_ARTIFACT_VERSION = '(,]'
private static final String LATEST_VERSION_IN_IVY = "+"
private static final String LATEST_VERSION_IN_IVY = '+'
private final List<RemoteRepository> remoteRepos
private final RepositorySystem repositorySystem
private final RepositorySystemSession session
AetherStubDownloader(StubRunnerOptions stubRunnerOptions) {
this.remoteRepos = remoteRepositories(stubRunnerOptions)
log.info("Download using remote repositories $remoteRepos")
remoteRepos = remoteRepositories(stubRunnerOptions)
if (!remoteRepos) {
log.error('Remote repositories for stubs are not specified!')
}
this.repositorySystem = newRepositorySystem()
this.session = newSession(this.repositorySystem, stubRunnerOptions.workOffline)
}
private List<RemoteRepository> remoteRepositories(StubRunnerOptions stubRunnerOptions) {
return stubRunnerOptions.stubRepositoryRoot.split(',').collect { String repo ->
new RemoteRepository.Builder("remote", "default", repo).build()
return stubRunnerOptions.stubRepositoryRoot.split(',')
.toList().withIndex()
.findAll { String repo, int index -> repo }
.collect { String repo, int index ->
new RemoteRepository.Builder('remote' + index, 'default', repo).build()
}
}
@@ -67,8 +72,11 @@ class AetherStubDownloader implements StubDownloader {
private RepositorySystemSession newSession(RepositorySystem system, boolean workOffline) {
DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession()
session.setUpdatePolicy(RepositoryPolicy.UPDATE_POLICY_ALWAYS)
session.setOffline(workOffline)
if (workOffline) {
session.setOffline(workOffline)
} else {
session.setUpdatePolicy(RepositoryPolicy.UPDATE_POLICY_ALWAYS)
}
LocalRepository localRepo = new LocalRepository(localRepositoryDirectory())
session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo))
return session
@@ -86,7 +94,7 @@ class AetherStubDownloader implements StubDownloader {
}
Artifact artifact = new DefaultArtifact(stubsGroup, stubsModule, classifier, ARTIFACT_EXTENSION, resolvedVersion)
ArtifactRequest request = new ArtifactRequest(artifact: artifact, repositories: remoteRepos)
log.info("Resolving artifact $artifact using repository $remoteRepos")
log.info("Resolving artifact '$artifact' using remote repositories $remoteRepos.url")
try {
ArtifactResult result = repositorySystem.resolveArtifact(session, request)
log.info("Resolved artifact $artifact to ${result.artifact.file}")