Skip to content

Commit

Permalink
Updates changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
haroon-sheikh committed Apr 5, 2023
1 parent 7391a5a commit cf05687
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ 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.5.0

### Updated

- Bump commons-configuration2 from 2.8.0 to 2.9.0
- Bump slf4j.version from 2.0.6 to 2.0.7
- Bump checkstyle from 10.6.0 to 10.9.3
- Bump maven-surefire-plugin from 3.0.0-M8 to 3.0.0
- Bump maven-compiler-plugin from 3.10.1 to 3.11.0

## 1.4.0

### Updated
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>com.github.sitture</groupId>
<artifactId>env-config</artifactId>
<packaging>jar</packaging>
<version>1.4.0</version>
<version>1.5.0</version>

<name>env-config</name>
<description>A simple utility to manage environment configs in Java-based projects by merging *.properties files with environment variables overrides.</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,19 @@ private Configuration getConfiguration(final EnvConfigFileList fileList) {
}
final CompositeConfiguration configuration = new CompositeConfiguration();
fileList.listFiles().forEach(file ->
configuration.addConfiguration(new MapConfiguration(getFileConfigurationMap(file))));
configuration.addConfiguration(getFileConfigurationMap(file)));
return configuration;
}

private Map<String, Object> getFileConfigurationMap(final File file) {
private Configuration getFileConfigurationMap(final File file) {
final Map<String, Object> configurationMap = new HashMap<>();
final Configuration properties = getConfigurationProperties(file);
properties.getKeys().forEachRemaining(key -> {
final Object value = properties.getProperty(key);
configurationMap.put(EnvConfigUtils.getProcessedPropertyKey(key), value);
configurationMap.put(EnvConfigUtils.getProcessedEnvKey(key), value);
});
return configurationMap;
return new MapConfiguration(configurationMap);
}

private Configuration getConfigurationProperties(final File file) {
Expand Down

0 comments on commit cf05687

Please sign in to comment.