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

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll
2017-03-16 12:40:12 +01:00
parent 22934e097d cd76da9a4c
commit fa3679af71
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java
View File

@@ -16,7 +16,8 @@
package org.springframework.boot.autoconfigure.elasticsearch.jest;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -33,7 +34,8 @@ public class JestProperties {
/**
* Comma-separated list of the Elasticsearch instances to use.
*/
private List<String> uris = Arrays.asList("http://localhost:9200");
private List<String> uris = new ArrayList<String>(
Collections.singletonList("http://localhost:9200"));
/**
* Login user.

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
View File

@@ -73,7 +73,7 @@ public class FlywayProperties {
* SQL statements to execute to initialize a connection immediately after obtaining
* it.
*/
private List<String> initSqls = Collections.emptyList();
private List<String> initSqls = new ArrayList<String>();
public void setLocations(List<String> locations) {
this.locations = locations;

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
View File

@@ -17,7 +17,7 @@
package org.springframework.boot.autoconfigure.security;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.UUID;
@@ -355,7 +355,8 @@ public class SecurityProperties implements SecurityPrerequisite {
/**
* Granted roles for the default user name.
*/
private List<String> role = new ArrayList<String>(Arrays.asList("USER"));
private List<String> role = new ArrayList<String>(
Collections.singletonList("USER"));
private boolean defaultPassword = true;