root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Rename eagerInitFilters to align with Undertow's naming 

Closes gh-23674
This commit is contained in:
Andy Wilkinson 2020-10-14 18:03:06 +01:00
parent 5b1b03c56c
commit d0c6dbc2c7
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ public class UndertowServletWebServerFactoryCustomizer
@Override @Override
public void customize(UndertowServletWebServerFactory factory) { public void customize(UndertowServletWebServerFactory factory) {
factory.setEagerInitFilters(this.serverProperties.getUndertow().isEagerFilterInit()); factory.setEagerFilterInit(this.serverProperties.getUndertow().isEagerFilterInit());
factory.setPreservePathOnForward(this.serverProperties.getUndertow().isPreservePathOnForward()); factory.setPreservePathOnForward(this.serverProperties.getUndertow().isPreservePathOnForward());
} }

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

@ -33,11 +33,11 @@ class UndertowServletWebServerFactoryCustomizerTests {
@Test @Test
void eagerFilterInitCanBeDisabled() { void eagerFilterInitCanBeDisabled() {
UndertowServletWebServerFactory factory = new UndertowServletWebServerFactory(0); UndertowServletWebServerFactory factory = new UndertowServletWebServerFactory(0);
assertThat(factory.isEagerInitFilters()).isTrue(); assertThat(factory.isEagerFilterInit()).isTrue();
ServerProperties serverProperties = new ServerProperties(); ServerProperties serverProperties = new ServerProperties();
serverProperties.getUndertow().setEagerFilterInit(false); serverProperties.getUndertow().setEagerFilterInit(false);
new UndertowServletWebServerFactoryCustomizer(serverProperties).customize(factory); new UndertowServletWebServerFactoryCustomizer(serverProperties).customize(factory);
assertThat(factory.isEagerInitFilters()).isFalse(); assertThat(factory.isEagerFilterInit()).isFalse();
} }
@Test @Test

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

@ -91,7 +91,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
private ResourceLoader resourceLoader; private ResourceLoader resourceLoader;
private boolean eagerInitFilters = true; private boolean eagerFilterInit = true;
private boolean preservePathOnForward = false; private boolean preservePathOnForward = false;
@ -248,9 +248,11 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
* Return if filters should be initialized eagerly. * Return if filters should be initialized eagerly.
* @return {@code true} if filters are initialized eagerly, otherwise {@code false}. * @return {@code true} if filters are initialized eagerly, otherwise {@code false}.
* @since 2.0.0 * @since 2.0.0
* @deprecated since 2.4.0 in favor of #isEagerFilterInit
*/ */
@Deprecated
public boolean isEagerInitFilters() { public boolean isEagerInitFilters() {
return this.eagerInitFilters; return this.eagerFilterInit;
} }
/** /**
@ -258,9 +260,30 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
* @param eagerInitFilters {@code true} if filters are initialized eagerly, otherwise * @param eagerInitFilters {@code true} if filters are initialized eagerly, otherwise
* {@code false}. * {@code false}.
* @since 2.0.0 * @since 2.0.0
* @deprecated since 2.4.0 in favor of #isEagerFilterInit
*/ */
@Deprecated
public void setEagerInitFilters(boolean eagerInitFilters) { public void setEagerInitFilters(boolean eagerInitFilters) {
this.eagerInitFilters = eagerInitFilters; this.eagerFilterInit = eagerInitFilters;
}
/**
* Return if filters should be eagerly initialized.
* @return {@code true} if filters are eagerly initialized, otherwise {@code false}.
* @since 2.4.0
*/
public boolean isEagerFilterInit() {
return this.eagerFilterInit;
}
/**
* Set whether filters should be eagerly initialized.
* @param eagerFilterInit {@code true} if filters are eagerly initialized, otherwise
* {@code false}.
* @since 2.4.0
*/
public void setEagerFilterInit(boolean eagerFilterInit) {
this.eagerFilterInit = eagerFilterInit;
} }
/** /**
@ -304,7 +327,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
deployment.setServletStackTraces(ServletStackTraces.NONE); deployment.setServletStackTraces(ServletStackTraces.NONE);
deployment.setResourceManager(getDocumentRootResourceManager()); deployment.setResourceManager(getDocumentRootResourceManager());
deployment.setTempDir(createTempDir("undertow")); deployment.setTempDir(createTempDir("undertow"));
deployment.setEagerFilterInit(this.eagerInitFilters); deployment.setEagerFilterInit(this.eagerFilterInit);
deployment.setPreservePathOnForward(this.preservePathOnForward); deployment.setPreservePathOnForward(this.preservePathOnForward);
configureMimeMappings(deployment); configureMimeMappings(deployment);
for (UndertowDeploymentInfoCustomizer customizer : this.deploymentInfoCustomizers) { for (UndertowDeploymentInfoCustomizer customizer : this.deploymentInfoCustomizers) {