Fixes profile ordering of remote vs local.

Previously a local profiles specific file would have more priority than a remote profile specific file. Using a new ConfigData Option, this is now fixed.

Fixes gh-1795

spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingIntegrationTests.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2018-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import java.util.Map;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.SocketUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class,
+		// Normally spring.cloud.config.enabled:true is the default but since we have the
+		// config server on the classpath we need to set it explicitly
+		// spring.config.import needs to come from orderingtest.yml to test this issue
+		// hence no spring.config.import here and config name change
+		properties = { "spring.application.name=profilesample", "spring.cloud.config.enabled=true",
+				"spring.config.name=orderingtest", "management.security.enabled=false", "spring.profiles.active=dev",
+				"management.endpoints.web.exposure.include=*" },
+		webEnvironment = RANDOM_PORT)
+public class ConfigDataOrderingIntegrationTests {
+
+	private static final String BASE_PATH = new WebEndpointProperties().getBasePath();
+
+	private static final int configPort = SocketUtils.findAvailableTcpPort();
+
+	private static ConfigurableApplicationContext server;
+
+	@LocalServerPort
+	private int port;
+
+	@BeforeClass
+	public static void startConfigServer() {
+		server = SpringApplication.run(org.springframework.cloud.config.server.ConfigServerApplication.class,
+				"--spring.profiles.active=native", "--server.port=" + configPort, "--spring.config.name=server");
+
+		System.setProperty("spring.cloud.config.uri", "http://localhost:" + configPort);
+	}
+
+	@AfterClass
+	public static void close() {
+		System.clearProperty("spring.cloud.config.uri");
+		if (server != null) {
+			server.close();
+		}
+	}
+
+	@Test
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public void contextLoads() {
+		ResponseEntity<Map> response = new TestRestTemplate()
+				.getForEntity("http://localhost:" + this.port + BASE_PATH + "/env/my.prop", Map.class);
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		Map res = response.getBody();
+		assertThat(res).containsKey("propertySources");
+		Map<String, Object> property = (Map<String, Object>) res.get("property");
+		assertThat(property).containsEntry("value", "my value from config server dev profile");
+	}
+
+}

spring-cloud-config-sample/src/test/resources/config/profilesample-dev.yml

@@ -0,0 +1 @@
+my.prop: my value from config server dev profile

spring-cloud-config-sample/src/test/resources/config/profilesample.yml

@@ -0,0 +1 @@
+my.prop: my value from config server default profile

spring-cloud-config-sample/src/test/resources/orderingtest-dev.yml

@@ -0,0 +1 @@
+my.prop: my value from local dev profile

spring-cloud-config-sample/src/test/resources/orderingtest.yml

@@ -0,0 +1 @@
+spring.config.import: "configserver:"