From ee5a1f97227b3e355376753f1c79d8f79bc4b93c Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 30 Oct 2015 09:47:27 +0000 Subject: [PATCH] Make SPRING_APPLICATION_JSON processing happen before config files That way any properties that are needed for processing the config files will be available in time. Makes sense given that env vars is the main carrier of the inline JSON. --- .../boot/env/SpringApplicationJsonEnvironmentPostProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java index b5417190f3..384b99b64e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java +++ b/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java @@ -53,7 +53,7 @@ public class SpringApplicationJsonEnvironmentPostProcessor /** * The default order for the processor. */ - public static final int DEFAULT_ORDER = Ordered.HIGHEST_PRECEDENCE + 20; + public static final int DEFAULT_ORDER = Ordered.HIGHEST_PRECEDENCE + 5; private int order = DEFAULT_ORDER;