Setup custom S3PropertySource

Author: ericdallo

src/main/java/com/spring/loader/S3PropertiesLocation.java

@@ -7,10 +7,9 @@
 import java.lang.annotation.Target;
 
 import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.AliasFor;
 
 /**
- * Allow the auto configuration of the {@link S3PropertyPlaceholderConfigurer} bean.
+ * Allow the auto configuration of the {@link S3PropertySource} bean.
  * 
  * @author Eric Dallo
  * @since 1.0.3
@@ -27,11 +26,7 @@
 	 * 
 	 * @return the path of aws s3 properties, e.g. my-bucket/my-folder/app.properties  
 	 */
-	@AliasFor("path")
-	String[] value() default {};
-	
-	@AliasFor("value")
-	String[] path() default {};
+	String[] value();
 
 	/**
 	 * The profiles to load the properties in aws s3.

src/main/java/com/spring/loader/S3PropertiesLocationRegistrar.java

@@ -13,13 +13,13 @@
 import org.springframework.core.type.AnnotationMetadata;
 
 /**
- * Creates the {@link S3PropertyPlaceholderConfigurer} bean.
+ * Creates the {@link S3PropertySource} bean.
  * For use with the {@link S3PropertiesLocation} annotation. 
  * 
  * @author Eric Dallo
  * @since 1.0.3
  * @see S3PropertiesLocation
- * @see S3PropertyPlaceholderConfigurer
+ * @see S3PropertySource
  */
 class S3PropertiesLocationRegistrar implements EnvironmentAware, ImportBeanDefinitionRegistrar {
 
@@ -36,12 +36,12 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
 
 		String[] locations = attributes.getStringArray("value");
 
-		BeanDefinition bd = new RootBeanDefinition(S3PropertyPlaceholderConfigurer.class);
+		BeanDefinition bd = new RootBeanDefinition(S3PropertiesSourceConfigurer.class);
 
 		bd.getPropertyValues().addPropertyValue("s3ResourceLoader", new RuntimeBeanReference("s3ResourceLoader")); 
 		bd.getPropertyValues().add("s3Locations", locations);
 
-		String beanName = S3PropertyPlaceholderConfigurer.class.getSimpleName();
+		String beanName = S3PropertiesSourceConfigurer.class.getSimpleName();
 		registry.registerBeanDefinition(toLowerCase(beanName.charAt(0)) + beanName.substring(1), bd);
 	}
 

src/main/java/com/spring/loader/S3PropertiesSourceConfigurer.java

@@ -0,0 +1,76 @@
+package com.spring.loader;
+
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.PropertiesFactoryBean;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.Ordered;
+import org.springframework.core.PriorityOrdered;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.MutablePropertySources;
+
+/**
+ * Add a new {@link PropertySource} to spring property sources from a S3 bucket 
+ * For use with the {@link S3PropertiesLocation} annotation. 
+ * 
+ * @author Eric Dallo
+ * @since 2.0
+ * @see S3PropertiesLocation
+ * @see S3PropertySource
+ */
+class S3PropertiesSourceConfigurer implements EnvironmentAware, BeanFactoryPostProcessor, PriorityOrdered {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(S3PropertiesSourceConfigurer.class);
+	
+	private Environment environment;
+	private S3ResourceLoader s3ResourceLoader;
+	private String[] s3Locations;
+
+	public void setS3ResourceLoader(S3ResourceLoader s3ResourceLoader) {
+		this.s3ResourceLoader = s3ResourceLoader;
+	}
+	
+	public void setS3Locations(String[] s3Locations) {
+		this.s3Locations = s3Locations;
+	}
+	
+	@Override
+	public void setEnvironment(Environment environment) {
+		this.environment = environment;
+	}
+	
+	@Override
+	public int getOrder() {
+		return Ordered.HIGHEST_PRECEDENCE;
+	}
+	
+	@Override
+	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+		if (this.environment instanceof ConfigurableEnvironment) {
+			
+			PropertiesFactoryBean propertiesFactory = new PropertiesFactoryBean();
+			MutablePropertySources propertySources = ((ConfigurableEnvironment) this.environment).getPropertySources();
+			
+			for (String s3Location : s3Locations) {
+				
+				propertiesFactory.setLocation(s3ResourceLoader.getResource(s3Location));
+				try {
+					propertiesFactory.afterPropertiesSet();
+					propertySources.addFirst(new S3PropertySource(propertiesFactory.getObject()));
+				} catch (IOException e) {
+					LOGGER.error("Could not read properties from s3Location: " + s3Location, e);
+				}
+			}
+			
+		} else {
+			LOGGER.warn("Environment is not of type '{}' property source with instance data is not available", ConfigurableEnvironment.class.getName());
+		}
+	}
+
+}

src/main/java/com/spring/loader/S3PropertyPlaceholderConfigurer.java

@@ -0,0 +1,22 @@
+package com.spring.loader;
+
+import java.util.Properties;
+
+import org.springframework.core.env.PropertySource;
+
+class S3PropertySource extends PropertySource<Object> {
+	
+	private static final String S3_PROPERTY_SOURCE_NAME = "s3PropertySource";
+
+	private final Properties properties;
+
+	S3PropertySource (Properties properties) {
+		super(S3_PROPERTY_SOURCE_NAME);
+		this.properties = properties;
+	}
+
+	@Override
+	public Object getProperty(String name) {
+		return properties.get(name); 
+	}
+}

src/main/java/com/spring/loader/S3PropertySource.java

@@ -16,7 +16,7 @@
  * 
  * @author Eric Dallo
  * @since 1.0.0
- * @see S3PropertyPlaceholderConfigurer
+ * @see S3PropertySource
  */
 class S3ResourceLoader implements ResourceLoader {