Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
d0c6dbc2
Commit
d0c6dbc2
authored
Oct 14, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename eagerInitFilters to align with Undertow's naming
Closes gh-23674
parent
5b1b03c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
7 deletions
+30
-7
UndertowServletWebServerFactoryCustomizer.java
...eb/servlet/UndertowServletWebServerFactoryCustomizer.java
+1
-1
UndertowServletWebServerFactoryCustomizerTests.java
...rvlet/UndertowServletWebServerFactoryCustomizerTests.java
+2
-2
UndertowServletWebServerFactory.java
...eb/embedded/undertow/UndertowServletWebServerFactory.java
+27
-4
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/UndertowServletWebServerFactoryCustomizer.java
View file @
d0c6dbc2
...
@@ -38,7 +38,7 @@ public class UndertowServletWebServerFactoryCustomizer
...
@@ -38,7 +38,7 @@ public class UndertowServletWebServerFactoryCustomizer
@Override
@Override
public
void
customize
(
UndertowServletWebServerFactory
factory
)
{
public
void
customize
(
UndertowServletWebServerFactory
factory
)
{
factory
.
setEager
InitFilters
(
this
.
serverProperties
.
getUndertow
().
isEagerFilterInit
());
factory
.
setEager
FilterInit
(
this
.
serverProperties
.
getUndertow
().
isEagerFilterInit
());
factory
.
setPreservePathOnForward
(
this
.
serverProperties
.
getUndertow
().
isPreservePathOnForward
());
factory
.
setPreservePathOnForward
(
this
.
serverProperties
.
getUndertow
().
isPreservePathOnForward
());
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/UndertowServletWebServerFactoryCustomizerTests.java
View file @
d0c6dbc2
...
@@ -33,11 +33,11 @@ class UndertowServletWebServerFactoryCustomizerTests {
...
@@ -33,11 +33,11 @@ class UndertowServletWebServerFactoryCustomizerTests {
@Test
@Test
void
eagerFilterInitCanBeDisabled
()
{
void
eagerFilterInitCanBeDisabled
()
{
UndertowServletWebServerFactory
factory
=
new
UndertowServletWebServerFactory
(
0
);
UndertowServletWebServerFactory
factory
=
new
UndertowServletWebServerFactory
(
0
);
assertThat
(
factory
.
isEager
InitFilters
()).
isTrue
();
assertThat
(
factory
.
isEager
FilterInit
()).
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
.
isEager
InitFilters
()).
isFalse
();
assertThat
(
factory
.
isEager
FilterInit
()).
isFalse
();
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
View file @
d0c6dbc2
...
@@ -91,7 +91,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
...
@@ -91,7 +91,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
private
ResourceLoader
resourceLoader
;
private
ResourceLoader
resourceLoader
;
private
boolean
eager
InitFilters
=
true
;
private
boolean
eager
FilterInit
=
true
;
private
boolean
preservePathOnForward
=
false
;
private
boolean
preservePathOnForward
=
false
;
...
@@ -248,9 +248,11 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
...
@@ -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
.
eager
InitFilters
;
return
this
.
eager
FilterInit
;
}
}
/**
/**
...
@@ -258,9 +260,30 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
...
@@ -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
...
@@ -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
.
eager
InitFilters
);
deployment
.
setEagerFilterInit
(
this
.
eager
FilterInit
);
deployment
.
setPreservePathOnForward
(
this
.
preservePathOnForward
);
deployment
.
setPreservePathOnForward
(
this
.
preservePathOnForward
);
configureMimeMappings
(
deployment
);
configureMimeMappings
(
deployment
);
for
(
UndertowDeploymentInfoCustomizer
customizer
:
this
.
deploymentInfoCustomizers
)
{
for
(
UndertowDeploymentInfoCustomizer
customizer
:
this
.
deploymentInfoCustomizers
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment