See gh-13534
This commit is contained in:
Johnny Lim 2018-06-21 05:32:09 +09:00 committed by Stephane Nicoll
parent 9e9e746554
commit b9ea0fd5a7
5 changed files with 13 additions and 14 deletions

View File

@ -57,14 +57,13 @@ public class PropertiesMeterFilter implements MeterFilter {
@Override
public DistributionStatisticConfig configure(Meter.Id id,
DistributionStatisticConfig config) {
DistributionStatisticConfig.Builder builder = DistributionStatisticConfig
.builder();
Distribution distribution = this.properties.getDistribution();
builder.percentilesHistogram(
lookup(distribution.getPercentilesHistogram(), id, null));
builder.percentiles(lookup(distribution.getPercentiles(), id, null));
builder.sla(convertSla(id.getType(), lookup(distribution.getSla(), id, null)));
return builder.build().merge(config);
return DistributionStatisticConfig.builder()
.percentilesHistogram(
lookup(distribution.getPercentilesHistogram(), id, null))
.percentiles(lookup(distribution.getPercentiles(), id, null))
.sla(convertSla(id.getType(), lookup(distribution.getSla(), id, null)))
.build().merge(config);
}
private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) {

View File

@ -139,7 +139,7 @@ public class EndpointRequestTests {
}
@Test
public void toLinksWhenServletPathNotEmptyShouldNotMatch() {
public void toLinksWhenServletPathNotEmptyShouldMatch() {
RequestMatcher matcher = EndpointRequest.toLinks();
RequestMatcherAssert assertMatcher = assertMatcher(matcher, "/actuator",
"/spring");

View File

@ -328,7 +328,7 @@ public class HibernateJpaAutoConfigurationTests
}
@Test
public void hibernatePropertiesCustomizerTakePrecedenceOverStrategyInstancesAndNamingStrategyProperties() {
public void hibernatePropertiesCustomizerTakesPrecedenceOverStrategyInstancesAndNamingStrategyProperties() {
contextRunner()
.withUserConfiguration(
TestHibernatePropertiesCustomizerConfiguration.class,

View File

@ -903,7 +903,7 @@ Lombok does not generate any particular constructor for such a type, as it is us
automatically by the container to instantiate the object.
Finally, only standard Java Bean properties are considered and binding on static
properties are not supported.
properties is not supported.
====
TIP: See also the <<boot-features-external-config-vs-value,differences between `@Value`
@ -6184,7 +6184,7 @@ method's application class>>.
The underlying component scan configuration of `@SpringBootApplication` defines exclude
filters that are used to make sure slicing works as expected. If you are using an explicit
`@ComponentScan` directive on your `@SpringBootApplication`-annoted class, be aware that
`@ComponentScan` directive on your `@SpringBootApplication`-annotated class, be aware that
those filters will be disabled. If you are using slicing, you should define them again.
====