Default template engine

cms-api/src/main/java/com/condation/cms/api/feature/features/CacheManagerFeature.java

@@ -0,0 +1,36 @@
+package com.condation.cms.api.feature.features;
+
+/*-
+ * #%L
+ * cms-api
+ * %%
+ * Copyright (C) 2023 - 2024 CondationCMS
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+
+import com.condation.cms.api.annotations.FeatureScope;
+import com.condation.cms.api.cache.CacheManager;
+import com.condation.cms.api.feature.Feature;
+
+/**
+ *
+ * @author t.marx
+ */
+@FeatureScope(FeatureScope.Scope.MODULE)
+public record CacheManagerFeature (CacheManager cacheManager) implements Feature {
+}

cms-api/src/main/java/com/condation/cms/api/utils/MapUtil.java

@@ -21,13 +21,14 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-
 import com.google.common.base.Preconditions;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -49,7 +50,7 @@ public static Object getValue(final Map<String, Object> map, final String field)
 
 	public static <T> T getValue(final Map<String, Object> map, final String field, final T defaultValue) {
 		if (!field.contains(".")) {
-			return (T)map.getOrDefault(field, defaultValue);
+			return (T) map.getOrDefault(field, defaultValue);
 		}
 		String[] keys = field.split("\\.");
 		Map<String, Object> subMap = map;
@@ -107,4 +108,43 @@ public static void deepMerge(
 			}
 		}
 	}
+
+	@SuppressWarnings("unchecked")
+	public static Map<String, Object> deepUnmodifiableMap(Map<String, Object> original) {
+		return original.entrySet().stream()
+				.collect(Collectors.toUnmodifiableMap(
+						Map.Entry::getKey,
+						entry -> {
+							Object value = entry.getValue();
+							if (value instanceof Map) {
+								// Rekursiver Aufruf für verschachtelte Maps
+								return deepUnmodifiableMap((Map<String, Object>) value);
+							} else if (value instanceof List) {
+								// Rekursiver Aufruf für Listen
+								return deepUnmodifiableList((List<Object>) value);
+							} else {
+								// Andere Objekte bleiben unverändert
+								return value;
+							}
+						}
+				));
+	}
+
+	@SuppressWarnings("unchecked")
+	private static List<Object> deepUnmodifiableList(List<Object> original) {
+		return original.stream()
+				.map(value -> {
+					if (value instanceof Map) {
+						// Rekursiver Aufruf für verschachtelte Maps
+						return deepUnmodifiableMap((Map<String, Object>) value);
+					} else if (value instanceof List) {
+						// Rekursiver Aufruf für verschachtelte Listen
+						return deepUnmodifiableList((List<Object>) value);
+					} else {
+						// Andere Objekte bleiben unverändert
+						return value;
+					}
+				})
+				.collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
+	}
 }

cms-content/src/main/java/com/condation/cms/content/markdown/utils/StringUtils.java

