some code code-style modifications

active code-quality checks!

1 files changed, 16 insertions, 26 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)) {