some code code-style modifications

active code-quality checks!

1 files changed, 19 insertions, 24 deletions

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;