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 @Override
public DistributionStatisticConfig configure(Meter.Id id, public DistributionStatisticConfig configure(Meter.Id id,
DistributionStatisticConfig config) { DistributionStatisticConfig config) {
DistributionStatisticConfig.Builder builder = DistributionStatisticConfig
.builder();
Distribution distribution = this.properties.getDistribution(); Distribution distribution = this.properties.getDistribution();
builder.percentilesHistogram( return DistributionStatisticConfig.builder()
lookup(distribution.getPercentilesHistogram(), id, null)); .percentilesHistogram(
builder.percentiles(lookup(distribution.getPercentiles(), id, null)); lookup(distribution.getPercentilesHistogram(), id, null))
builder.sla(convertSla(id.getType(), lookup(distribution.getSla(), id, null))); .percentiles(lookup(distribution.getPercentiles(), id, null))
return builder.build().merge(config); .sla(convertSla(id.getType(), lookup(distribution.getSla(), id, null)))
.build().merge(config);
} }
private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) { private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) {

View File

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

View File

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

View File

@ -2,7 +2,7 @@
CREATE TABLE QRTZ_TEST_TABLE ( CREATE TABLE QRTZ_TEST_TABLE (
SCHED_NAME VARCHAR(120) NOT NULL, SCHED_NAME VARCHAR(120) NOT NULL,
CALENDAR_NAME VARCHAR (200) NOT NULL CALENDAR_NAME VARCHAR (200) NOT NULL
); );
## Another comment ## Another comment

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. automatically by the container to instantiate the object.
Finally, only standard Java Bean properties are considered and binding on static 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` TIP: See also the <<boot-features-external-config-vs-value,differences between `@Value`
@ -4634,7 +4634,7 @@ relevant annotation to its method, as shown in the following example:
[source,java,indent=0] [source,java,indent=0]
---- ----
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@ -6184,7 +6184,7 @@ method's application class>>.
The underlying component scan configuration of `@SpringBootApplication` defines exclude 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 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. those filters will be disabled. If you are using slicing, you should define them again.
==== ====
@ -7914,7 +7914,7 @@ instance lifecycle to "per-class"].
* https://try.kotlinlang.org/[Try Kotlin in your browser] * https://try.kotlinlang.org/[Try Kotlin in your browser]
* https://blog.jetbrains.com/kotlin/[Kotlin blog] * https://blog.jetbrains.com/kotlin/[Kotlin blog]
* https://kotlin.link/[Awesome Kotlin] * https://kotlin.link/[Awesome Kotlin]
* https://spring.io/guides/tutorials/spring-boot-kotlin/[Tutorial: building web applications with Spring Boot and Kotlin ] * https://spring.io/guides/tutorials/spring-boot-kotlin/[Tutorial: building web applications with Spring Boot and Kotlin]
* https://spring.io/blog/2016/02/15/developing-spring-boot-applications-with-kotlin[Developing Spring Boot applications with Kotlin] * https://spring.io/blog/2016/02/15/developing-spring-boot-applications-with-kotlin[Developing Spring Boot applications with Kotlin]
* https://spring.io/blog/2016/03/20/a-geospatial-messenger-with-kotlin-spring-boot-and-postgresql[A Geospatial Messenger with Kotlin, Spring Boot and PostgreSQL] * https://spring.io/blog/2016/03/20/a-geospatial-messenger-with-kotlin-spring-boot-and-postgresql[A Geospatial Messenger with Kotlin, Spring Boot and PostgreSQL]
* https://spring.io/blog/2017/01/04/introducing-kotlin-support-in-spring-framework-5-0[Introducing Kotlin support in Spring Framework 5.0] * https://spring.io/blog/2017/01/04/introducing-kotlin-support-in-spring-framework-5-0[Introducing Kotlin support in Spring Framework 5.0]