missing method added

CondationCMS · Oct 24, 2024 · 76704fa · 76704fa
1 parent 53f2b38
commit 76704fa
Show file tree

Hide file tree

Showing 25 changed files with 54 additions and 17 deletions.
diff --git a/cms-api/pom.xml b/cms-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>cms-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-api/src/main/java/com/condation/cms/api/SiteProperties.java b/cms-api/src/main/java/com/condation/cms/api/SiteProperties.java
@@ -42,6 +42,8 @@ public interface SiteProperties {
 
 	public Object get (String field);
 
+	public <T> T getOrDefault (String field, T defaultValue);
+
 	public String theme ();
 
 	public String queryIndexMode ();

diff --git a/cms-api/src/main/java/com/condation/cms/api/ThemeProperties.java b/cms-api/src/main/java/com/condation/cms/api/ThemeProperties.java
@@ -42,4 +42,6 @@ public interface ThemeProperties {
 	public List<String> activeModules();
 
 	public Object get (String field);
+
+	public <T> T getOrDefault (String field, T defaultValue);
 }
diff --git a/cms-auth/pom.xml b/cms-auth/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>cms-auth</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-content/pom.xml b/cms-content/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>cms-content</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-core/pom.xml b/cms-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>cms-core</artifactId>
 	<packaging>jar</packaging>

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
@@ -92,6 +92,15 @@ public Object get (String field) {
 		return value.isPresent() ? value.get() : null;
 	}
 
+	public Object getOrDefault (String field, Object defaultValue) {
+		var value = sources.reversed().stream()
+				.filter(ConfigSource::exists)
+				.map(config -> config.get(field))
+				.filter(cv -> cv != null)
+				.findFirst();
+		return value.isPresent() ? value.get() : defaultValue;
+	}
+
 	public <T> T getValue (String field, Class<T> typeClass) {
 		var value = sources.reversed().stream()
 				.filter(ConfigSource::exists)

diff --git a/...src/main/java/com/condation/cms/core/configuration/properties/ExtendedSiteProperties.java b/...src/main/java/com/condation/cms/core/configuration/properties/ExtendedSiteProperties.java
@@ -133,4 +133,9 @@ public List<String> activeModules() {
 	public Object get (String field) {
 		return configuration.get(field);
 	}
+
+	@Override
+	public <T> T getOrDefault(String field, T defaultValue) {
+		return (T) configuration.getOrDefault(field, defaultValue);
+	}
 }
diff --git a/...rc/main/java/com/condation/cms/core/configuration/properties/ExtendedThemeProperties.java b/...rc/main/java/com/condation/cms/core/configuration/properties/ExtendedThemeProperties.java
@@ -68,5 +68,9 @@ public Object get (String field) {
 		return configuration.get(field);
 	}
 
+	@Override
+	public <T> T getOrDefault(String field, T defaultValue) {
+		return (T) configuration.getOrDefault(field, defaultValue);
+	}
 
 }
diff --git a/cms-core/src/main/java/com/condation/cms/core/theme/EmptyThemeProperties.java b/cms-core/src/main/java/com/condation/cms/core/theme/EmptyThemeProperties.java
@@ -46,6 +46,11 @@ public Object get(String field) {
 		return properties.get(field);
 	}
 
+	@Override
+	public <T> T getOrDefault(String field, T defaultValue) {
+		return (T) properties.getOrDefault(field, defaultValue);
+	}
+
 	@Override
 	public String parent() {
 		return (String) properties.get("parent");

diff --git a/cms-extensions/pom.xml b/cms-extensions/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.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.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.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.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>cms-git</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-media/pom.xml b/cms-media/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>cms-media</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-server/pom.xml b/cms-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>cms-server</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-test/pom.xml b/cms-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.condation.cms</groupId>
         <artifactId>cms-parent</artifactId>
-        <version>7.0.0</version>
+        <version>7.1.0</version>
     </parent>
     <artifactId>cms-test</artifactId>
     <packaging>jar</packaging>

diff --git a/cms-test/src/main/java/com/condation/cms/test/TestSiteProperties.java b/cms-test/src/main/java/com/condation/cms/test/TestSiteProperties.java
@@ -84,6 +84,11 @@ public String language() {
 	public Object get(String field) {
 		return values.get(field);
 	}
+
+	@Override
+	public <T> T getOrDefault(String field, T defaultValue) {
+		return (T) values.getOrDefault(field, defaultValue);
+	}
 
 	@Override
 	public String defaultContentType() {

diff --git a/cms-test/src/main/java/com/condation/cms/test/TestThemeProperties.java b/cms-test/src/main/java/com/condation/cms/test/TestThemeProperties.java
@@ -42,6 +42,11 @@ public TestThemeProperties(Map<String, Object> values) {
 	public Object get(String field) {
 		return values.get(field);
 	}
+
+	@Override
+	public <T> T getOrDefault(String field, T defaultValue) {
+		return (T) values.getOrDefault(field, defaultValue);
+	}
 
 	@Override
 	public String name() {

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>integration-tests</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules-framework/api/pom.xml b/modules-framework/api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.condation.cms.module.framework</groupId>
 		<artifactId>module-framework</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.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.condation.cms.module.framework</groupId>
 		<artifactId>module-framework</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.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.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<groupId>com.condation.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.condation.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.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.condation.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>7.0.0</version>
+		<version>7.1.0</version>
 	</parent>
 	<groupId>com.condation.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.condation.cms</groupId>
 	<artifactId>cms-parent</artifactId>
-	<version>7.0.0</version>
+	<version>7.1.0</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>