Skip to content

Commit 6dc0f90

Browse files
Polish "Disable embedded web auto-config when not using embedded web server"
See gh-34332
1 parent b2facec commit 6dc0f90

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWarDeployment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.context.annotation.Conditional;
2626

2727
/**
28-
* {@link Conditional @Conditional} that only matches when the application is a not
28+
* {@link Conditional @Conditional} that only matches when the application is not a
2929
* traditional WAR deployment. For applications with embedded servers, this condition will
3030
* return true.
3131
*

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-auto-configuration.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ Resources can be specified by using the usual Spring conventions, as shown in th
125125

126126
[[features.developing-auto-configuration.condition-annotations.web-application-conditions]]
127127
==== Web Application Conditions
128-
The `@ConditionalOnWebApplication` and `@ConditionalOnNotWebApplication` annotations let configuration be included depending on whether the application is a "`web application`".
128+
The `@ConditionalOnWebApplication` and `@ConditionalOnNotWebApplication` annotations let configuration be included depending on whether the application is a web application.
129129
A servlet-based web application is any application that uses a Spring `WebApplicationContext`, defines a `session` scope, or has a `ConfigurableWebEnvironment`.
130130
A reactive web application is any application that uses a `ReactiveWebApplicationContext`, or has a `ConfigurableReactiveWebEnvironment`.
131131

132-
The `@ConditionalOnWarDeployment` and `@ConditionalOnNotWarDeployment` annotation lets configuration be included depending on whether the application is a traditional WAR application that is deployed to a container.
133-
This condition will not match for applications that are run with an embedded server.
132+
The `@ConditionalOnWarDeployment` and `@ConditionalOnNotWarDeployment` annotations let configuration be included depending on whether the application is a traditional WAR application that is deployed to a servlet container.
133+
This condition will not match for applications that are run with an embedded web server.
134134

135135

136136

0 commit comments

Comments
 (0)