Merge branch 'master' into moa-sig-dependency-fixup

1 files changed, 20 insertions, 12 deletions

diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java
index eceec2a6..7d564b58 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java
@@ -57,27 +57,35 @@ public interface IConfiguration {
 	 */
 	public String getBasicConfiguration(final String key, final String defaultValue);
 	
+	
 	/**
-	 * Get a set of configuration values from file based configuration that starts with this prefix
-	 * <br><br>
-	 * <b>Important:</b> The configuration values must be of type String! 
+	 * Get a configuration value from file based configuration
 	 * 
-	 * @param prefix Prefix of the configuration key
-	 * @return Map<String, String> without prefix, but never null
+	 * @param key configuration key 
+	 * @return configuration value as {@link Boolean.parseBoolean(value)} or <code>null</code> if key does not exist
 	 */
-	public Map<String, String> getBasicMOAIDConfigurationWithPrefix(final String prefix);
-	
+	public Boolean getBasicConfigurationBoolean(final String key);
 	
 	/**
-	 * Get a boolean value from basic MOA-ID configuration file
+	 * Get a configuration value from file based configuration
 	 * 
-	 * @param key Configuration key
-	 * @param defaultValue Default result
-	 * @return returns the value of the configuration key, or the default value if the key is not set
+	 * @param key configuration key 
+	 * @param defaultValue Default value if no value with this key is found
+	 * @return configuration value as {@link Boolean.parseBoolean(value)} or <code>defaultValue</code> if key does not exist
 	 */
-	public boolean getBasicMOAIDConfigurationBoolean(String key, boolean defaultValue);
+	public boolean getBasicConfigurationBoolean(final String key, final boolean defaultValue);
 	
 	/**
+	 * Get a set of configuration values from file based configuration that starts with this prefix
+	 * <br><br>
+	 * <b>Important:</b> The configuration values must be of type String! 
+	 * 
+	 * @param prefix Prefix of the configuration key
+	 * @return Map<String, String> without prefix, but never null
+	 */
+	public Map<String, String> getBasicConfigurationWithPrefix(final String prefix);
+		
+	/**
 	 * Get a configuration entry for a specific Service Provider 
 	 * 
 	 * @param uniqueID Unique identifier of the Service Provider