From 90d1d867df50d6d1a39086576f4e9311e520ffe6 Mon Sep 17 00:00:00 2001
From: Thorsten Marx <t.marx@eggheads.de>
Date: Wed, 11 Dec 2024 10:35:41 +0100
Subject: [PATCH] undo removing of config overriding

---
 .../configs/SimpleConfiguration.java              | 15 +++++++--------
 .../cms/extensions/ExtensionManager.java          |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/cms-core/src/main/java/com/condation/cms/core/configuration/configs/SimpleConfiguration.java b/cms-core/src/main/java/com/condation/cms/core/configuration/configs/SimpleConfiguration.java
index fdc17a7fc..85e5428a7 100644
--- a/cms-core/src/main/java/com/condation/cms/core/configuration/configs/SimpleConfiguration.java
+++ b/cms-core/src/main/java/com/condation/cms/core/configuration/configs/SimpleConfiguration.java
@@ -157,15 +157,14 @@ public Long getLong (String field, long defaultValue) {
 	}
 
 	public Map<String, Object> getMap (String field) {
-		var configSource = sources.stream()
+		Map<String, Object> result = new HashMap<>();
+		sources.stream()
 				.filter(ConfigSource::exists)
-				.findFirst();
-		
-		if (configSource.isPresent()) {
-			return MapUtil.deepUnmodifiableMap(configSource.get().getMap(field));
-		}
-		
-		return Collections.emptyMap();
+				.map(config -> config.getMap(field))
+				.forEach(sourceMap -> {
+					MapUtil.deepMerge(result, sourceMap);
+				});
+		return result;
 	}
 	
 	public <T> T get(String field, Class<T> aClass) {
diff --git a/cms-extensions/src/main/java/com/condation/cms/extensions/ExtensionManager.java b/cms-extensions/src/main/java/com/condation/cms/extensions/ExtensionManager.java
index 29206e7f5..b4a3aefcd 100644
--- a/cms-extensions/src/main/java/com/condation/cms/extensions/ExtensionManager.java
+++ b/cms-extensions/src/main/java/com/condation/cms/extensions/ExtensionManager.java
@@ -124,7 +124,7 @@ public RequestExtensions newContext(Theme theme, RequestContext requestContext)
 			log.debug("load extensions from " + extPath);
 			loadExtensions(extPath, context::eval);
 		}
-
+		
 		return requestExtensions;
 	}