root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-03-16 12:43:47 +01:00
parent 0c4c2f4bf4 fa3679af71
commit b7d3aad54b
4 changed files with 17 additions and 14 deletions
Show Stats 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; package org.springframework.boot.autoconfigure.elasticsearch.jest;
import java.util.Arrays; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
@ -33,7 +34,8 @@ public class JestProperties {
/** /**
* Comma-separated list of the Elasticsearch instances to use. * 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. * 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 * SQL statements to execute to initialize a connection immediately after obtaining
* it. * it.
*/ */
private List<String> initSqls = Collections.emptyList(); private List<String> initSqls = new ArrayList<String>();
public void setLocations(List<String> locations) { public void setLocations(List<String> locations) {
this.locations = locations; this.locations = locations;

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

@ -17,8 +17,7 @@
package org.springframework.boot.autoconfigure.security; package org.springframework.boot.autoconfigure.security;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -91,7 +90,7 @@ public class SecurityProperties implements SecurityPrerequisite {
/** /**
* Comma-separated list of paths to exclude from the default secured paths. * Comma-separated list of paths to exclude from the default secured paths.
*/ */
private List<String> ignored = new ArrayList<>(); private List<String> ignored = new ArrayList<String>();
private final User user = new User(); private final User user = new User();
@ -357,7 +356,8 @@ public class SecurityProperties implements SecurityPrerequisite {
/** /**
* Granted roles for the default user name. * Granted roles for the default user name.
*/ */
private List<String> role = new ArrayList<>(Arrays.asList("USER")); private List<String> role = new ArrayList<String>(
Collections.singletonList("USER"));
private boolean defaultPassword = true; private boolean defaultPassword = true;

15
spring-boot/src/main/java/org/springframework/boot/jta/narayana/NarayanaProperties.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,7 @@
package org.springframework.boot.jta.narayana; package org.springframework.boot.jta.narayana;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -90,22 +91,22 @@ public class NarayanaProperties {
/** /**
* Comma-separated list of orphan filters. * Comma-separated list of orphan filters.
*/ */
private List<String> xaResourceOrphanFilters = Arrays.asList( private List<String> xaResourceOrphanFilters = new ArrayList<String>(Arrays.asList(
"com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter", "com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter",
"com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter"); "com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter"));
/** /**
* Comma-separated list of recovery modules. * Comma-separated list of recovery modules.
*/ */
private List<String> recoveryModules = Arrays.asList( private List<String> recoveryModules = new ArrayList<String>(Arrays.asList(
"com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule", "com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule",
"com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"); "com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"));
/** /**
* Comma-separated list of expiry scanners. * Comma-separated list of expiry scanners.
*/ */
private List<String> expiryScanners = Collections.singletonList( private List<String> expiryScanners = new ArrayList<String>(Collections.singletonList(
"com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"); "com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"));
public String getLogDir() { public String getLogDir() {
return this.logDir; return this.logDir;