Fix/remove initialized flag (#17)

* Remove the flag to initialize only once. In a Spring Cloud context, it should be initialized twice to get higher on the property sources list. Otherwise it's high on the bootstrap context, but once the normal Spring Boot context starts it is lower (assuming no Spring Config Server is used).

* Update readme

Author: fredboutin

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.coveo</groupId>
     <artifactId>spring-boot-parameter-store-integration</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 
     <name>Spring Boot Parameter Store Integration</name>
     <description>An integration of Amazon Web Services' Systems Manager Parameter Store for Spring Boot's properties injection.</description>

readme.md

@@ -77,7 +77,7 @@ If you want to halt the boot when a property prefixed with `/` isn't found in th
 
 TL;DR: Define the enabling properties in the bootstrap properties (`bootstrap.yml`, `bootstrap.properties`, [etc.](https://cloud.spring.io/spring-cloud-static/spring-cloud.html#_the_bootstrap_application_context))(see [Unleashing the Magic](#there-are-3-ways-to-enable-this-lib-after-importing-it-in-your-pomxml-pick-yours)).
 
-Spring Cloud has a second application context named bootstrap that gets initialized before Spring Boot's normal application context. Since this library uses an EnvironmentPostPrecessor to add the Parameter Store PropertySource, it would normally be triggered twice. To prevent this, the post processor will only run in the first context that triggers it. For this reason, you must use the bootstrap properties to enable this library since it is the first one to run. More details on this [Stack Overflow Thread](https://stackoverflow.com/questions/50935915/adding-a-conditional-external-propertysource-in-a-spring-boot-application).
+Spring Cloud has a second application context named bootstrap that gets initialized before Spring Boot's normal application context. Since this library uses an EnvironmentPostPrecessor to add the Parameter Store PropertySource, it will get triggered twice if you enabled in the bootstrap properties. This allows it to work in both context and to be on top of the property sources in both. For this reason, if you need to fetch Parameter Store properties in the bootstrap context, you should use the bootstrap properties to enable the library. Otherwise you can enable it in the normal Spring Boot context and it will work fine.
 
 If you still want the post processor to run twice or if you are using [spring-boot-devtools](https://docs.spring.io/spring-boot/docs/current/reference/html/using-spring-boot.html#using-boot-devtools-restart), you can set the optional property `awsParameterStorePropertySource.supportMultipleApplicationContexts` to `true`. The default property value is `false`to prevent multiple initializations. If you are also using Spring Cloud, this property will only work if set in the bootstrap properties.
 

src/main/java/com/coveo/configuration/parameterstore/ParameterStorePropertySourceConfigurationProperties.java

@@ -13,8 +13,6 @@ public final class ParameterStorePropertySourceConfigurationProperties
     public static final String ENABLED = joinWithDot(PROPERTY_SOURCE_PREFIX, "enabled");
     public static final String ACCEPTED_PROFILES = joinWithDot(PROPERTY_SOURCE_PREFIX, "enabledProfiles");
     public static final String HALT_BOOT = joinWithDot(PROPERTY_SOURCE_PREFIX, "haltBoot");
-    public static final String SUPPORT_MULTIPLE_APPLICATION_CONTEXTS = joinWithDot(PROPERTY_SOURCE_PREFIX,
-                                                                                   "supportMultipleApplicationContexts");
 
     public static final String SSM_CLIENT_CUSTOM_ENDPOINT = joinWithDot(SSM_CLIENT_ENDPOINT_CONFIG_PREFIX, "endpoint");
     public static final String SSM_CLIENT_SIGNING_REGION = joinWithDot(SSM_CLIENT_ENDPOINT_CONFIG_PREFIX,

src/main/java/com/coveo/configuration/parameterstore/ParameterStorePropertySourceEnvironmentPostProcessor.java

@@ -2,27 +2,23 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.env.EnvironmentPostProcessor;
+import org.springframework.core.Ordered;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.util.ObjectUtils;
 
 import com.coveo.configuration.parameterstore.strategy.ParameterStorePropertySourceConfigurationStrategy;
 import com.coveo.configuration.parameterstore.strategy.ParameterStorePropertySourceConfigurationStrategyFactory;
 import com.coveo.configuration.parameterstore.strategy.StrategyType;
 
-public class ParameterStorePropertySourceEnvironmentPostProcessor implements EnvironmentPostProcessor
+public class ParameterStorePropertySourceEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered
 {
-    static boolean initialized;
     static ParameterStorePropertySourceConfigurationStrategyFactory strategyFactory = new ParameterStorePropertySourceConfigurationStrategyFactory();
 
     @Override
     public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application)
     {
-        if (!initialized && isParameterStorePropertySourceEnabled(environment)) {
+        if (isParameterStorePropertySourceEnabled(environment)) {
             getParameterStorePropertySourceConfigurationStrategy(environment).configureParameterStorePropertySources(environment);
-
-            if (doesNotSupportMultipleApplicationContexts(environment)) {
-                initialized = true;
-            }
         }
     }
 
@@ -44,15 +40,14 @@ private boolean isParameterStorePropertySourceEnabled(ConfigurableEnvironment en
                         && environment.acceptsProfiles(userDefinedEnabledProfiles));
     }
 
-    private boolean doesNotSupportMultipleApplicationContexts(ConfigurableEnvironment environment)
+    private boolean isMultiRegionEnabled(ConfigurableEnvironment environment)
     {
-        return !environment.getProperty(ParameterStorePropertySourceConfigurationProperties.SUPPORT_MULTIPLE_APPLICATION_CONTEXTS,
-                                        Boolean.class,
-                                        Boolean.FALSE);
+        return environment.containsProperty(ParameterStorePropertySourceConfigurationProperties.MULTI_REGION_SSM_CLIENT_REGIONS);
     }
 
-    private boolean isMultiRegionEnabled(ConfigurableEnvironment environment)
+    @Override
+    public int getOrder()
     {
-        return environment.containsProperty(ParameterStorePropertySourceConfigurationProperties.MULTI_REGION_SSM_CLIENT_REGIONS);
+        return Ordered.LOWEST_PRECEDENCE;
     }
 }

src/main/java/com/coveo/configuration/parameterstore/strategy/ParameterStorePropertySourceConfigurationStrategyFactory.java

@@ -11,8 +11,7 @@ public class ParameterStorePropertySourceConfigurationStrategyFactory
     static {
         strategies.put(StrategyType.DEFAULT,
                        new DefaultParameterStorePropertySourceConfigurationStrategy(new DefaultAwsRegionProviderChain()));
-        strategies.put(StrategyType.MULTI_REGION,
-                       new MultiRegionParameterStorePropertySourceConfigurationStrategy());
+        strategies.put(StrategyType.MULTI_REGION, new MultiRegionParameterStorePropertySourceConfigurationStrategy());
     }
 
     public ParameterStorePropertySourceConfigurationStrategy getStrategy(StrategyType strategyType)

src/test/java/com/coveo/configuration/parameterstore/ParameterStorePropertySourceEnvironmentPostProcessorTest.java

@@ -43,18 +43,13 @@ public class ParameterStorePropertySourceEnvironmentPostProcessorTest
     @Before
     public void setUp()
     {
-        ParameterStorePropertySourceEnvironmentPostProcessor.initialized = false;
-
         when(strategyFactoryMock.getStrategy(StrategyType.DEFAULT)).thenReturn(defaultPostProcessStrategyMock);
         when(strategyFactoryMock.getStrategy(StrategyType.MULTI_REGION)).thenReturn(multiRegionPostProcessStrategyMock);
         ParameterStorePropertySourceEnvironmentPostProcessor.strategyFactory = strategyFactoryMock;
 
         when(configurableEnvironmentMock.getProperty(ParameterStorePropertySourceConfigurationProperties.ENABLED,
                                                      Boolean.class,
                                                      Boolean.FALSE)).thenReturn(Boolean.FALSE);
-        when(configurableEnvironmentMock.getProperty(ParameterStorePropertySourceConfigurationProperties.SUPPORT_MULTIPLE_APPLICATION_CONTEXTS,
-                                                     Boolean.class,
-                                                     Boolean.FALSE)).thenReturn(Boolean.FALSE);
 
         System.setProperty(ACCESS_KEY_ENV_VAR, "id");
         System.setProperty(SECRET_KEY_ENV_VAR, "secret");
@@ -140,44 +135,6 @@ public void testParameterStoreIsNotEnabledWithCustomProfilesButNoneOfTheProfiles
         verifyZeroInteractions(multiRegionPostProcessStrategyMock);
     }
 
-    @Test
-    public void testParameterStorePropertySourceEnvironmentPostProcessorCantBeCalledTwice()
-    {
-        when(configurableEnvironmentMock.getProperty(ParameterStorePropertySourceConfigurationProperties.ENABLED,
-                                                     Boolean.class,
-                                                     Boolean.FALSE)).thenReturn(Boolean.TRUE);
-
-        parameterStorePropertySourceEnvironmentPostProcessor.postProcessEnvironment(configurableEnvironmentMock,
-                                                                                    applicationMock);
-
-        parameterStorePropertySourceEnvironmentPostProcessor.postProcessEnvironment(configurableEnvironmentMock,
-                                                                                    applicationMock);
-
-        verify(defaultPostProcessStrategyMock).configureParameterStorePropertySources(configurableEnvironmentMock);
-        verifyZeroInteractions(multiRegionPostProcessStrategyMock);
-    }
-
-    @Test
-    public void testParameterStorePropertySourceEnvironmentPostProcessorCanBeCalledTwiceWhenDisablingMultipleContextSupport()
-    {
-        when(configurableEnvironmentMock.getProperty(ParameterStorePropertySourceConfigurationProperties.ENABLED,
-                                                     Boolean.class,
-                                                     Boolean.FALSE)).thenReturn(Boolean.TRUE);
-        when(configurableEnvironmentMock.getProperty(ParameterStorePropertySourceConfigurationProperties.SUPPORT_MULTIPLE_APPLICATION_CONTEXTS,
-                                                     Boolean.class,
-                                                     Boolean.FALSE)).thenReturn(Boolean.TRUE);
-
-        parameterStorePropertySourceEnvironmentPostProcessor.postProcessEnvironment(configurableEnvironmentMock,
-                                                                                    applicationMock);
-
-        parameterStorePropertySourceEnvironmentPostProcessor.postProcessEnvironment(configurableEnvironmentMock,
-                                                                                    applicationMock);
-
-        verify(defaultPostProcessStrategyMock,
-               times(2)).configureParameterStorePropertySources(configurableEnvironmentMock);
-        verifyZeroInteractions(multiRegionPostProcessStrategyMock);
-    }
-
     @Test
     public void testWhenMultiRegionIsEnabled()
     {