spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-23 01:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4.x' into 3.5.x

Browse Source 
Closes gh-47253
This commit is contained in:
Stéphane Nicoll
2025-09-17 15:27:05 +02:00
parent fae6b0aea0 6f18f1b881
commit 209d4ab5bc
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
+1 -1
View File
@@ -1024,7 +1024,7 @@ public class ServerProperties {
/**
* Time-to-live of the static resource cache.
*/
private Duration cacheTtl;
private Duration cacheTtl = Duration.ofSeconds(5);
public boolean isAllowCaching() {
return this.allowCaching;
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java
+15 -1
View File
@@ -16,6 +16,7 @@
package org.springframework.boot.autoconfigure.web.embedded;
import java.time.Duration;
import java.util.Locale;
import java.util.function.Consumer;
@@ -321,6 +322,19 @@ class TomcatWebServerFactoryCustomizerTests {
assertThat(remoteIpValve.getTrustedProxies()).isEqualTo("proxy1|proxy2");
}
@Test
void resourceCacheMatchesDefault() {
ServerProperties properties = new ServerProperties();
customizeAndRunServer((server) -> {
Tomcat tomcat = server.getTomcat();
Context context = (Context) tomcat.getHost().findChildren()[0];
assertThat(properties.getTomcat().getResource().isAllowCaching())
.isEqualTo(context.getResources().isCachingAllowed());
assertThat(properties.getTomcat().getResource().getCacheTtl())
.isEqualTo(Duration.ofMillis(context.getResources().getCacheTtl()));
});
}
@Test
void customStaticResourceAllowCaching() {
bind("server.tomcat.resource.allow-caching=false");
@@ -333,7 +347,7 @@ class TomcatWebServerFactoryCustomizerTests {
@Test
void customStaticResourceCacheTtl() {
bind("server.tomcat.resource.cache-ttl=10000");
bind("server.tomcat.resource.cache-ttl=10s");
customizeAndRunServer((server) -> {
Tomcat tomcat = server.getTomcat();
Context context = (Context) tomcat.getHost().findChildren()[0];