Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x

Browse Source 
Closes gh-22964
This commit is contained in:
Phillip Webb
2020-08-14 17:08:48 -07:00
parent 03d4b89c06 89a6f83344
commit 1675b47637
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
View File

@@ -381,16 +381,6 @@ public class SpringApplicationBuilder {
return this;
}
/**
* Default properties for the environment in the form {@code key=value} or
* {@code key:value}.
* @param defaultProperties the properties to set.
* @return the current builder
*/
public SpringApplicationBuilder properties(String... defaultProperties) {
return properties(getMapFromKeyValuePairs(defaultProperties));
}
/**
* Flag to control whether the application should be initialized lazily.
* @param lazyInitialization the flag to set. Defaults to false.
@@ -402,6 +392,19 @@ public class SpringApplicationBuilder {
return this;
}
/**
* Default properties for the environment in the form {@code key=value} or
* {@code key:value}. Multiple calls to this method are cumulative and will not clear
* any previously set properties.
* @param defaultProperties the properties to set.
* @return the current builder
* @see SpringApplicationBuilder#properties(Properties)
* @see SpringApplicationBuilder#properties(Map)
*/
public SpringApplicationBuilder properties(String... defaultProperties) {
return properties(getMapFromKeyValuePairs(defaultProperties));
}
private Map<String, Object> getMapFromKeyValuePairs(String[] properties) {
Map<String, Object> map = new HashMap<>();
for (String property : properties) {
@@ -425,10 +428,12 @@ public class SpringApplicationBuilder {
}
/**
* Default properties for the environment in the form {@code key=value} or
* {@code key:value}.
* Default properties for the environment.Multiple calls to this method are cumulative
* and will not clear any previously set properties.
* @param defaultProperties the properties to set.
* @return the current builder
* @see SpringApplicationBuilder#properties(String...)
* @see SpringApplicationBuilder#properties(Map)
*/
public SpringApplicationBuilder properties(Properties defaultProperties) {
return properties(getMapFromProperties(defaultProperties));
@@ -444,10 +449,11 @@ public class SpringApplicationBuilder {
/**
* Default properties for the environment. Multiple calls to this method are
* cumulative.
* cumulative and will not clear any previously set properties.
* @param defaults the default properties
* @return the current builder
* @see SpringApplicationBuilder#properties(String...)
* @see SpringApplicationBuilder#properties(Properties)
*/
public SpringApplicationBuilder properties(Map<String, Object> defaults) {
this.defaultProperties.putAll(defaults);