Skip to content

Commit 912b50e

Browse files
wilkinsonawilkinsona
committed
Merge branch '3.5.x'
Closes gh-46316
2 parents d4e95cd + c9fa96d commit 912b50e

File tree

38 files changed

+76
-38
lines changed

38 files changed

+76
-38
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
5050
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
5151
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
52+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
5253
import org.springframework.boot.cloud.CloudPlatform;
5354
import org.springframework.boot.cloudfoundry.actuate.autoconfigure.endpoint.CloudFoundryWebEndpointDiscoverer;
5455
import org.springframework.boot.cloudfoundry.actuate.autoconfigure.endpoint.servlet.CloudFoundryInfoEndpointWebExtension;
@@ -77,7 +78,7 @@
7778
*/
7879
@AutoConfiguration(after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class })
7980
@ConditionalOnBooleanProperty(name = "management.cloudfoundry.enabled", matchIfMissing = true)
80-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
81+
@ConditionalOnWebApplication(type = Type.REACTIVE)
8182
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
8283
public class CloudFoundryReactiveActuatorAutoConfiguration {
8384

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
4747
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4848
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
49+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
4950
import org.springframework.boot.cloud.CloudPlatform;
5051
import org.springframework.boot.cloudfoundry.actuate.autoconfigure.endpoint.CloudFoundryWebEndpointDiscoverer;
5152
import org.springframework.boot.info.GitProperties;
@@ -78,7 +79,7 @@
7879
@AutoConfiguration(after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class },
7980
afterName = "org.springframework.boot.servlet.autoconfigure.actuate.web.ServletManagementContextAutoConfiguration")
8081
@ConditionalOnBooleanProperty(name = "management.cloudfoundry.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-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerReactiveWebConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
25+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2526
import org.springframework.context.annotation.Bean;
2627
import org.springframework.context.annotation.Configuration;
2728
import org.springframework.web.reactive.result.view.freemarker.FreeMarkerConfig;
@@ -35,7 +36,7 @@
3536
* @author Andy Wilkinson
3637
*/
3738
@Configuration(proxyBeanMethods = false)
38-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
39+
@ConditionalOnWebApplication(type = Type.REACTIVE)
3940
@ConditionalOnClass(FreeMarkerConfigurer.class)
4041
@AutoConfigureAfter(name = "org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration")
4142
class FreeMarkerReactiveWebConfiguration extends AbstractFreeMarkerConfiguration {

‎spring-boot-project/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerServletWebConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingFilterBean;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
29+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2930
import org.springframework.boot.autoconfigure.web.ConditionalOnEnabledResourceChain;
3031
import org.springframework.boot.web.servlet.FilterRegistrationBean;
3132
import org.springframework.context.annotation.Bean;
@@ -42,7 +43,7 @@
4243
* @author Andy Wilkinson
4344
*/
4445
@Configuration(proxyBeanMethods = false)
45-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
46+
@ConditionalOnWebApplication(type = Type.SERVLET)
4647
@ConditionalOnClass({ Servlet.class, FreeMarkerConfigurer.class })
4748
@AutoConfigureAfter(name = "org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration")
4849
class FreeMarkerServletWebConfiguration extends AbstractFreeMarkerConfiguration {

‎spring-boot-project/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/reactive/GraphQlWebFluxAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3535
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
36+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
3637
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3738
import org.springframework.boot.graphql.autoconfigure.GraphQlAutoConfiguration;
3839
import org.springframework.boot.graphql.autoconfigure.GraphQlCorsProperties;
@@ -76,7 +77,7 @@
7677
* @since 4.0.0
7778
*/
7879
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
79-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
80+
@ConditionalOnWebApplication(type = Type.REACTIVE)
8081
@ConditionalOnClass({ GraphQL.class, GraphQlHttpHandler.class })
8182
@ConditionalOnBean(ExecutionGraphQlService.class)
8283
@EnableConfigurationProperties(GraphQlCorsProperties.class)

‎spring-boot-project/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/security/GraphQlWebFluxSecurityAutoConfiguration.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.ConditionalOnMissingBean;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
27+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2728
import org.springframework.boot.graphql.autoconfigure.reactive.GraphQlWebFluxAutoConfiguration;
2829
import org.springframework.context.annotation.Bean;
2930
import org.springframework.graphql.execution.ReactiveSecurityDataFetcherExceptionResolver;
@@ -38,7 +39,7 @@
3839
* @since 4.0.0
3940
*/
4041
@AutoConfiguration(after = GraphQlWebFluxAutoConfiguration.class)
41-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
42+
@ConditionalOnWebApplication(type = Type.REACTIVE)
4243
@ConditionalOnClass({ GraphQL.class, GraphQlHttpHandler.class, EnableWebFluxSecurity.class })
4344
@ConditionalOnBean(GraphQlHttpHandler.class)
4445
public class GraphQlWebFluxSecurityAutoConfiguration {

‎spring-boot-project/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/security/GraphQlWebMvcSecurityAutoConfiguration.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.ConditionalOnMissingBean;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
27+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2728
import org.springframework.boot.graphql.autoconfigure.servlet.GraphQlWebMvcAutoConfiguration;
2829
import org.springframework.context.annotation.Bean;
2930
import org.springframework.graphql.execution.SecurityDataFetcherExceptionResolver;
@@ -38,7 +39,7 @@
3839
* @since 4.0.0
3940
*/
4041
@AutoConfiguration(after = GraphQlWebMvcAutoConfiguration.class)
41-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
42+
@ConditionalOnWebApplication(type = Type.SERVLET)
4243
@ConditionalOnClass({ GraphQL.class, GraphQlHttpHandler.class, EnableWebSecurity.class })
4344
@ConditionalOnBean(GraphQlHttpHandler.class)
4445
public class GraphQlWebMvcSecurityAutoConfiguration {

‎spring-boot-project/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/servlet/GraphQlWebMvcAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3535
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3636
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
37+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
3738
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3839
import org.springframework.boot.graphql.autoconfigure.GraphQlAutoConfiguration;
3940
import org.springframework.boot.graphql.autoconfigure.GraphQlCorsProperties;
@@ -80,7 +81,7 @@
8081
* @since 4.0.0
8182
*/
8283
@AutoConfiguration(after = GraphQlAutoConfiguration.class)
83-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
84+
@ConditionalOnWebApplication(type = Type.SERVLET)
8485
@ConditionalOnClass({ GraphQL.class, GraphQlHttpHandler.class })
8586
@ConditionalOnBean(ExecutionGraphQlService.class)
8687
@EnableConfigurationProperties(GraphQlCorsProperties.class)

‎spring-boot-project/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/NotReactiveWebApplicationCondition.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.http.client.autoconfigure;
1818

1919
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
20+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2021
import org.springframework.boot.autoconfigure.condition.NoneNestedConditions;
2122
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
2223

@@ -32,7 +33,7 @@ class NotReactiveWebApplicationCondition extends NoneNestedConditions {
3233
super(ConfigurationPhase.PARSE_CONFIGURATION);
3334
}
3435

35-
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
36+
@ConditionalOnWebApplication(type = Type.REACTIVE)
3637
private static final class ReactiveWebApplication {
3738

3839
}

‎spring-boot-project/spring-boot-jersey/src/main/java/org/springframework/boot/jersey/autoconfigure/actuate/web/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.jersey.autoconfigure.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({ JerseyApplicationPath.class, ResourceConfig.class })
4344
@ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet")
4445
public class JerseyChildManagementContextConfiguration {

0 commit comments

Comments
 (0)