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

Merge pull request #11111 from izeye:fix-s-max-age 

* pr/11111:
  Fix getter and setter for sMaxAge
This commit is contained in:
Brian Clozel 2017-11-22 15:27:35 +01:00
parent 1b59e88aeb 858d325577
commit 6f97bc58a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
View File

@ -444,11 +444,11 @@ public class ResourceProperties {
this.staleIfError = staleIfError; this.staleIfError = staleIfError;
} }
public Duration getsMaxAge() { public Duration getSMaxAge() {
return this.sMaxAge; return this.sMaxAge;
} }
public void setsMaxAge(Duration sMaxAge) { public void setSMaxAge(Duration sMaxAge) {
this.sMaxAge = sMaxAge; this.sMaxAge = sMaxAge;
} }

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java
View File

@ -95,7 +95,7 @@ public class ResourcePropertiesTests {
cacheControlProperties.setMustRevalidate(true); cacheControlProperties.setMustRevalidate(true);
cacheControlProperties.setNoTransform(true); cacheControlProperties.setNoTransform(true);
cacheControlProperties.setProxyRevalidate(true); cacheControlProperties.setProxyRevalidate(true);
cacheControlProperties.setsMaxAge(Duration.ofSeconds(5)); cacheControlProperties.setSMaxAge(Duration.ofSeconds(5));
cacheControlProperties.setStaleIfError(Duration.ofSeconds(6)); cacheControlProperties.setStaleIfError(Duration.ofSeconds(6));
cacheControlProperties.setStaleWhileRevalidate(Duration.ofSeconds(7)); cacheControlProperties.setStaleWhileRevalidate(Duration.ofSeconds(7));
this.properties.setCacheControl(cacheControlProperties); this.properties.setCacheControl(cacheControlProperties);