From 7be9c268b8e7b1f8194894d232405beed83575cd Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 26 Apr 2021 11:34:47 +0200 Subject: [PATCH] Fix ignored use-last-modified property in Spring MVC Prior to this commit, the `spring.web.resources.cache.use-last-modified` configuration property support was lost during a merge operation right before 2.4.2. This is due to an invalid test that missed this unintended change. This commit fixes both problems. Fixes gh-26212 --- .../boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java | 1 + .../autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java index b3fa832431..3d9ccdfa3e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java @@ -426,6 +426,7 @@ public class WebMvcAutoConfiguration { customizer.accept(registration); registration.setCachePeriod(getSeconds(this.resourceProperties.getCache().getPeriod())); registration.setCacheControl(this.resourceProperties.getCache().getCachecontrol().toHttpCacheControl()); + registration.setUseLastModified(this.resourceProperties.getCache().isUseLastModified()); customizeResourceHandlerRegistration(registration); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java index 3e929144d2..5de65c40be 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java @@ -1009,7 +1009,7 @@ class WebMvcAutoConfigurationTests { Consumer handlerConsumer) { Map handlerMap = getHandlerMap(context.getBean("resourceHandlerMapping", HandlerMapping.class)); assertThat(handlerMap).hasSize(2); - for (Object handler : handlerMap.keySet()) { + for (Object handler : handlerMap.values()) { if (handler instanceof ResourceHttpRequestHandler) { handlerConsumer.accept((ResourceHttpRequestHandler) handler); }