filter and default fix

CHANGELOG.md

@@ -10,10 +10,19 @@ and this project adheres to
 
 Back to [Readme](README.md).
 
+[1.2.1]: https://github.com/bischoffdev/property-aggregator/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/bischoffdev/property-aggregator/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/bischoffdev/property-aggregator/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/bischoffdev/property-aggregator/tree/v1.0.0
 
+## [1.2.1] - 2022-03-14
+
+### Fixed
+* Setting default without a filter removed all properties with default values
+
+### Changed
+* Default values are set regardless of filters.
+
 ## [1.2.0] - 2022-03-14
 
 ### Added

README.md

@@ -243,8 +243,8 @@ of the property sources (in this example a properties file) does not include
 value. If, however, "property1" __is__ specified in a property source, the 
 default value is replaced by the actual value. 
 
-__Note:__ If you use defaults and filters together, make sure that 
-properties with defaults also exist in the list of filter keys!
+__Note:__ If you use defaults and filters together, properties with default 
+values are added to the final set regardless of filters!
 
 ## Logging the final properties
 

library/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>blog.softwaretester</groupId>
     <artifactId>property-aggregator</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 
     <url>https://github.com/bischoffdev/property-aggregator</url>

library/src/main/java/blog/softwaretester/properties/PropertyAggregator.java

@@ -41,8 +41,7 @@ private PropertyAggregator(final Builder builder) {
         // Process default values
         for (Map.Entry<String, String> entry
                 : builder.propertyDefaultValues.entrySet()) {
-            if (!tmpProperties.contains(entry.getKey())
-                    && builder.filteredKeys.contains(entry.getKey())) {
+            if (!tmpProperties.stringPropertyNames().contains(entry.getKey())) {
                 tmpProperties.put(entry.getKey(), entry.getValue());
             }
         }
@@ -100,6 +99,7 @@ public Properties getPropertiesWithCustomPredicate(
                                 ));
         Properties filteredProperties = new Properties();
         filteredProperties.putAll(propertyMap);
+
         return filteredProperties;
     }
 

library/src/test/java/blog/softwaretester/properties/PropertyAggregatorBuilderTest.java

@@ -125,8 +125,8 @@ public void validPropertiesWithDefaultValuesAndFilter() {
                 .withFilteredKeys(List.of("property2", "b"))
                 .build();
         propertyAggregator.logFinalProperties();
-        Assertions.assertEquals(2, propertyAggregator.getPropertiesCount());
-        Assertions.assertNull(propertyAggregator.getProperty("a"));
+        Assertions.assertEquals(3, propertyAggregator.getPropertiesCount());
+        Assertions.assertEquals("1", propertyAggregator.getProperty("a"));
         Assertions.assertEquals("2", propertyAggregator.getProperty("b"));
         Assertions.assertNull(propertyAggregator.getProperty("property1"));
         Assertions.assertEquals("value2_from_test1",