Skip to content

Commit d0c6dbc

Browse files
committed
Rename eagerInitFilters to align with Undertow's naming
Closes gh-23674
1 parent 5b1b03c commit d0c6dbc

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/UndertowServletWebServerFactoryCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public UndertowServletWebServerFactoryCustomizer(ServerProperties serverProperti
3838

3939
@Override
4040
public void customize(UndertowServletWebServerFactory factory) {
41-
factory.setEagerInitFilters(this.serverProperties.getUndertow().isEagerFilterInit());
41+
factory.setEagerFilterInit(this.serverProperties.getUndertow().isEagerFilterInit());
4242
factory.setPreservePathOnForward(this.serverProperties.getUndertow().isPreservePathOnForward());
4343
}
4444

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/UndertowServletWebServerFactoryCustomizerTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ class UndertowServletWebServerFactoryCustomizerTests {
3333
@Test
3434
void eagerFilterInitCanBeDisabled() {
3535
UndertowServletWebServerFactory factory = new UndertowServletWebServerFactory(0);
36-
assertThat(factory.isEagerInitFilters()).isTrue();
36+
assertThat(factory.isEagerFilterInit()).isTrue();
3737
ServerProperties serverProperties = new ServerProperties();
3838
serverProperties.getUndertow().setEagerFilterInit(false);
3939
new UndertowServletWebServerFactoryCustomizer(serverProperties).customize(factory);
40-
assertThat(factory.isEagerInitFilters()).isFalse();
40+
assertThat(factory.isEagerFilterInit()).isFalse();
4141
}
4242

4343
@Test

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
9191

9292
private ResourceLoader resourceLoader;
9393

94-
private boolean eagerInitFilters = true;
94+
private boolean eagerFilterInit = true;
9595

9696
private boolean preservePathOnForward = false;
9797

@@ -248,19 +248,42 @@ public void setResourceLoader(ResourceLoader resourceLoader) {
248248
* Return if filters should be initialized eagerly.
249249
* @return {@code true} if filters are initialized eagerly, otherwise {@code false}.
250250
* @since 2.0.0
251+
* @deprecated since 2.4.0 in favor of #isEagerFilterInit
251252
*/
253+
@Deprecated
252254
public boolean isEagerInitFilters() {
253-
return this.eagerInitFilters;
255+
return this.eagerFilterInit;
254256
}
255257

256258
/**
257259
* Set whether filters should be initialized eagerly.
258260
* @param eagerInitFilters {@code true} if filters are initialized eagerly, otherwise
259261
* {@code false}.
260262
* @since 2.0.0
263+
* @deprecated since 2.4.0 in favor of #isEagerFilterInit
261264
*/
265+
@Deprecated
262266
public void setEagerInitFilters(boolean eagerInitFilters) {
263-
this.eagerInitFilters = eagerInitFilters;
267+
this.eagerFilterInit = eagerInitFilters;
268+
}
269+
270+
/**
271+
* Return if filters should be eagerly initialized.
272+
* @return {@code true} if filters are eagerly initialized, otherwise {@code false}.
273+
* @since 2.4.0
274+
*/
275+
public boolean isEagerFilterInit() {
276+
return this.eagerFilterInit;
277+
}
278+
279+
/**
280+
* Set whether filters should be eagerly initialized.
281+
* @param eagerFilterInit {@code true} if filters are eagerly initialized, otherwise
282+
* {@code false}.
283+
* @since 2.4.0
284+
*/
285+
public void setEagerFilterInit(boolean eagerFilterInit) {
286+
this.eagerFilterInit = eagerFilterInit;
264287
}
265288

266289
/**
@@ -304,7 +327,7 @@ private DeploymentManager createManager(ServletContextInitializer... initializer
304327
deployment.setServletStackTraces(ServletStackTraces.NONE);
305328
deployment.setResourceManager(getDocumentRootResourceManager());
306329
deployment.setTempDir(createTempDir("undertow"));
307-
deployment.setEagerFilterInit(this.eagerInitFilters);
330+
deployment.setEagerFilterInit(this.eagerFilterInit);
308331
deployment.setPreservePathOnForward(this.preservePathOnForward);
309332
configureMimeMappings(deployment);
310333
for (UndertowDeploymentInfoCustomizer customizer : this.deploymentInfoCustomizers) {

0 commit comments

Comments
 (0)