From 3be8b5c3c139ab75db4ae9ac927800505194d987 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Wed, 29 May 2019 13:57:17 +0200
Subject: add new attribute builder fix some injection and dependency problems

---
 .../impl/idp/conf/AbstractConfigurationImpl.java   | 28 +++++++++++++++-------
 .../conf/AbstractSpringBootConfigurationImpl.java  | 21 ++++++++++------
 2 files changed, 34 insertions(+), 15 deletions(-)

(limited to 'eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf')

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java
index af009b10..55662326 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java
@@ -158,19 +158,31 @@ public abstract class AbstractConfigurationImpl implements IExtendedConfiguratio
 		return defaultValue;
 	}
 
+	
 	@Override
-	public Map<String, String> getBasicMOAIDConfigurationWithPrefix(String prefix) {
-		return KeyValueUtils.getSubSetWithPrefix(KeyValueUtils.convertPropertiesToMap(properties), addPrefixToKey(prefix));
+	public Boolean getBasicConfigurationBoolean(String key) {
+		final String value = getBasicConfiguration(key);
+		if (value != null)
+			return Boolean.parseBoolean(value);
+		else
+			return null;
 		
 	}
 
+
 	@Override
-	public boolean getBasicMOAIDConfigurationBoolean(String key, boolean defaultValue) {
-		final String value = getBasicConfiguration(key);		
-		if (StringUtils.isNotEmpty(value))
-			return Boolean.valueOf(value.trim());
-						
-		return defaultValue;
+	public boolean getBasicConfigurationBoolean(String key, boolean defaultValue) {
+		final Boolean result = getBasicConfigurationBoolean(key);
+		if (result != null)
+			return result;
+		else
+			return defaultValue;
+		
+	}
+	
+	@Override
+	public Map<String, String> getBasicConfigurationWithPrefix(String prefix) {
+		return KeyValueUtils.getSubSetWithPrefix(KeyValueUtils.convertPropertiesToMap(properties), addPrefixToKey(prefix));
 		
 	}
 	
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractSpringBootConfigurationImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractSpringBootConfigurationImpl.java
index 62245331..1a344feb 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractSpringBootConfigurationImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractSpringBootConfigurationImpl.java
@@ -88,7 +88,7 @@ public abstract class AbstractSpringBootConfigurationImpl implements IConfigurat
 	}
 
 	@Override
-	public Map<String, String> getBasicMOAIDConfigurationWithPrefix(String prefix) {				
+	public Map<String, String> getBasicConfigurationWithPrefix(String prefix) {				
 		final Map<String, String> configProps = getPropertiesStartingWith((ConfigurableEnvironment) env, addPrefixToKey(prefix));
 		return KeyValueUtils.removePrefixFromKeys(configProps, addPrefixToKey(prefix) + ".");
 
@@ -96,16 +96,23 @@ public abstract class AbstractSpringBootConfigurationImpl implements IConfigurat
 	}
 
 	@Override
-	public boolean getBasicMOAIDConfigurationBoolean(String key, boolean defaultValue) {
-		final String value = getBasicConfiguration(key);		
+	public Boolean getBasicConfigurationBoolean(String key) {
+		final String value = getBasicConfiguration(key);
 		if (StringUtils.isNotEmpty(value))
 			return Boolean.valueOf(value.trim());
-						
-		return defaultValue;
-		
+		else
+			return null;
 	}
-	
 
+	@Override
+	public boolean getBasicConfigurationBoolean(String key, boolean defaultValue) {
+		final Boolean value = getBasicConfigurationBoolean(key);		
+		if (value != null)
+			return value;
+		else
+			return defaultValue;
+	}
+	
 	@Override
 	public URI getConfigurationRootDirectory() {
 		try {
-- 
cgit v1.2.3