Skip to content

Commit de58247

Browse files
authored
Fix startup and EPP ordering (#5670)
1 parent 27d9941 commit de58247

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DefaultEnvironmentPostProcessor.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
2828
import org.springframework.boot.SpringApplication;
29+
import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor;
2930
import org.springframework.boot.env.EnvironmentPostProcessor;
3031
import org.springframework.core.Ordered;
3132
import org.springframework.core.env.ConfigurableEnvironment;
@@ -49,6 +50,11 @@ public class DefaultEnvironmentPostProcessor implements EnvironmentPostProcessor
4950

5051
private static final Logger logger = LoggerFactory.getLogger(DefaultEnvironmentPostProcessor.class);
5152

53+
/**
54+
* The order for the processor - must run before the {@link ConfigDataEnvironmentPostProcessor}.
55+
*/
56+
public static final int ORDER = ConfigDataEnvironmentPostProcessor.ORDER - 5;
57+
5258
private final Resource serverResource = new ClassPathResource("/dataflow-server.yml");
5359

5460
private final Resource serverDefaultsResource = new ClassPathResource("META-INF/dataflow-server-defaults.yml");
@@ -106,6 +112,6 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
106112

107113
@Override
108114
public int getOrder() {
109-
return 0;
115+
return ORDER;
110116
}
111117
}

spring-cloud-dataflow-server-core/src/main/resources/META-INF/dataflow-server-defaults.yml

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ server:
5252
error:
5353
include-message: always
5454
spring:
55+
config:
56+
use-legacy-processing: true
5557
mvc.async.request-timeout: 120000
5658
batch:
5759
initialize-schema: never

0 commit comments

Comments
 (0)