@@ -21,9 +21,9 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
+import com.google.common.base.Strings;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  *
@@ -36,35 +36,44 @@ public class StringUtils {
 	private static final String AMP_PLACEHOLDER = "AMP#PLACE#HOLDER";
 
 	static {
-		ESCAPE.put("\\\\#", AMP_PLACEHOLDER + "#35;");
-		ESCAPE.put("\\\\\\*", AMP_PLACEHOLDER + "#42;");
-		ESCAPE.put("\\\\`", AMP_PLACEHOLDER + "#96;");
-		ESCAPE.put("\\\\_", AMP_PLACEHOLDER + "#95;");
-		ESCAPE.put("\\\\\\{", AMP_PLACEHOLDER + "#123;");
-		ESCAPE.put("\\\\\\}", AMP_PLACEHOLDER + "#125;");
-		ESCAPE.put("\\\\\\[", AMP_PLACEHOLDER + "#91;");
-		ESCAPE.put("\\\\\\]", AMP_PLACEHOLDER + "#93;");
-		ESCAPE.put("\\\\<", AMP_PLACEHOLDER + "#60;");
-		ESCAPE.put("\\\\>", AMP_PLACEHOLDER + "#62;");
-		ESCAPE.put("\\\\\\(", AMP_PLACEHOLDER + "#40;");
-		ESCAPE.put("\\\\\\)", AMP_PLACEHOLDER + "#41;");
-		ESCAPE.put("\\\\\\+", AMP_PLACEHOLDER + "#43;");
-		ESCAPE.put("\\\\-", AMP_PLACEHOLDER + "#45;");
-		ESCAPE.put("\\\\\\.", AMP_PLACEHOLDER + "#46;");
-		ESCAPE.put("\\\\!", AMP_PLACEHOLDER + "#33;");
-		ESCAPE.put("\\\\\\|", AMP_PLACEHOLDER + "#124;");
+		ESCAPE.put("\\#", AMP_PLACEHOLDER + "#35;");
+		ESCAPE.put("\\*", AMP_PLACEHOLDER + "#42;");
+		ESCAPE.put("\\`", AMP_PLACEHOLDER + "#96;");
+		ESCAPE.put("\\_", AMP_PLACEHOLDER + "#95;");
+		ESCAPE.put("\\{", AMP_PLACEHOLDER + "#123;");
+		ESCAPE.put("\\}", AMP_PLACEHOLDER + "#125;");
+		ESCAPE.put("\\[", AMP_PLACEHOLDER + "#91;");
+		ESCAPE.put("\\]", AMP_PLACEHOLDER + "#93;");
+		ESCAPE.put("\\<", AMP_PLACEHOLDER + "#60;");
+		ESCAPE.put("\\>", AMP_PLACEHOLDER + "#62;");
+		ESCAPE.put("\\(", AMP_PLACEHOLDER + "#40;");
+		ESCAPE.put("\\)", AMP_PLACEHOLDER + "#41;");
+		ESCAPE.put("\\+", AMP_PLACEHOLDER + "#43;");
+		ESCAPE.put("\\-", AMP_PLACEHOLDER + "#45;");
+		ESCAPE.put("\\.", AMP_PLACEHOLDER + "#46;");
+		ESCAPE.put("\\!", AMP_PLACEHOLDER + "#33;");
+		ESCAPE.put("\\|", AMP_PLACEHOLDER + "#124;");
 	}
 
 	public static String unescape(String html) {
 		return html.replaceAll(AMP_PLACEHOLDER, "&");
 	}
 
 	public static String escape(String md) {
-		AtomicReference<String> escaped = new AtomicReference<>(md);
-		ESCAPE.entrySet().forEach(entry -> {
-			escaped.updateAndGet(value -> value.replaceAll(entry.getKey(), entry.getValue()));
+		if (Strings.isNullOrEmpty(md)) {
+			return md;
+		}
+		StringBuilder escaped = new StringBuilder(md);
+
+		ESCAPE.forEach((key, value) -> {
+			int index = escaped.indexOf(key);
+			while (index != -1) {
+				escaped.replace(index, index + key.length(), value);
+				index = escaped.indexOf(key, index + value.length());
+			}
 		});
-		return escaped.get();
+
+		return escaped.toString();
 	}
 
 	public static String removeLeadingPipe(String s) {

cms-content/src/main/java/com/condation/cms/content/pipeline/ContentPipeline.java

@@ -22,7 +22,6 @@
  * #L%
  */
 import com.condation.cms.api.configuration.configs.SiteConfiguration;
-import com.condation.cms.api.feature.Feature;
 import com.condation.cms.api.feature.features.ConfigurationFeature;
 import com.condation.cms.api.feature.features.TemplateEngineFeature;
 import com.condation.cms.api.hooks.FilterContext;
@@ -34,8 +33,6 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

cms-content/src/test/java/com/condation/cms/content/shortcodes/TagParserTest.java

@@ -150,8 +150,8 @@ public void namespace() {
 		result = tagParser.parse("[[ns1:print message='Hello CondationCMS' /]]", tagMap);
 		Assertions.assertThat(result).isEqualTo("message: Hello CondationCMS");
 	}
-	
-		@Test
+
+	@Test
 	public void multiline () {
 		String content = """
 				[[content]]

cms-core/src/main/java/com/condation/cms/core/cache/LocalCacheProvider.java

@@ -26,7 +26,6 @@
 import com.condation.cms.api.cache.CacheManager;
 import com.condation.cms.api.cache.CacheProvider;
 import com.condation.cms.api.cache.ICache;
-import java.io.Serializable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Function;

cms-core/src/main/java/com/condation/cms/core/configuration/ConfigurationFactory.java

@@ -22,7 +22,6 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-import com.condation.cms.api.db.DB;
 import com.condation.cms.core.configuration.configs.SimpleConfiguration;
 import com.condation.cms.api.eventbus.EventBus;
 import com.condation.cms.api.scheduler.CronJobScheduler;
@@ -111,8 +110,8 @@ private static SimpleConfiguration serverConfiguration(EventBus eventBus) throws
 		return SimpleConfiguration.builder(eventBus)
 				.id("server")
 				.reloadStrategy(new NoReload())
-				.addSource(YamlConfigSource.build(ServerUtil.getPath("server.yaml")))
 				.addSource(TomlConfigSource.build(ServerUtil.getPath("server.toml")))
+				.addSource(YamlConfigSource.build(ServerUtil.getPath("server.yaml")))
 				.build();
 	}
 
@@ -143,8 +142,8 @@ public static SimpleConfiguration siteConfiguration(String env, Path hostBase) t
 	private static SimpleConfiguration siteConfiguration(EventBus eventBus, String env, Path siteBase, ReloadStrategy reloadStrategy) throws IOException {
 
 		List<ConfigSource> siteSources = new ArrayList<>();
-		siteSources.add(YamlConfigSource.build(siteBase.resolve("site.yaml")));
 		siteSources.add(TomlConfigSource.build(siteBase.resolve("site.toml")));
+		siteSources.add(YamlConfigSource.build(siteBase.resolve("site.yaml")));
 
 		var envFile = siteBase.resolve("site-%s.yaml".formatted(env));
 		if (Files.exists(envFile)) {

cms-core/src/main/java/com/condation/cms/core/configuration/configs/SimpleConfiguration.java

@@ -31,6 +31,7 @@
 import com.condation.cms.core.configuration.reload.NoReload;
 import com.condation.cms.api.eventbus.events.ConfigurationReloadEvent;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -156,14 +157,15 @@ public Long getLong (String field, long defaultValue) {
 	}
 
 	public Map<String, Object> getMap (String field) {
-		Map<String, Object> result = new HashMap<>();
-		sources.stream()
+		var configSource = sources.stream()
 				.filter(ConfigSource::exists)
-				.map(config -> config.getMap(field))
-				.forEach(sourceMap -> {
-					MapUtil.deepMerge(result, sourceMap);
-				});
-		return result;
+				.findFirst();
+
+		if (configSource.isPresent()) {
+			return MapUtil.deepUnmodifiableMap(configSource.get().getMap(field));
+		}
+
+		return Collections.emptyMap();
 	}
 
 	public <T> T get(String field, Class<T> aClass) {

cms-core/src/main/java/com/condation/cms/core/configuration/source/TomlConfigSource.java

@@ -33,10 +33,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.tomlj.Toml;
-import org.tomlj.TomlArray;
 import org.tomlj.TomlPosition;
 import org.tomlj.TomlTable;
 

cms-core/src/test/java/com/condation/cms/core/configuration/ConfigurationTest.java

@@ -95,13 +95,6 @@ public void test_env() {
 
 		Assertions.assertThat(env).isEqualTo("prod");
 	}
-
-	@Test
-	public void test_from_yaml() {
-		var env = configuration.getString("test");
-
-		Assertions.assertThat(env).isEqualTo("only in yaml");
-	}
 
 	@Test
 	public void test_reload () throws InterruptedException, IOException {