Fixes an issue getting value from keepass when key in env and default…

… properties are same
sitture · Jan 26, 2023 · bb0f7fa · bb0f7fa
1 parent ada313d
commit bb0f7fa
Show file tree

Hide file tree

Showing 9 changed files with 308 additions and 292 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 1.2.4
+
+### Fixed
+
+- Fixes an issue getting value from keepass when key in env and default properties are same
+
 ## 1.2.3
 
 ### Fixed

diff --git a/src/main/java/com/github/sitture/envconfig/EnvConfig.java b/src/main/java/com/github/sitture/envconfig/EnvConfig.java
@@ -9,166 +9,169 @@
 
 public final class EnvConfig extends EnvConfigLoader {
 
-	private static EnvConfig config;
-
-	private EnvConfig() {
-		super();
-	}
-
-	static void reset() {
-		synchronized (EnvConfig.class) {
-			config = null;
-		}
-	}
-
-	/**
-	 * Creates an instance of Config class or returns already created.
-	 *
-	 * @return instance of Config
-	 */
-	static EnvConfig getConfig() {
-		synchronized (EnvConfig.class) {
-			if (config == null) {
-				config = new EnvConfig();
-			}
-		}
-		return config;
-	}
-
-	/**
-	 * Returns the composite configuration.
-	 *
-	 * @return the configuration object.
-	 */
-	private static CompositeConfiguration getConfiguration() {
-		return getConfig().configuration;
-	}
-
-	/**
-	 * Clears a property from the config.
-	 *
-	 * @param property Name of the property to clear
-	 */
-	public static void clear(final String property) {
-		getConfiguration().clearProperty(property);
-	}
-
-	/**
-	 * Set a property into the config with given Object value.
-	 * @param property Key of the config entry
-	 * @param value value of the config entry
-	 */
-	public static void set(final String property, final Object value) {
-		getConfiguration().setProperty(property, value);
-	}
-
-	/**
-	 * Adds a property into the config with given Object value.
-	 * @param property Key of the config entry
-	 * @param value value of the config entry
-	 */
-	public static void add(final String property, final Object value) {
-		getConfiguration().addProperty(property, value);
-	}
-
-	private static Optional<String> getProperty(final String property) {
-		return Optional.ofNullable(getConfiguration().getString(property));
-	}
-
-	/**
-	 * Get property from file.
-	 *
-	 * @param property property name.
-	 * @return property value.
-	 * @throws EnvConfigException if property does not exist.
-	 */
-	public static String getOrThrow(final String property) {
-		return getProperty(property)
-				.orElseThrow(() -> new EnvConfigException("Missing required variable '" + property + "'"));
-	}
-
-	/**
-	 * Get property from file.
-	 * @param property property name.
-	 * @return property value.
-	 */
-	public static String get(final String property) {
-		return getProperty(property).map(String::trim).orElse(null);
-	}
-
-	/**
-	 * Get property from file.
-	 *
-	 * @param property property name.
-	 * @param defaultValue default value if not set
-	 * @return property value.
-	 */
-	public static String get(final String property, final String defaultValue) {
-		return getProperty(property).orElse(defaultValue);
-	}
-
-	/**
-	 * Get property from file.
-	 *
-	 * @param property property name.
-	 * @return property value.
-	 */
-	public static int getInt(final String property) {
-		return getProperty(property).map(Integer::parseInt).orElse(-1);
-	}
-
-	/**
-	 * Returns a key/value from a named config, parsed as Boolean.
-	 *
-	 * @param property the property
-	 * @return a Boolean representing the value, false if the value not present or
-	 *         cannot be parsed as Boolean
-	 */
-	public static boolean getBool(final String property) {
-		return getProperty(property).map(Boolean::parseBoolean).orElse(false);
-	}
-
-	/**
-	 * Returns key/value from a named config, parsed as List of Strings
-	 * with comma separated values.
-	 *
-	 * @param property the property
-	 * @return a list of strings
-	 */
-	public static List<String> getList(final String property) {
-		return getList(property, EnvConfigUtils.CONFIG_DELIMITER_DEFAULT);
-	}
-
-	/**
-	 * Returns key/value from a named config, parsed as List of Strings
-	 * with a given delimiter.
-	 *
-	 * @param property the property
-	 * @param delimiter the delimiter
-	 * @return a list of strings
-	 */
-	public static List<String> getList(final String property, final String delimiter) {
-		return EnvConfigUtils.getListOfValues(get(property), delimiter);
-	}
-
-	/**
-	 * Gets environment property from Config.
-	 *
-	 * @return env property value.
-	 */
-	public static String getEnvironment() {
-		return getConfig().configProperties.getEnvironments().get(0);
-	}
-
-	public static Map<String, Object> asMap() {
-		final Map<String, Object> propertiesMap = new TreeMap<>();
-		getConfiguration().getKeys().forEachRemaining(key -> propertiesMap.put(key, get(key)));
-		return propertiesMap;
-	}
-
-	@Override
-	public String toString() {
-		return asMap().toString().replaceAll(", ", "\n");
-	}
+    private static EnvConfig config;
+
+    private EnvConfig() {
+        super();
+    }
+
+    static void reset() {
+        synchronized (EnvConfig.class) {
+            config = null;
+        }
+    }
+
+    /**
+     * Creates an instance of Config class or returns already created.
+     *
+     * @return instance of Config
+     */
+    static EnvConfig getConfig() {
+        synchronized (EnvConfig.class) {
+            if (config == null) {
+                config = new EnvConfig();
+            }
+        }
+        return config;
+    }
+
+    /**
+     * Returns the composite configuration.
+     *
+     * @return the configuration object.
+     */
+    private static CompositeConfiguration getConfiguration() {
+        return getConfig().configuration;
+    }
+
+    /**
+     * Clears a property from the config.
+     *
+     * @param property Name of the property to clear
+     */
+    public static void clear(final String property) {
+        getConfiguration().clearProperty(property);
+    }
+
+    /**
+     * Set a property into the config with given Object value.
+     *
+     * @param property Key of the config entry
+     * @param value    value of the config entry
+     */
+    public static void set(final String property, final Object value) {
+        getConfiguration().setProperty(property, value);
+    }
+
+    /**
+     * Adds a property into the config with given Object value.
+     *
+     * @param property Key of the config entry
+     * @param value    value of the config entry
+     */
+    public static void add(final String property, final Object value) {
+        getConfiguration().addProperty(property, value);
+    }
+
+    private static Optional<String> getProperty(final String property) {
+        return Optional.ofNullable(getConfiguration().getString(property));
+    }
+
+    /**
+     * Get property from file.
+     *
+     * @param property property name.
+     * @return property value.
+     * @throws EnvConfigException if property does not exist.
+     */
+    public static String getOrThrow(final String property) {
+        return getProperty(property)
+                .orElseThrow(() -> new EnvConfigException("Missing required variable '" + property + "'"));
+    }
+
+    /**
+     * Get property from file.
+     *
+     * @param property property name.
+     * @return property value.
+     */
+    public static String get(final String property) {
+        return getProperty(property).map(String::trim).orElse(null);
+    }
+
+    /**
+     * Get property from file.
+     *
+     * @param property     property name.
+     * @param defaultValue default value if not set
+     * @return property value.
+     */
+    public static String get(final String property, final String defaultValue) {
+        return getProperty(property).orElse(defaultValue);
+    }
+
+    /**
+     * Get property from file.
+     *
+     * @param property property name.
+     * @return property value.
+     */
+    public static int getInt(final String property) {
+        return getProperty(property).map(Integer::parseInt).orElse(-1);
+    }
+
+    /**
+     * Returns a key/value from a named config, parsed as Boolean.
+     *
+     * @param property the property
+     * @return a Boolean representing the value, false if the value not present or
+     * cannot be parsed as Boolean
+     */
+    public static boolean getBool(final String property) {
+        return getProperty(property).map(Boolean::parseBoolean).orElse(false);
+    }
+
+    /**
+     * Returns key/value from a named config, parsed as List of Strings
+     * with comma separated values.
+     *
+     * @param property the property
+     * @return a list of strings
+     */
+    public static List<String> getList(final String property) {
+        return getList(property, EnvConfigUtils.CONFIG_DELIMITER_DEFAULT);
+    }
+
+    /**
+     * Returns key/value from a named config, parsed as List of Strings
+     * with a given delimiter.
+     *
+     * @param property  the property
+     * @param delimiter the delimiter
+     * @return a list of strings
+     */
+    public static List<String> getList(final String property, final String delimiter) {
+        return EnvConfigUtils.getListOfValues(get(property), delimiter);
+    }
+
+    /**
+     * Gets environment property from Config.
+     *
+     * @return env property value.
+     */
+    public static String getEnvironment() {
+        return getConfig().configProperties.getEnvironments().get(0);
+    }
+
+    public static Map<String, Object> asMap() {
+        final Map<String, Object> propertiesMap = new TreeMap<>();
+        getConfiguration().getKeys().forEachRemaining(key -> propertiesMap.put(key, get(key)));
+        return propertiesMap;
+    }
+
+    @Override
+    public String toString() {
+        return asMap().toString().replaceAll(", ", "\n");
+    }
 
 }