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

Support comma separated remote repos

Browse Source 
- Change `remoteRepository` option to `remoteRepositories` that accepts comma separated string values.
 - AetherModuleResolver would expect set of remote repositories and create `RemoteRepository` list
for the given set.

Use String[] for remoteRepositories

 - This will let spring boot's ConfigurationProperties handle the properties
and use the Map<String,String> for remoteProperties in AetherModuleResolver
 - Generate ID for the map
This commit is contained in:
Ilayaperumal Gopinathan
2015-08-13 09:48:08 -07:00
committed by Marius Bogoevici
parent 15e3c6066f
commit 4ab01b6e7b
4 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherConfiguration.java
View File

@@ -16,7 +16,8 @@
package org.springframework.cloud.stream.module.launcher;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -45,8 +46,12 @@ public class ModuleLauncherConfiguration {
@Bean
@ConditionalOnMissingBean(ModuleResolver.class)
public ModuleResolver moduleResolver() {
return new AetherModuleResolver(properties.getLocalRepository(), Collections.singletonMap(
"remoteRepository", properties.getRemoteRepository()));
int i = 1;
Map<String, String> repositoriesMap = new HashMap<>();
for (String repository: properties.getRemoteRepositories()) {
repositoriesMap.put("repository " + i++, repository);
}
return new AetherModuleResolver(properties.getLocalRepository(), repositoriesMap);
}
@Bean

12
spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherProperties.java
View File

@@ -36,16 +36,16 @@ public class ModuleLauncherProperties {
+ File.separator + ".m2" + File.separator + "repository");
/**
* Location of a remote maven repository from which modules will be downloaded, if not available locally.
* Location of comma separated remote maven repositories from which modules will be downloaded, if not available locally.
*/
private String remoteRepository = "https://repo.spring.io/libs-snapshot";
private String[] remoteRepositories = new String[] {"https://repo.spring.io/libs-snapshot"};
public void setRemoteRepository(String remoteRepository) {
this.remoteRepository = remoteRepository;
public void setRemoteRepositories(String[] remoteRepositories) {
this.remoteRepositories = remoteRepositories;
}
protected String getRemoteRepository() {
return remoteRepository;
protected String[] getRemoteRepositories() {
return remoteRepositories;
}
public void setLocalRepository(File localRepository) {

2
spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolver.java
View File

@@ -118,7 +118,7 @@ public class AetherModuleResolver implements ModuleResolver {
classifier = "";
}
Assert.hasText(version, "'version' cannot be blank.");
Artifact artifact = new DefaultArtifact(groupId, artifactId, classifier, extension, version);
RepositorySystemSession session = newRepositorySystemSession(repositorySystem,
localRepository.getAbsolutePath());

17
spring-cloud-stream-module-launcher/src/test/java/org/springframework/cloud/stream/module/resolver/AetherModuleResolverTests.java
View File

@@ -15,12 +15,18 @@
package org.springframework.cloud.stream.module.resolver;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -29,12 +35,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.util.SocketUtils;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
/**
* @author David Turanski
@@ -72,7 +73,7 @@ public class AetherModuleResolverTests {
Map<String, String> remoteRepos = new HashMap<>();
remoteRepos.put("modules", "http://repo.spring.io/spring-cloud-stream-modules");
AetherModuleResolver defaultModuleResolver = new AetherModuleResolver(localRepository, remoteRepos);
Resource resource = defaultModuleResolver.resolve("org.springframework.cloud.stream.module", "time-source",
Resource resource = defaultModuleResolver.resolve("org.springframework.cloud.stream.module", "time-source",
"1.0.0.BUILD-SNAPSHOT", "exec", "jar");
assertTrue(resource.exists());
assertEquals(resource.getFile().getName(), "time-source-1.0.0.BUILD-SNAPSHOT-exec.jar");