Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
Closes gh-31152
This commit is contained in:
Andy Wilkinson 2022-05-23 12:51:13 +01:00
commit f9db6ad237
2 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfiguration.java
View File

@ -40,6 +40,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.web.servlet.ConditionalOnMissingFilterBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
@ -79,7 +80,7 @@ public class WebMvcMetricsAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingFilterBean
public FilterRegistrationBean<WebMvcMetricsFilter> webMvcMetricsFilter(MeterRegistry registry,
WebMvcTagsProvider tagsProvider) {
ServerRequest request = this.properties.getWeb().getServer().getRequest();

65
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java
View File

@ -121,12 +121,32 @@ class WebMvcMetricsAutoConfigurationTests {
}
@Test
void filterRegistrationBacksOff() {
this.contextRunner.withUserConfiguration(TestWebMvcMetricsFilterConfiguration.class).run((context) -> {
assertThat(context).hasSingleBean(FilterRegistrationBean.class);
assertThat(context.getBean(FilterRegistrationBean.class))
.isSameAs(context.getBean("testWebMvcMetricsFilter"));
});
void filterRegistrationBacksOffWithAnotherWebMvcMetricsFilterRegistration() {
this.contextRunner.withUserConfiguration(TestWebMvcMetricsFilterRegistrationConfiguration.class)
.run((context) -> {
assertThat(context).hasSingleBean(FilterRegistrationBean.class);
assertThat(context.getBean(FilterRegistrationBean.class))
.isSameAs(context.getBean("testWebMvcMetricsFilter"));
});
}
@Test
void filterRegistrationBacksOffWithAnotherWebMvcMetricsFilter() {
this.contextRunner.withUserConfiguration(TestWebMvcMetricsFilterConfiguration.class)
.run((context) -> assertThat(context).doesNotHaveBean(FilterRegistrationBean.class)
.hasSingleBean(WebMvcMetricsFilter.class));
}
@Test
void filterRegistrationDoesNotBackOffWithOtherFilterRegistration() {
this.contextRunner.withUserConfiguration(TestFilterRegistrationConfiguration.class)
.run((context) -> assertThat(context).hasBean("testFilter").hasBean("webMvcMetricsFilter"));
}
@Test
void filterRegistrationDoesNotBackOffWithOtherFilter() {
this.contextRunner.withUserConfiguration(TestFilterConfiguration.class)
.run((context) -> assertThat(context).hasBean("testFilter").hasBean("webMvcMetricsFilter"));
}
@Test
@ -257,7 +277,7 @@ class WebMvcMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
static class TestWebMvcMetricsFilterConfiguration {
static class TestWebMvcMetricsFilterRegistrationConfiguration {
@Bean
@SuppressWarnings("unchecked")
@ -267,4 +287,35 @@ class WebMvcMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
static class TestWebMvcMetricsFilterConfiguration {
@Bean
WebMvcMetricsFilter testWebMvcMetricsFilter() {
return new WebMvcMetricsFilter(null, null, null, null);
}
}
@Configuration(proxyBeanMethods = false)
static class TestFilterRegistrationConfiguration {
@Bean
@SuppressWarnings("unchecked")
FilterRegistrationBean<Filter> testFilter() {
return mock(FilterRegistrationBean.class);
}
}
@Configuration(proxyBeanMethods = false)
static class TestFilterConfiguration {
@Bean
Filter testFilter() {
return mock(Filter.class);
}
}
}