From b7296705f3f863d9b55ffcc28f3716b476e7f83b Mon Sep 17 00:00:00 2001 From: Marius Bogoevici Date: Thu, 13 Aug 2015 09:50:32 -0400 Subject: [PATCH] Remove application.yml and initialize properties within ModuleLauncherProperties Add javadoc --- .../launcher/ModuleLauncherConfiguration.java | 2 +- .../module/launcher/ModuleLauncherProperties.java | 14 ++++++++++++-- .../module/launcher/ModuleLauncherRunner.java | 1 - .../src/main/resources/application.yml | 2 -- 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 spring-cloud-stream-module-launcher/src/main/resources/application.yml diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherConfiguration.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherConfiguration.java index 93c79c681..68f920ac8 100644 --- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherConfiguration.java +++ b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherConfiguration.java @@ -40,7 +40,7 @@ public class ModuleLauncherConfiguration { private ModuleLauncherProperties properties; /** - * Sets up the default Aether-based module resolver, unless overridden + * Sets up the default Aether-based module resolver, unless overridden. */ @Bean @ConditionalOnMissingBean(ModuleResolver.class) diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherProperties.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherProperties.java index facde41d0..00911f09c 100644 --- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherProperties.java +++ b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherProperties.java @@ -21,14 +21,24 @@ import java.io.File; import org.springframework.boot.context.properties.ConfigurationProperties; /** + * Contains configuration properties for the module launcher. + * * @author Ilayaperumal Gopinathan + * @author Marius Bogoevici */ @ConfigurationProperties public class ModuleLauncherProperties { - private File localRepository; + /** + * File path to a locally available maven repository, where modules will be downloaded. + */ + private File localRepository = new File(System.getProperty("user.home") + + File.separator + ".m2" + File.separator + "repository"); - private String remoteRepository; + /** + * Location of a remote maven repository from which modules will be downloaded, if not available locally. + */ + private String remoteRepository = "https://repo.spring.io/libs-snapshot"; public void setRemoteRepository(String remoteRepository) { this.remoteRepository = remoteRepository; diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherRunner.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherRunner.java index 7ed9152ae..4b763eae2 100644 --- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherRunner.java +++ b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncherRunner.java @@ -32,7 +32,6 @@ import org.springframework.util.StringUtils; */ @Component @ConfigurationProperties -// TODO: use a prefix public class ModuleLauncherRunner implements ApplicationRunner, InitializingBean { private final static Log log = LogFactory.getLog(ModuleLauncherRunner.class); diff --git a/spring-cloud-stream-module-launcher/src/main/resources/application.yml b/spring-cloud-stream-module-launcher/src/main/resources/application.yml deleted file mode 100644 index 23e6618cf..000000000 --- a/spring-cloud-stream-module-launcher/src/main/resources/application.yml +++ /dev/null @@ -1,2 +0,0 @@ -localRepository: ${user.home}${file.separator}.m2${file.separator}repository -remoteRepository: https://repo.spring.io/libs-snapshot