fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13790 from izeye:polish-20180717

Browse Source 
* pr/13790:
  Polish contribution
  Polish
This commit is contained in:
Stephane Nicoll 2018-07-17 10:32:17 +02:00
commit 58efd1b51a
6 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
View File

@ -61,8 +61,8 @@ org.springframework.boot.actuate.autoconfigure.mongo.MongoHealthIndicatorAutoCon
org.springframework.boot.actuate.autoconfigure.neo4j.Neo4jHealthIndicatorAutoConfiguration,\
org.springframework.boot.actuate.autoconfigure.redis.RedisHealthIndicatorAutoConfiguration,\
org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpointAutoConfiguration,\
org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration,\
org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration,\
org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration,\
org.springframework.boot.actuate.autoconfigure.session.SessionsEndpointAutoConfiguration,\
org.springframework.boot.actuate.autoconfigure.solr.SolrHealthIndicatorAutoConfiguration,\
org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthIndicatorAutoConfiguration,\

7
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java
View File

@ -119,12 +119,9 @@ public class ReactiveManagementWebSecurityAutoConfigurationTests {
@Test
public void backsOffWhenWebFilterChainProxyBeanPresent() {
this.contextRunner
.withConfiguration(
AutoConfigurations.of(ReactiveSecurityAutoConfiguration.class))
.withUserConfiguration(WebFilterChainProxyConfiguration.class)
this.contextRunner.withUserConfiguration(WebFilterChainProxyConfiguration.class)
.run((context) -> {
assertThat(getLocationHeader(context, "/health").toString())
assertThat(getLocationHeader(context, "/actuator/health").toString())
.contains("/login");
assertThat(getLocationHeader(context, "/foo").toString())
.contains("/login");

13
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/reactive/client/MetricsWebClientFilterFunctionTests.java
View File

@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.MockClock;
import io.micrometer.core.instrument.Timer;
import io.micrometer.core.instrument.simple.SimpleConfig;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.junit.Before;
@ -128,14 +129,10 @@ public class MetricsWebClientFilterFunctionTests {
this.filterFunction.filter(request, exchange).retry(1)
.onErrorResume(IllegalArgumentException.class, (t) -> Mono.empty())
.block();
assertThat(this.registry
.get("http.client.requests").tags("method", "GET", "uri",
"/projects/spring-boot", "status", "CLIENT_ERROR")
.timer().count()).isEqualTo(2);
assertThat(this.registry.get("http.client.requests")
.tags("method", "GET", "uri", "/projects/spring-boot", "status",
"CLIENT_ERROR")
.timer().max(TimeUnit.MILLISECONDS)).isLessThan(600);
Timer timer = this.registry.get("http.client.requests").tags("method", "GET",
"uri", "/projects/spring-boot", "status", "CLIENT_ERROR").timer();
assertThat(timer.count()).isEqualTo(2);
assertThat(timer.max(TimeUnit.MILLISECONDS)).isLessThan(600);
}
}

10
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -1026,16 +1026,16 @@
<artifactId>javax.mail-api</artifactId>
<version>${javax-mail.version}</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>${javax-persistence.version}</version>
</dependency>
<dependency>
<groupId>javax.money</groupId>
<artifactId>money-api</artifactId>
<version>${javax-money.version}</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>${javax-persistence.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>

6
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -3260,9 +3260,9 @@ default. The `management.endpoints.web.exposure.include` property can be used to
the actuators.
If Spring Security is on the classpath and no other WebSecurityConfigurerAdapter is
present, all actuators other than `/health` and `/info` are secured by Spring Boot auto-config.
If you define a custom `WebSecurityConfigurerAdapter`, Spring Boot auto-config will back off and you will be in
full control of actuator access rules.
present, all actuators other than `/health` and `/info` are secured by Spring Boot
auto-configuration. If you define a custom `WebSecurityConfigurerAdapter`, Spring Boot
auto-configuration will back off and you will be in full control of actuator access rules.
NOTE: Before setting the `management.endpoints.web.exposure.include`, ensure that the
exposed actuators do not contain sensitive information and/or are secured by placing them

18
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/CompositePropertySources.java
View File

@ -19,6 +19,7 @@ package org.springframework.boot.context.properties;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import org.springframework.core.env.PropertySource;
import org.springframework.core.env.PropertySources;
@ -45,23 +46,14 @@ final class CompositePropertySources implements PropertySources {
@Override
public boolean contains(String name) {
for (PropertySources sources : this.propertySources) {
if (sources.contains(name)) {
return true;
}
}
return false;
return this.propertySources.stream()
.anyMatch((sources) -> sources.contains(name));
}
@Override
public PropertySource<?> get(String name) {
for (PropertySources sources : this.propertySources) {
PropertySource<?> source = sources.get(name);
if (source != null) {
return source;
}
}
return null;
return this.propertySources.stream().map((sources) -> sources.get(name))
.filter(Objects::nonNull).findFirst().orElse(null);
}
}