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

Polish

This commit is contained in:
Phillip Webb 2016-10-03 21:58:13 -07:00
parent f59cc25e2b
commit 39ed0d4dfb
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java
View File

@ -17,8 +17,7 @@
package org.springframework.boot.actuate.autoconfigure; package org.springframework.boot.actuate.autoconfigure;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.ArrayList; import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -179,7 +178,7 @@ public class ManagementServerProperties implements SecurityPrerequisite {
/** /**
* Comma-separated list of roles that can access the management endpoint. * Comma-separated list of roles that can access the management endpoint.
*/ */
private List<String> roles = new ArrayList<String>(Collections.singletonList("ADMIN")); private List<String> roles = Arrays.asList("ADMIN");
/** /**
* Session creating policy to use (always, never, if_required, stateless). * Session creating policy to use (always, never, if_required, stateless).
@ -200,7 +199,7 @@ public class ManagementServerProperties implements SecurityPrerequisite {
@Deprecated @Deprecated
public void setRole(String role) { public void setRole(String role) {
this.roles = new ArrayList<String>(Collections.singletonList(role)); this.roles = Arrays.asList(role);
} }
public List<String> getRoles() { public List<String> getRoles() {

3
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
View File

@ -82,8 +82,7 @@ public class ManagementServerPropertiesAutoConfigurationTests {
@Test @Test
public void managementRolesAllowsIndexedAccess() { public void managementRolesAllowsIndexedAccess() {
ManagementServerProperties properties = load( ManagementServerProperties properties = load("management.security.roles[0]=FOO");
"management.security.roles[0]=FOO");
assertThat(properties.getSecurity().getRoles()).containsOnly("FOO"); assertThat(properties.getSecurity().getRoles()).containsOnly("FOO");
} }

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

@ -16,8 +16,7 @@
package org.springframework.boot.autoconfigure.elasticsearch.jest; package org.springframework.boot.autoconfigure.elasticsearch.jest;
import java.util.ArrayList; import java.util.Arrays;
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;
@ -34,8 +33,7 @@ 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 = new ArrayList<String>(Collections.singletonList( private List<String> uris = Arrays.asList("http://localhost:9200");
"http://localhost:9200"));
/** /**
* Login user. * Login user.