fonts and styles are now cachable - fixes #286

Sun, 03 Sep 2023 12:02:44 +0200

author
Mike Becker <universe@uap-core.de>
date
Sun, 03 Sep 2023 12:02:44 +0200
changeset 289
d702bdd4da51
parent 288
10324c383126
child 290
51b14787d826

fonts and styles are now cachable - fixes #286

build.gradle.kts file | annotate | diff | comparison | revisions
src/main/kotlin/de/uapcore/lightpit/filter/StaticFilesFilter.kt file | annotate | diff | comparison | revisions
src/main/webapp/WEB-INF/changelogs/changelog-de.jspf file | annotate | diff | comparison | revisions
src/main/webapp/WEB-INF/changelogs/changelog.jspf file | annotate | diff | comparison | revisions
src/main/webapp/WEB-INF/jsp/site.jsp file | annotate | diff | comparison | revisions
--- a/build.gradle.kts	Tue Jul 25 18:19:04 2023 +0200
+++ b/build.gradle.kts	Sun Sep 03 12:02:44 2023 +0200
@@ -5,7 +5,7 @@
     war
 }
 group = "de.uapcore"
-version = "1.1.1"
+version = "1.1.2"
 
 repositories {
     mavenCentral()
@@ -53,7 +53,7 @@
         val test by getting {
             dependencies {
                 implementation("org.jetbrains.kotlin:kotlin-test-junit5")
-                runtimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2")
+                runtimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
             }
         }
     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/kotlin/de/uapcore/lightpit/filter/StaticFilesFilter.kt	Sun Sep 03 12:02:44 2023 +0200
@@ -0,0 +1,41 @@
+import jakarta.servlet.FilterChain
+import jakarta.servlet.annotation.WebFilter
+import jakarta.servlet.http.HttpFilter
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
+
+/*
+ * Copyright 2023 Mike Becker. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+@WebFilter(urlPatterns = ["*.ttf", "*.css", "*.js"])
+class StaticFilesFilter : HttpFilter() {
+    override fun doFilter(req: HttpServletRequest, res: HttpServletResponse, chain: FilterChain) {
+        // Apply a Cache-Control Header for static files to allow storing them
+        // in shared cache for almost indefinitely. We will cache-bust them when we need an update.
+        // RFC-2616 mandates that servers SHOULD NOT specify more than one year, though
+        res.addHeader("Cache-Control", "public, max-age=31536000, immutable")
+        super.doFilter(req, res, chain)
+    }
+}
--- a/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf	Tue Jul 25 18:19:04 2023 +0200
+++ b/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf	Sun Sep 03 12:02:44 2023 +0200
@@ -24,6 +24,14 @@
   --%>
 <%@ page contentType="text/html;charset=UTF-8" %>
 
+<h3>Version 1.1.2</h3>
+
+<ul>
+    <li>
+        Schriftarten und Styles können nun vom Browser im Cache gespeichert werden.
+    </li>
+</ul>
+
 <h3>Version 1.1.1</h3>
 
 <ul>
--- a/src/main/webapp/WEB-INF/changelogs/changelog.jspf	Tue Jul 25 18:19:04 2023 +0200
+++ b/src/main/webapp/WEB-INF/changelogs/changelog.jspf	Sun Sep 03 12:02:44 2023 +0200
@@ -24,6 +24,14 @@
   --%>
 <%@ page contentType="text/html;charset=UTF-8" %>
 
+<h3>Version 1.1.2</h3>
+
+<ul>
+    <li>
+        Fix that browsers could not store fonts and stylesheets in cache.
+    </li>
+</ul>
+
 <h3>Version 1.1.1</h3>
 
 <ul>
--- a/src/main/webapp/WEB-INF/jsp/site.jsp	Tue Jul 25 18:19:04 2023 +0200
+++ b/src/main/webapp/WEB-INF/jsp/site.jsp	Sun Sep 03 12:02:44 2023 +0200
@@ -31,7 +31,7 @@
 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
 <%-- Version suffix for forcing browsers to update the CSS / JS files --%>
-<c:set scope="page" var="versionSuffix" value="20230108"/>
+<c:set scope="page" var="versionSuffix" value="20230903"/>
 
 <%-- Make the base href easily available at request scope --%>
 <c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/>

mercurial