diff options
Diffstat (limited to 'eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java')
| -rw-r--r-- | eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java | 20 |
1 files changed, 10 insertions, 10 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 d20b33cc..af009b10 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 @@ -39,11 +39,11 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.gv.egiz.eaaf.core.api.idp.IConfiguration; +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 IConfiguration { +public abstract class AbstractConfigurationImpl implements IExtendedConfiguration { private static final Logger log = LoggerFactory.getLogger(AbstractConfigurationImpl.class); private static final String URI_SCHEME_CLASSPATH = "classpath"; @@ -52,7 +52,7 @@ public abstract class AbstractConfigurationImpl implements IConfiguration { private final URI internalConfigPath; private final URI configRootDirectory; private final Properties properties; - + public AbstractConfigurationImpl(final String configPath) throws EAAFConfigurationException { InputStream is = null; try { @@ -60,7 +60,7 @@ public abstract class AbstractConfigurationImpl implements IConfiguration { if (StringUtils.isEmpty(configPath)) { log.debug("Primary configuration is empty. Search for backup configuration .... "); - String backupConfigPath = getBackupConfigPath(); + final String backupConfigPath = getBackupConfigPath(); if (StringUtils.isEmpty(backupConfigPath)) { log.error("No configuration file found."); throw new EAAFConfigurationException("config.01", null); @@ -77,14 +77,14 @@ public abstract class AbstractConfigurationImpl implements IConfiguration { //extract configuration root directory //TODO: check if it works with classpath - File propertiesFile = new File(internalConfigPath); + final File propertiesFile = new File(internalConfigPath); if (!propertiesFile.exists()) { log.error("Configuration file: " + internalConfigPath + " is NOT found on filesystem"); throw new EAAFConfigurationException("config.18", null); } - String configDir = propertiesFile.getParent(); + final String configDir = propertiesFile.getParent(); configRootDirectory = new File(configDir).toURI(); log.debug("Set EAAFCore configuration root directory to " + configRootDirectory.toString()); @@ -127,7 +127,7 @@ public abstract class AbstractConfigurationImpl implements IConfiguration { try { is.close(); - } catch (IOException e) { + } catch (final IOException e) { log.warn("Can not close inputstream from configuration loader!"); } @@ -139,7 +139,7 @@ public abstract class AbstractConfigurationImpl implements IConfiguration { @Override public String getBasicConfiguration(String key) { if (StringUtils.isNotEmpty(key)) { - String value = properties.getProperty(addPrefixToKey(key)); + final String value = properties.getProperty(addPrefixToKey(key)); if (value != null) return value.trim(); } @@ -150,7 +150,7 @@ public abstract class AbstractConfigurationImpl implements IConfiguration { @Override public String getBasicConfiguration(String key, String defaultValue) { if (StringUtils.isNotEmpty(key)) { - String value = properties.getProperty(addPrefixToKey(key), defaultValue); + final String value = properties.getProperty(addPrefixToKey(key), defaultValue); if (value != null) return value.trim(); } @@ -166,7 +166,7 @@ public abstract class AbstractConfigurationImpl implements IConfiguration { @Override public boolean getBasicMOAIDConfigurationBoolean(String key, boolean defaultValue) { - String value = getBasicConfiguration(key); + final String value = getBasicConfiguration(key); if (StringUtils.isNotEmpty(value)) return Boolean.valueOf(value.trim()); |