SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Ilayaperumal Gopinathan
2015-09-10 19:41:36 -07:00
parent d9c4f949c0
commit bb326ec32f
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/ModuleLauncher.java
View File

@@ -92,17 +92,15 @@ public class ModuleLauncher {
*
* @param moduleLaunchRequests a list of modules with their arguments
* @param aggregate whether the modules should be aggregated at launch
* @param parentArgs a list of arguments for the whole aggregate
* @param aggregateArgs a list of arguments for the whole aggregate
*/
@SuppressWarnings("unchecked")
public void launch(List<ModuleLaunchRequest> moduleLaunchRequests, boolean aggregate, Map<String,String> parentArgs) {
List<ModuleLaunchRequest> reversed = new ArrayList<>(moduleLaunchRequests);
Collections.reverse(reversed);
public void launch(List<ModuleLaunchRequest> moduleLaunchRequests, boolean aggregate, Map<String,String> aggregateArgs) {
if (moduleLaunchRequests.size() == 1 || !aggregate) {
launchIndividualModules(reversed);
launchIndividualModules(moduleLaunchRequests);
}
else {
launchAggregatedModules(moduleLaunchRequests, parentArgs != null ? parentArgs : Collections.EMPTY_MAP);
launchAggregatedModules(moduleLaunchRequests, aggregateArgs != null ? aggregateArgs : Collections.EMPTY_MAP);
}
}
@@ -133,15 +131,15 @@ public class ModuleLauncher {
}
}
public void launchAggregatedModules(List<ModuleLaunchRequest> moduleLaunchRequests, Map<String,String> parentArgs) {
public void launchAggregatedModules(List<ModuleLaunchRequest> moduleLaunchRequests, Map<String,String> aggregateArgs) {
try {
List<String> mainClassNames = new ArrayList<>();
LinkedHashSet<URL> jarURLs = new LinkedHashSet<>();
List<String> seenArchives = new ArrayList<>();
final List<String[]> arguments = new ArrayList<>();
final ClassLoader classLoader;
if (!(parentArgs.containsKey(EXCLUDE_DEPENDENCIES_ARG) ||
parentArgs.containsKey(INCLUDE_DEPENDENCIES_ARG))) {
if (!(aggregateArgs.containsKey(EXCLUDE_DEPENDENCIES_ARG) ||
aggregateArgs.containsKey(INCLUDE_DEPENDENCIES_ARG))) {
for (ModuleLaunchRequest moduleLaunchRequest : moduleLaunchRequests) {
Resource resource = resolveModule(moduleLaunchRequest.getModule());
JarFileArchive jarFileArchive = new JarFileArchive(resource.getFile());
@@ -186,7 +184,7 @@ public class ModuleLauncher {
arguments.add(toArgArray(moduleLaunchRequest.getArguments()));
}
for (String include :
StringUtils.commaDelimitedListToStringArray(parentArgs.get(INCLUDE_DEPENDENCIES_ARG))) {
StringUtils.commaDelimitedListToStringArray(aggregateArgs.get(INCLUDE_DEPENDENCIES_ARG))) {
includeCoordinates.add(toCoordinates(include, ""));
}
// Resolve all artifacts - since modules have been specified as direct dependencies, they will take
@@ -194,7 +192,7 @@ public class ModuleLauncher {
// part of the response.
Resource[] libraries = moduleResolver.resolve(root,
includeCoordinates.toArray(new Coordinates[includeCoordinates.size()]),
StringUtils.commaDelimitedListToStringArray(parentArgs.get(EXCLUDE_DEPENDENCIES_ARG)));
StringUtils.commaDelimitedListToStringArray(aggregateArgs.get(EXCLUDE_DEPENDENCIES_ARG)));
for (Resource library : libraries) {
jarURLs.add(library.getURL());
}
@@ -206,7 +204,7 @@ public class ModuleLauncher {
mainClasses.add(ClassUtils.forName(mainClass, classLoader));
}
Runnable moduleAggregatorRunner = new ModuleAggregatorRunner(classLoader, mainClasses,
toArgArray(parentArgs), arguments);
toArgArray(aggregateArgs), arguments);
Thread moduleAggregatorRunnerThread = new Thread(moduleAggregatorRunner);
moduleAggregatorRunnerThread.setContextClassLoader(classLoader);
moduleAggregatorRunnerThread.setName(MODULE_AGGREGATOR_RUNNER_THREAD_NAME);

5
spring-cloud-stream-module-launcher/src/main/java/org/springframework/cloud/stream/module/launcher/MultiArchiveLauncher.java
View File

@@ -26,14 +26,13 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.boot.loader.Launcher;
import org.springframework.boot.loader.archive.Archive;
import org.springframework.cloud.stream.module.utils.ClassloaderUtils;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
/**
* A {@link Launcher} for multiple independent JAR archives (which aren't nested in an uberjar). This class
* supports module aggregation and direct binding.
* A {@link Launcher} for multiple independent JAR archives (which aren't nested in an uber jar). This class
* supports adding includes and excludes to a module's classpath.
*
* @author Marius Bogoevici
* @author Eric Bottard