Merge pull request #68 from expose-prop-defaults

Expose all properties with default values #68

Author: adangel

CHANGELOG.md

@@ -12,6 +12,8 @@
 
 **Merged pull requests:**
 
+* [#68](https://github.com/pmd/pmd-designer/pull/68) Expose all properties with default values by [@jsotuyod](https://github.com/jsotuyod)
+
 See https://github.com/pmd/pmd-designer/milestone/11
 
 ## 7.0.0-rc1

src/main/java/net/sourceforge/pmd/util/fxdesigner/model/XPathEvaluator.java

@@ -10,6 +10,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -83,10 +84,11 @@ public static List<Node> evaluateQuery(Node compilationUnit,
 
         try {
 
-            Map<String, ? extends PropertyDescriptor<?>> descriptors = properties.stream().collect(Collectors.toMap(PropertyDescriptorSpec::getName, PropertyDescriptorSpec::build));
+            Map<String, PropertyDescriptor<?>> descriptors = properties.stream().collect(Collectors.toMap(PropertyDescriptorSpec::getName, PropertyDescriptorSpec::build));
+            // Take in all set values or defaults
             Map<PropertyDescriptor<?>, Object> allProperties =
-                propertyValues.entrySet().stream()
-                              .collect(Collectors.toMap(e -> descriptors.get(e.getKey()), e -> descriptors.get(e.getKey()).valueFrom(e.getValue())));
+                descriptors.entrySet().stream()
+                              .collect(Collectors.<Entry<String, PropertyDescriptor<?>>, PropertyDescriptor<?>, Object>toMap(e -> e.getValue(), e -> propertyValues.containsKey(e.getKey()) ? e.getValue().valueFrom(propertyValues.get(e.getKey())) : e.getValue().defaultValue()));
 
             SaxonXPathRuleQuery xpathRule =
                 new SaxonXPathRuleQuery(