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

Add support for @Order in BootstrapConfiguration

Browse Source
This commit is contained in:
Dave Syer
2015-04-21 08:19:36 +02:00
parent 964550bc1e
commit 598819bd66
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
View File

@@ -48,7 +48,7 @@ import org.springframework.util.StringUtils;
* spring.factories as {@link BootstrapConfiguration}, and initialized with external
* config taken from "bootstrap.properties" (or yml), instead of the normal
* "application.properties".
*
*
* @author Dave Syer
*
*/
@@ -122,6 +122,7 @@ public class BootstrapApplicationListener implements
sources.add(cls);
}
builder.sources(sources.toArray(new Class[sources.size()]));
AnnotationAwareOrderComparator.sort(sources);
final ConfigurableApplicationContext context = builder.run();
// Make the bootstrap context a parent of the app context
addAncestorInitializer(application, context);
@@ -203,7 +204,8 @@ public class BootstrapApplicationListener implements
while (context.getParent() != null && context.getParent() != context) {
context = (ConfigurableApplicationContext) context.getParent();
}
new ParentContextApplicationContextInitializer(parent).initialize(context);
new ParentContextApplicationContextInitializer(this.parent)
.initialize(context);
}
private void preemptMerge(MutablePropertySources propertySources,