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

Fixing copy/paste error in BootsrapApplicationListener

Browse Source 
... which prevented using an external bootstrap.properties file

Fixes gh-56, fixes gh-59
This commit is contained in:
Stefan Djurasic
2015-01-14 12:31:58 +01:00
committed by Dave Syer
parent 3796133980
commit e2b4bea238
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
View File

@@ -92,7 +92,7 @@ public class BootstrapApplicationListener implements
Map<String, Object> bootstrapMap = new HashMap<>();
bootstrapMap.put("spring.config.name", configName);
if (StringUtils.hasText(configLocation)) {
bootstrapMap.put("spring.config.location", configName);
bootstrapMap.put("spring.config.location", configLocation);
}
bootstrapProperties.addFirst(new MapPropertySource(
BOOTSTRAP_PROPERTY_SOURCE_NAME, bootstrapMap));

1
spring-cloud-config-client/src/test/external-properties/bootstrap.properties Normal file
View File

@@ -0,0 +1 @@
info.name: externalPropertiesInfoName

30
spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/BootstrapConfigurationTests.java
View File

@@ -22,6 +22,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.Collections;
import org.junit.After;
@@ -56,6 +57,35 @@ public class BootstrapConfigurationTests {
}
}
@Test
public void pickupExternalBootstrapProperties() {
String externalPropertiesPath = getExternalProperties();
System.setProperty("spring.cloud.bootstrap.location", externalPropertiesPath);
context = new SpringApplicationBuilder().web(false)
.sources(BareConfiguration.class).run();
assertEquals("externalPropertiesInfoName", context.getEnvironment().getProperty("info.name"));
assertTrue(context.getEnvironment().getPropertySources().contains("bootstrap"));
assertNotNull(context.getBean(ConfigClientProperties.class));
}
/**
* Running the test from maven will start from a different directory then starting it from intellij
*
* @return
*/
private String getExternalProperties() {
String externalPropertiesPath = "";
File externalProperties = new File("src/test/external-properties/bootstrap.properties");
if (externalProperties.exists()) {
externalPropertiesPath = externalProperties.getAbsolutePath();
} else {
externalProperties = new File("spring-cloud-config-client/src/test/external-properties/bootstrap.properties");
externalPropertiesPath = externalProperties.getAbsolutePath();
}
return externalPropertiesPath;
}
@Test
public void picksUpAdditionalPropertySource() {
System.setProperty("expected.name", "bootstrap");