some code code-style modifications

active code-quality checks!

3 files changed, 48 insertions, 73 deletions

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 e661a2a8..d279446b 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
@@ -27,13 +27,15 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
 import java.util.Properties;
-import at.gv.egiz.eaaf.core.api.idp.IExtendedConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.gv.egiz.eaaf.core.api.idp.IExtendedConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
+
 public abstract class AbstractConfigurationImpl implements IExtendedConfiguration {
   private static final Logger log = LoggerFactory.getLogger(AbstractConfigurationImpl.class);
 
@@ -72,7 +74,6 @@ public abstract class AbstractConfigurationImpl implements IExtendedConfiguratio
 
       log.info("Load EAAFCore configuration from " + internalConfigPath);
 
-
       // extract configuration root directory
       // TODO: check if it works with classpath
       final File propertiesFile = new File(internalConfigPath);
@@ -86,7 +87,6 @@ public abstract class AbstractConfigurationImpl implements IExtendedConfiguratio
       configRootDirectory = new File(configDir).toURI();
       log.debug("Set EAAFCore configuration root directory to " + configRootDirectory.toString());
 
-
       // get input stream from configuration path
       if (internalConfigPath.getScheme().equals(URI_SCHEME_FILESYSTEM)) {
         log.trace("Load config from filesystem");
@@ -99,19 +99,16 @@ public abstract class AbstractConfigurationImpl implements IExtendedConfiguratio
       } else {
         log.error(
             "Can not load EAAFCore configuration. Unsupported prefix! (Only 'file:' and 'classpath:')  ");
-        throw new EaafConfigurationException("config.24",
-            new Object[] {internalConfigPath, "'file:'"});
+        throw new EaafConfigurationException("config.24", new Object[] { internalConfigPath, "'file:'" });
 
       }
 
       if (is == null) {
         log.error("Can NOT load EAAFCore configuration from file " + internalConfigPath.toString());
-        throw new EaafConfigurationException("config.03",
-            new Object[] {internalConfigPath.toString()});
+        throw new EaafConfigurationException("config.03", new Object[] { internalConfigPath.toString() });
 
       }
 
-
       // load EAAF core configuration into properties object
       properties = new Properties();
       properties.load(is);
@@ -120,8 +117,9 @@ public abstract class AbstractConfigurationImpl implements IExtendedConfiguratio
 
     } catch (URISyntaxException | IOException e) {
       log.error("Can not parse configuration path " + configPath + " or " + getBackupConfigPath());
-      throw new EaafConfigurationException("config.03",
-          new Object[] {configPath + " or " + getBackupConfigPath()}, e);
+      throw new EaafConfigurationException("config.03", new Object[] { configPath + " or "
+          + getBackupConfigPath() },
+          e);
 
     } finally {
       if (is != null) {
@@ -161,24 +159,17 @@ public abstract class AbstractConfigurationImpl implements IExtendedConfiguratio
     return defaultValue;
   }
 
-
   @Override
   public boolean getBasicConfigurationBoolean(final String key) {
-    final String value = getBasicConfiguration(key);
-    if (value != null) {
-      return Boolean.parseBoolean(value);
-    } else {
-      return false;
-    }
+    return getBasicConfigurationBoolean(key, false);
 
   }
 
-
   @Override
   public boolean getBasicConfigurationBoolean(final String key, final boolean defaultValue) {
-    final Boolean result = getBasicConfigurationBoolean(key);
-    if (result != null) {
-      return result;
+    final String value = getBasicConfiguration(key);
+    if (value != null) {
+      return Boolean.parseBoolean(value);
     } else {
       return defaultValue;
     }
@@ -187,8 +178,8 @@ public abstract class AbstractConfigurationImpl implements IExtendedConfiguratio
 
   @Override
   public Map<String, String> getBasicConfigurationWithPrefix(final String prefix) {
-    return KeyValueUtils.getSubSetWithPrefix(KeyValueUtils.convertPropertiesToMap(properties),
-        addPrefixToKey(prefix));
+    return KeyValueUtils.getSubSetWithPrefix(KeyValueUtils.convertPropertiesToMap(properties), addPrefixToKey(
+        prefix));
 
   }
 
@@ -224,7 +215,6 @@ public abstract class AbstractConfigurationImpl implements IExtendedConfiguratio
    */
   public abstract String getApplicationSpecificKeyPrefix();
 
-
   private String addPrefixToKey(final String key) {
     if (StringUtils.isNotEmpty(getApplicationSpecificKeyPrefix())) {
       if (getApplicationSpecificKeyPrefix().endsWith(KeyValueUtils.KEY_DELIMITER)) {
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 3a6cc67d..1c7806ef 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
@@ -25,10 +25,9 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import javax.annotation.PostConstruct;
-import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,9 +38,12 @@ import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
+
 public abstract class AbstractSpringBootConfigurationImpl implements IConfigurationWithSP {
-  private static final Logger log =
-      LoggerFactory.getLogger(AbstractSpringBootConfigurationImpl.class);
+  private static final Logger log = LoggerFactory.getLogger(AbstractSpringBootConfigurationImpl.class);
 
   @Autowired
   private Environment env;
@@ -51,8 +53,8 @@ public abstract class AbstractSpringBootConfigurationImpl implements IConfigurat
   @PostConstruct
   private void initialize() throws EaafConfigurationException {
     if (getConfigurationRootDirectory() == null) {
-      throw new EaafConfigurationException("config.08",
-          new Object[] {addPrefixToKey(PROP_CONFIG_ROOT_DIR)});
+      throw new EaafConfigurationException("config.08", new Object[] { addPrefixToKey(
+          PROP_CONFIG_ROOT_DIR) });
 
     }
 
@@ -84,28 +86,23 @@ public abstract class AbstractSpringBootConfigurationImpl implements IConfigurat
 
   @Override
   public Map<String, String> getBasicConfigurationWithPrefix(final String prefix) {
-    final Map<String, String> configProps =
-        getPropertiesStartingWith((ConfigurableEnvironment) env, addPrefixToKey(prefix));
+    final Map<String, String> configProps = getPropertiesStartingWith((ConfigurableEnvironment) env,
+        addPrefixToKey(prefix));
     return KeyValueUtils.removePrefixFromKeys(configProps, addPrefixToKey(prefix) + ".");
 
-
   }
 
   @Override
   public boolean getBasicConfigurationBoolean(final String key) {
-    final String value = getBasicConfiguration(key);
-    if (StringUtils.isNotEmpty(value)) {
-      return Boolean.valueOf(value.trim());
-    } else {
-      return false;
-    }
+    return getBasicConfigurationBoolean(key, false);
+
   }
 
   @Override
   public boolean getBasicConfigurationBoolean(final String key, final boolean defaultValue) {
-    final Boolean value = getBasicConfigurationBoolean(key);
-    if (value != null) {
-      return value;
+    final String value = getBasicConfiguration(key);
+    if (StringUtils.isNotEmpty(value)) {
+      return Boolean.valueOf(value.trim());
     } else {
       return defaultValue;
     }
@@ -124,7 +121,6 @@ public abstract class AbstractSpringBootConfigurationImpl implements IConfigurat
 
   }
 
-
   /**
    * Get the path to backup configuration.
    *
@@ -139,7 +135,6 @@ public abstract class AbstractSpringBootConfigurationImpl implements IConfigurat
    */
   public abstract String getApplicationSpecificKeyPrefix();
 
-
   private String addPrefixToKey(final String key) {
     if (StringUtils.isNotEmpty(getApplicationSpecificKeyPrefix())) {
       if (getApplicationSpecificKeyPrefix().endsWith(KeyValueUtils.KEY_DELIMITER)) {
@@ -192,7 +187,8 @@ public abstract class AbstractSpringBootConfigurationImpl implements IConfigurat
       return result;
     }
 
-    // note: Most descendants of PropertySource are EnumerablePropertySource. There are some
+    // note: Most descendants of PropertySource are EnumerablePropertySource. There
+    // are some
     // few others like JndiPropertySource or StubPropertySource
     log.debug("Given PropertySource is instanceof " + apropSource.getClass().getName()
         + " and cannot be iterated");
@@ -201,8 +197,7 @@ public abstract class AbstractSpringBootConfigurationImpl implements IConfigurat
 
   }
 
-  private static void addAll(final Map<String, Object> abase,
-      final Map<String, Object> atoBeAdded) {
+  private static void addAll(final Map<String, Object> abase, final Map<String, Object> atoBeAdded) {
     for (final Entry<String, Object> entry : atoBeAdded.entrySet()) {
       if (abase.containsKey(entry.getKey())) {
         continue;
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(