SONAR-10674 Fix max ages caches for plugins static resources

Max ages cache was wrongly set to 5 hours instead of 5 minutes

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/CacheControlFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/web/CacheControlFilter.java
index b8a238f56536ec94563deb19853153b165a2cf02..e0034435047bf9f4041493f25cbece460b953736 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/CacheControlFilter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/web/CacheControlFilter.java
@@ -46,7 +46,7 @@ public class CacheControlFilter implements Filter {
    */
   private static final int ONE_YEAR_IN_SECONDS = 365 * 24 * 60 * 60;
 
-  private static final int FIVE_MINUTES_IN_SECONDS = 5 * 60 * 60;
+  private static final int FIVE_MINUTES_IN_SECONDS = 5 * 60;
 
   private static final String MAX_AGE_TEMPLATE = "max-age=%d";
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/CacheControlFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/web/CacheControlFilterTest.java
index 5f967c642c71ef03bcd47c1e5a37227140cf7c43..b5bf1746cd0cae4a172bcb147da3b0a3adeddaee 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/CacheControlFilterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/web/CacheControlFilterTest.java
@@ -62,7 +62,7 @@ public class CacheControlFilterTest {
 
     underTest.doFilter(request, response, chain);
 
-    verify(response).addHeader("Cache-Control", format("max-age=%s", 18_000));
+    verify(response).addHeader("Cache-Control", format("max-age=%s", 300));
   }
 
   @Test
@@ -71,7 +71,7 @@ public class CacheControlFilterTest {
 
     underTest.doFilter(request, response, chain);
 
-    verify(response).addHeader("Cache-Control", format("max-age=%s", 18_000));
+    verify(response).addHeader("Cache-Control", format("max-age=%s", 300));
   }
 
   @Test
@@ -80,7 +80,7 @@ public class CacheControlFilterTest {
 
     underTest.doFilter(request, response, chain);
 
-    verify(response).addHeader("Cache-Control", format("max-age=%s", 18_000));
+    verify(response).addHeader("Cache-Control", format("max-age=%s", 300));
   }
 
   @Test

diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java
index c4f3fe363822f877e9ee345f73361827618b143e..cdf54736541954035f6e7c2f0f78212959f93dfa 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java
@@ -37,7 +37,7 @@ import static util.ItUtils.call;
 public class HttpHeadersTest {
 
   private static final int ONE_YEAR_IN_SECONDS = 365 * 24 * 60 * 60;
-  private static final int FIVE_MINUTES_IN_SECONDS = 5 * 60 * 60;
+  private static final int FIVE_MINUTES_IN_SECONDS = 5 * 60;
 
   @ClassRule
   public static final Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;