Add another property source for decrypted bootstrap properties

The problem is that we do want bootstrap properties to override
default properties in most cases, but if they are decrypted those
values have to be added with the highest possible precedence.

Fixes gh-54

spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingAutoConfigurationIntegrationTests.java

@@ -20,23 +20,23 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @IntegrationTest("encrypt.key:deadbeef")
 @ActiveProfiles("encrypt")
 public class BootstrapOrderingAutoConfigurationIntegrationTests {
-	
+
 	@Autowired
 	private ConfigurableEnvironment environment;
 
 	@Test
 	public void bootstrapPropertiesExist() {
-		assertTrue(environment.getPropertySources().contains("bootstrap"));
+		assertTrue(this.environment.getPropertySources().contains("bootstrap"));
 	}
 
 	@Test
 	public void normalPropertiesDecrypted() {
-		assertEquals("foo", environment.resolvePlaceholders("${foo}"));
+		assertEquals("foo", this.environment.resolvePlaceholders("${foo}"));
 	}
 
 	@Test
 	public void bootstrapPropertiesDecrypted() {
-		assertEquals("bar", environment.resolvePlaceholders("${bar}"));
+		assertEquals("bar", this.environment.resolvePlaceholders("${bar}"));
 	}
 
 	@EnableAutoConfiguration

spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java

@@ -0,0 +1,65 @@
+package org.springframework.cloud.bootstrap;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.IntegrationTest;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.cloud.bootstrap.BootstrapOrderingCustomPropertySourceIntegrationTests.Application;
+import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = Application.class)
+@IntegrationTest({"encrypt.key:deadbeef", "spring.cloud.bootstrap.name:custom"})
+@ActiveProfiles("encrypt")
+public class BootstrapOrderingCustomPropertySourceIntegrationTests {
+
+	@Autowired
+	private ConfigurableEnvironment environment;
+
+	@Test
+	public void bootstrapPropertiesExist() {
+		assertTrue(this.environment.getPropertySources().contains("bootstrap"));
+	}
+
+	@Test
+	public void customPropertiesDecrypted() {
+		assertEquals("bar", this.environment.resolvePlaceholders("${custom.foo}"));
+	}
+
+	@EnableAutoConfiguration
+	@Configuration
+	protected static class Application {
+
+	}
+
+	@Configuration
+	// This is added to bootstrap context as a source in bootstrap.properties
+	protected static class PropertySourceConfiguration implements PropertySourceLocator {
+
+		public static Map<String, Object> MAP = new HashMap<String, Object>(
+				Collections.<String, Object> singletonMap("custom.foo", "{cipher}6154ca04d4bb6144d672c4e3d750b5147116dd381946d51fa44f8bc25dc256f4"));
+
+		@Override
+		public PropertySource<?> locate(Environment environment) {
+			return new MapPropertySource("testBootstrap", MAP);
+		}
+
+	}
+
+}