1 files changed, 13 insertions, 23 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SpConfigurationImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SpConfigurationImpl.java
index 07284cd3..de54d103 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SpConfigurationImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/SpConfigurationImpl.java
@@ -22,15 +22,17 @@ package at.gv.egiz.eaaf.core.impl.idp.conf;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.IspConfiguration;
-import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SpConfigurationImpl implements IspConfiguration {
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
+
+public class SpConfigurationImpl implements ISpConfiguration {
   private static final long serialVersionUID = 688541755446463453L;
 
   private static final Logger log = LoggerFactory.getLogger(SpConfigurationImpl.class);
@@ -42,7 +44,7 @@ public class SpConfigurationImpl implements IspConfiguration {
   /**
    * Service-provider configuration holder.
    *
-   * @param spConfig Key/value based configuration
+   * @param spConfig   Key/value based configuration
    * @param authConfig Basic application configuration
    */
   public SpConfigurationImpl(final Map<String, String> spConfig, final IConfiguration authConfig) {
@@ -51,11 +53,11 @@ public class SpConfigurationImpl implements IspConfiguration {
     // set oa specific restrictions
     targetAreasWithNoInteralBaseIdRestriction = Collections
         .unmodifiableList(KeyValueUtils.getListOfCsvValues(authConfig.getBasicConfiguration(
-            CONFIG_KEY_RESTRICTIONS_BASEID_INTERNAL, EAAFConstants.URN_PREFIX_CDID)));
+            CONFIG_KEY_RESTRICTIONS_BASEID_INTERNAL, EaafConstants.URN_PREFIX_CDID)));
 
     targetAreasWithNoBaseIdTransmissionRestriction = Collections
         .unmodifiableList(KeyValueUtils.getListOfCsvValues(authConfig.getBasicConfiguration(
-            CONFIG_KEY_RESTRICTIONS_BASEID_TRANSMISSION, EAAFConstants.URN_PREFIX_CDID)));
+            CONFIG_KEY_RESTRICTIONS_BASEID_TRANSMISSION, EaafConstants.URN_PREFIX_CDID)));
 
     if (log.isTraceEnabled()) {
       log.trace("Internal policy for OA: " + getUniqueIdentifier());
@@ -69,7 +71,6 @@ public class SpConfigurationImpl implements IspConfiguration {
     }
   }
 
-
   @Override
   public final Map<String, String> getFullConfiguration() {
     return this.spConfiguration;
@@ -96,19 +97,12 @@ public class SpConfigurationImpl implements IspConfiguration {
     }
   }
 
-
   @Override
   public final boolean isConfigurationValue(final String key) {
-    final String value = getConfigurationValue(key);
-    if (value != null) {
-      return Boolean.parseBoolean(value);
-
-    }
+    return isConfigurationValue(key, false);
 
-    return false;
   }
 
-
   @Override
   public final boolean isConfigurationValue(final String key, final boolean defaultValue) {
     final String value = getConfigurationValue(key);
@@ -132,7 +126,7 @@ public class SpConfigurationImpl implements IspConfiguration {
 
   @Override
   public String getUniqueIdentifier() {
-    return getConfigurationValue(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER);
+    return getConfigurationValue(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER);
 
   }
 
@@ -148,19 +142,16 @@ public class SpConfigurationImpl implements IspConfiguration {
 
   }
 
-
   @Override
   public final List<String> getTargetsWithNoBaseIdInternalProcessingRestriction() {
     return this.targetAreasWithNoInteralBaseIdRestriction;
   }
 
-
   @Override
   public final List<String> getTargetsWithNoBaseIdTransferRestriction() {
     return this.targetAreasWithNoBaseIdTransmissionRestriction;
   }
 
-
   @Override
   public List<String> getRequiredLoA() {
     log.warn(
@@ -182,7 +173,6 @@ public class SpConfigurationImpl implements IspConfiguration {
     return null;
   }
 
-
   @Override
   public String getFriendlyName() {
     log.warn(