From 5af49bd9691ae399aea8dfd31bd75fa07323e93b Mon Sep 17 00:00:00 2001 From: Marius Bogoevici Date: Fri, 31 Jul 2015 15:35:54 -0400 Subject: [PATCH] Refactored no-arg constructor --- .../module/launcher/ModuleLauncher.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncher.java b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncher.java index 1cd221e44..6b0afd6bf 100644 --- a/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncher.java +++ b/spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncher.java @@ -62,11 +62,7 @@ public class ModuleLauncher { private final ModuleResolver moduleResolver; public ModuleLauncher() { - this(DEFAULT_LOCAL_REPO); - } - - public ModuleLauncher(String localRepository) { - this(localRepository, + this(determineLocalRepositoryLocation(), Collections.singletonMap("spring-cloud-stream-modules", "http://repo.spring.io/spring-cloud-stream-modules")); } @@ -111,6 +107,17 @@ public class ModuleLauncher { return moduleResolver.resolve(groupId, artifactId, extension, classifier, version); } + private static String determineLocalRepositoryLocation() { + String localRepository = System.getProperty("local.repository"); + if (localRepository == null) { + localRepository = System.getenv("LOCAL_REPOSITORY"); + } + if (localRepository == null) { + localRepository = DEFAULT_LOCAL_REPO; + } + return localRepository; + } + public static void main(String[] args) throws Exception { String modules = System.getProperty("modules"); if (modules == null) { @@ -120,15 +127,7 @@ public class ModuleLauncher { System.err.println("Either the 'modules' system property or 'MODULES' environment variable is required."); System.exit(1); } - - String localRepository = System.getProperty("local.repository"); - if (localRepository == null) { - localRepository = System.getenv("LOCAL_REPOSITORY"); - } - if (localRepository == null) { - localRepository = DEFAULT_LOCAL_REPO; - } - ModuleLauncher launcher = new ModuleLauncher(localRepository); + ModuleLauncher launcher = new ModuleLauncher(); launcher.launch(modules.split(","), args); } }