Fix context order when loading properties

Fixes gh-169

Author: WtfJoke

spring-cloud-aws-parameter-store-config/src/main/java/io/awspring/cloud/paramstore/AwsParamStorePropertySources.java

@@ -17,6 +17,7 @@
 package io.awspring.cloud.paramstore;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagement;
@@ -26,6 +27,7 @@
 
 /**
  * @author Eddú Meléndez
+ * @author Manuel Wessner
  * @since 2.3
  */
 public class AwsParamStorePropertySources {
@@ -52,6 +54,8 @@ public List<String> getAutomaticContexts(List<String> profiles) {
 
 		addProfiles(contexts, defaultContext, profiles);
 		contexts.add(defaultContext + "/");
+
+		Collections.reverse(contexts);
 		return contexts;
 	}
 

spring-cloud-aws-parameter-store-config/src/test/java/io/awspring/cloud/paramstore/AwsParamStorePropertySourceLocatorTest.java

@@ -100,10 +100,10 @@ void contextSpecificOrderExpected() {
 
 		List<String> contextToBeTested = new ArrayList<>(locator.getContexts());
 
-		assertThat(contextToBeTested.get(0)).isEqualTo("application/messaging-service_test/");
-		assertThat(contextToBeTested.get(1)).isEqualTo("application/messaging-service/");
-		assertThat(contextToBeTested.get(2)).isEqualTo("application/application_test/");
-		assertThat(contextToBeTested.get(3)).isEqualTo("application/application/");
+		assertThat(contextToBeTested.get(0)).isEqualTo("application/application/");
+		assertThat(contextToBeTested.get(1)).isEqualTo("application/application_test/");
+		assertThat(contextToBeTested.get(2)).isEqualTo("application/messaging-service/");
+		assertThat(contextToBeTested.get(3)).isEqualTo("application/messaging-service_test/");
 	}
 
 	@Test

spring-cloud-aws-parameter-store-config/src/test/java/io/awspring/cloud/paramstore/AwsParamStorePropertySourcesTest.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2013-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 io.awspring.cloud.paramstore;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Unit test for {@link AwsParamStorePropertySourceLocator}.
+ *
+ * @author Manuel Wessner
+ */
+class AwsParamStorePropertySourcesTest {
+
+	private final String defaultContextName = "application";
+
+	private final String defaultApplicationName = "messaging-service";
+
+	private final Log logMock = mock(Log.class);
+
+	private AwsParamStoreProperties properties;
+
+	@BeforeEach
+	void setUp() {
+		properties = new AwsParamStoreProperties();
+		properties.setDefaultContext(defaultContextName);
+		properties.setName(defaultApplicationName);
+	}
+
+	@Test
+	void getAutomaticContextsWithSingleProfile() {
+		AwsParamStorePropertySources sut = new AwsParamStorePropertySources(properties, logMock);
+
+		List<String> contexts = sut.getAutomaticContexts(Collections.singletonList("production"));
+
+		assertThat(contexts.size()).isEqualTo(4);
+		assertThat(contexts).containsExactly("/config/application/", "/config/application_production/",
+				"/config/messaging-service/", "/config/messaging-service_production/");
+	}
+
+	@Test
+	void getAutomaticContextsWithoutProfile() {
+		AwsParamStorePropertySources sut = new AwsParamStorePropertySources(properties, logMock);
+
+		List<String> contexts = sut.getAutomaticContexts(Collections.emptyList());
+
+		assertThat(contexts.size()).isEqualTo(2);
+		assertThat(contexts).containsExactly("/config/application/", "/config/messaging-service/");
+	}
+
+}

spring-cloud-starter-aws-parameter-store-config/src/test/java/io/awspring/cloud/autoconfigure/paramstore/AwsParamStoreConfigDataLocationResolverTest.java

@@ -40,8 +40,8 @@ void testResolveProfileSpecificWithAutomaticPaths() {
 		String location = "aws-parameterstore:";
 		List<AwsParamStoreConfigDataResource> locations = testResolveProfileSpecific(location);
 		assertThat(locations).hasSize(4);
-		assertThat(toContexts(locations)).containsExactly("/config/testapp_dev/", "/config/testapp/",
-				"/config/application_dev/", "/config/application/");
+		assertThat(toContexts(locations)).containsExactly("/config/application/", "/config/application_dev/",
+				"/config/testapp/", "/config/testapp_dev/");
 	}
 
 	@Test