Skip to content

Commit 92d6c54

Browse files
wilkinsonawilkinsona
committed
Merge pull request #45880 from quaff
* gh-45880: Polish usage of `@ConditionalOnWebApplication` for consistency Closes gh-45880
2 parents 803a29c + af8558a commit 92d6c54

File tree

34 files changed

+68
-34
lines changed

34 files changed

+68
-34
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
5252
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
5353
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
54+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
5455
import org.springframework.boot.cloud.CloudPlatform;
5556
import org.springframework.boot.info.GitProperties;
5657
import org.springframework.context.ApplicationContext;
@@ -77,7 +78,7 @@
7778
*/
7879
@AutoConfiguration(after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class })
7980
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
80-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
81+
@ConditionalOnWebApplication(type = Type.REACTIVE)
8182
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
8283
public class ReactiveCloudFoundryActuatorAutoConfiguration {
8384

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4949
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
5050
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
51+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
5152
import org.springframework.boot.autoconfigure.security.SecurityProperties;
5253
import org.springframework.boot.cloud.CloudPlatform;
5354
import org.springframework.boot.info.GitProperties;
@@ -78,7 +79,7 @@
7879
@AutoConfiguration(after = { ServletManagementContextAutoConfiguration.class, HealthEndpointAutoConfiguration.class,
7980
InfoEndpointAutoConfiguration.class })
8081
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
81-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
82+
@ConditionalOnWebApplication(type = Type.SERVLET)
8283
@ConditionalOnClass(DispatcherServlet.class)
8384
@ConditionalOnBean(DispatcherServlet.class)
8485
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3333
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
35+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
3536
import org.springframework.boot.autoconfigure.jersey.ResourceConfigCustomizer;
3637
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3738
import org.springframework.context.annotation.Bean;
@@ -47,7 +48,7 @@
4748
* @since 2.1.0
4849
*/
4950
@AutoConfiguration(after = { ObservationAutoConfiguration.class })
50-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
51+
@ConditionalOnWebApplication(type = Type.SERVLET)
5152
@ConditionalOnClass({ ResourceConfig.class, ObservationApplicationEventListener.class })
5253
@ConditionalOnBean({ ResourceConfig.class, ObservationRegistry.class })
5354
@EnableConfigurationProperties({ MetricsProperties.class, ObservationProperties.class })

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3333
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
35+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
3536
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3637
import org.springframework.context.annotation.Bean;
3738
import org.springframework.core.annotation.Order;
@@ -51,7 +52,7 @@
5152
@AutoConfiguration(after = { SimpleMetricsExportAutoConfiguration.class, ObservationAutoConfiguration.class })
5253
@ConditionalOnClass({ Observation.class, MeterRegistry.class })
5354
@ConditionalOnBean({ ObservationRegistry.class, MeterRegistry.class })
54-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
55+
@ConditionalOnWebApplication(type = Type.REACTIVE)
5556
@EnableConfigurationProperties({ MetricsProperties.class, ObservationProperties.class })
5657
public class WebFluxObservationAutoConfiguration {
5758

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/WebMvcObservationAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3636
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3737
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
38+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
3839
import org.springframework.boot.autoconfigure.web.servlet.ConditionalOnMissingFilterBean;
3940
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4041
import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -58,7 +59,7 @@
5859
*/
5960
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class,
6061
SimpleMetricsExportAutoConfiguration.class, ObservationAutoConfiguration.class })
61-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
62+
@ConditionalOnWebApplication(type = Type.SERVLET)
6263
@ConditionalOnClass({ DispatcherServlet.class, Observation.class })
6364
@ConditionalOnBean(ObservationRegistry.class)
6465
@EnableConfigurationProperties({ MetricsProperties.class, ObservationProperties.class })

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
31+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
3132
import org.springframework.boot.autoconfigure.security.oauth2.client.reactive.ReactiveOAuth2ClientAutoConfiguration;
3233
import org.springframework.boot.autoconfigure.security.oauth2.resource.reactive.ReactiveOAuth2ResourceServerAutoConfiguration;
3334
import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration;
@@ -62,7 +63,7 @@
6263
ReactiveUserDetailsServiceAutoConfiguration.class })
6364
@ConditionalOnClass({ EnableWebFluxSecurity.class, WebFilterChainProxy.class })
6465
@ConditionalOnMissingBean({ SecurityWebFilterChain.class, WebFilterChainProxy.class })
65-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
66+
@ConditionalOnWebApplication(type = Type.REACTIVE)
6667
public class ReactiveManagementWebSecurityAutoConfiguration {
6768

6869
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.boot.autoconfigure.AutoConfiguration;
2525
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
27+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2728
import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSecurity;
2829
import org.springframework.boot.autoconfigure.security.SecurityProperties;
2930
import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
@@ -55,7 +56,7 @@
5556
after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class,
5657
WebEndpointAutoConfiguration.class, OAuth2ClientAutoConfiguration.class,
5758
OAuth2ResourceServerAutoConfiguration.class, Saml2RelyingPartyAutoConfiguration.class })
58-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
59+
@ConditionalOnWebApplication(type = Type.SERVLET)
5960
@ConditionalOnDefaultWebSecurity
6061
public class ManagementWebSecurityAutoConfiguration {
6162

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/SecurityRequestMatchersManagementContextConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
27+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2728
import org.springframework.boot.autoconfigure.security.servlet.AntPathRequestMatcherProvider;
2829
import org.springframework.boot.autoconfigure.security.servlet.RequestMatcherProvider;
2930
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletPath;
@@ -42,7 +43,7 @@
4243
*/
4344
@ManagementContextConfiguration(proxyBeanMethods = false)
4445
@ConditionalOnClass({ RequestMatcher.class })
45-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
46+
@ConditionalOnWebApplication(type = Type.SERVLET)
4647
public class SecurityRequestMatchersManagementContextConfiguration {
4748

4849
@Configuration(proxyBeanMethods = false)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyChildManagementContextConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
27+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2728
import org.springframework.boot.autoconfigure.web.servlet.JerseyApplicationPath;
2829
import org.springframework.context.annotation.Bean;
2930
import org.springframework.context.annotation.Import;
@@ -38,7 +39,7 @@
3839
*/
3940
@ManagementContextConfiguration(value = ManagementContextType.CHILD, proxyBeanMethods = false)
4041
@Import(JerseyManagementContextConfiguration.class)
41-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
42+
@ConditionalOnWebApplication(type = Type.SERVLET)
4243
@ConditionalOnClass(ResourceConfig.class)
4344
@ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet")
4445
public class JerseyChildManagementContextConfiguration {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
28+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2829
import org.springframework.boot.autoconfigure.jersey.JerseyProperties;
2930
import org.springframework.boot.autoconfigure.jersey.ResourceConfigCustomizer;
3031
import org.springframework.boot.autoconfigure.web.servlet.DefaultJerseyApplicationPath;
@@ -43,7 +44,7 @@
4344
*/
4445
@ManagementContextConfiguration(value = ManagementContextType.SAME, proxyBeanMethods = false)
4546
@EnableConfigurationProperties(JerseyProperties.class)
46-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
47+
@ConditionalOnWebApplication(type = Type.SERVLET)
4748
@ConditionalOnClass(ResourceConfig.class)
4849
@ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet")
4950
public class JerseySameManagementContextConfiguration {

0 commit comments

Comments
 (0)