4.15.0 (#186)

* start 5.0.0 development * clean imports * #185 cache for resourcebundle * change version * update version --------- Co-authored-by: Thorsten Marx <t.marx@eggheads.de>
CondationCMS · Mar 14, 2024 · b99c409 · b99c409
1 parent b32928c
commit b99c409
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,10 @@ see wiki for more information: [wiki](https://github.com/thmarx/cms/wiki)
 
 # changelog
 
+## 4.15.0
+
+* **FEATURE** Cache ResourceBundles in messages [#185](https://github.com/thmarx/cms/issues/185)
+
 ## 4.14.1
 
 * **BUGFIX** TaxonomyResolver does not set page properties correctly [#184](https://github.com/thmarx/cms/issues/184)

diff --git a/cms-api/pom.xml b/cms-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>cms-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-api/src/main/java/com/github/thmarx/cms/api/extensions/HttpRoutesExtensionPoint.java b/cms-api/src/main/java/com/github/thmarx/cms/api/extensions/HttpRoutesExtensionPoint.java
@@ -1,9 +1,5 @@
 package com.github.thmarx.cms.api.extensions;
 
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Response;
-import org.eclipse.jetty.util.Callback;
-
 /*-
  * #%L
  * cms-api

diff --git a/cms-api/src/main/java/com/github/thmarx/cms/api/messages/DefaultMessageSource.java b/cms-api/src/main/java/com/github/thmarx/cms/api/messages/DefaultMessageSource.java
@@ -21,14 +21,14 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-
 import com.github.thmarx.cms.api.SiteProperties;
-import java.io.File;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
 import java.text.MessageFormat;
-import java.util.Arrays;
+import java.time.Duration;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -42,17 +42,22 @@
 @Slf4j
 @RequiredArgsConstructor
 public class DefaultMessageSource implements MessageSource {
-	
+
 	final SiteProperties siteProperties;
 	final Path messageFolder;
-
+
+	final Cache<String, ResourceBundle> bundles = CacheBuilder.newBuilder()
+			.maximumSize(10)
+			.expireAfterWrite(Duration.ofSeconds(10))
+			.build();
+
 	@Override
-	public String getLabel (final String bundle, final String label) {
+	public String getLabel(final String bundle, final String label) {
 		return getLabel(bundle, label, List.of());
 	}
-	
+
 	@Override
-	public String getLabel (final String bundle, final String label, final List<Object> data) {
+	public String getLabel(final String bundle, final String label, final List<Object> data) {
 		try {
 			var resourceBundle = fromClassLoader(bundle, siteProperties.locale());
 			if (resourceBundle != null) {
@@ -64,14 +69,17 @@ public String getLabel (final String bundle, final String label, final List<Obje
 		}
 		return "[" + label + "]";
 	}
-	
+
 	protected ResourceBundle fromClassLoader(final String bundleName) throws Exception {
-        return fromClassLoader(bundleName, Locale.getDefault());
-    }
-	
+		return fromClassLoader(bundleName, Locale.getDefault());
+	}
+
 	protected ResourceBundle fromClassLoader(final String bundleName, final Locale locale) throws Exception {
-        URL[] urls = {messageFolder.toUri().toURL()};
-        ClassLoader loader = new URLClassLoader(urls);
-        return ResourceBundle.getBundle(bundleName, locale, loader);
-    }
+		var cacheKey = "%s-%s".formatted(bundleName, locale.toLanguageTag());
+		return bundles.get(bundleName, () -> {
+			URL[] urls = {messageFolder.toUri().toURL()};
+			ClassLoader loader = new URLClassLoader(urls);
+			return ResourceBundle.getBundle(bundleName, locale, loader);
+		});
+	}
 }
diff --git a/cms-content/pom.xml b/cms-content/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>cms-content</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-extensions/pom.xml b/cms-extensions/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>cms-extensions</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-filesystem/pom.xml b/cms-filesystem/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>cms-filesystem</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-git/pom.xml b/cms-git/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>cms-git</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-markdown/pom.xml b/cms-markdown/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>cms-markdown</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-media/pom.xml b/cms-media/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>cms-media</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-sandbox/pom.xml b/cms-sandbox/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.github.thmarx.cms</groupId>
         <artifactId>cms-parent</artifactId>
-        <version>4.14.1</version>
+        <version>4.15.0</version>
     </parent>
     <artifactId>cms-sandbox</artifactId>
     <packaging>pom</packaging>

diff --git a/cms-server/pom.xml b/cms-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>cms-server</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-template/pom.xml b/cms-template/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>cms-template</artifactId>
 	<packaging>jar</packaging>

diff --git a/distribution/build.xml b/distribution/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="distribution" default="distribution" basedir=".">
-	<property name="cms.version">4.14.1</property>
+	<property name="cms.version">4.15.0</property>
 
 	<property name="pebble.version">v1.1.0</property>
 	<property name="thymeleaf.version">v1.1.0</property>

diff --git a/modules-framework/api/pom.xml b/modules-framework/api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.module.framework</groupId>
 		<artifactId>module-framework</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>modules-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules-framework/manager/pom.xml b/modules-framework/manager/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.module.framework</groupId>
 		<artifactId>module-framework</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>modules-manager</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules-framework/pom.xml b/modules-framework/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<groupId>com.github.thmarx.cms.module.framework</groupId>
 	<artifactId>module-framework</artifactId>

diff --git a/modules/example-module/pom.xml b/modules/example-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<artifactId>example-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.14.1</version>
+		<version>4.15.0</version>
 	</parent>
 	<groupId>com.github.thmarx.cms.modules</groupId>
 	<artifactId>cms-modules</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.thmarx.cms</groupId>
 	<artifactId>cms-parent</artifactId>
-	<version>4.14.1</version>
+	<version>4.15.0</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>