Merge pull request #122 from cfg4j/support-empty-yaml

support empty yaml documents
cfg4j · Nov 3, 2015 · 20f1d7f · 20f1d7f
2 parents d6947f6 + 2798190
commit 20f1d7f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/...rc/main/java/org/cfg4j/source/context/propertiesprovider/YamlBasedPropertiesProvider.java b/...rc/main/java/org/cfg4j/source/context/propertiesprovider/YamlBasedPropertiesProvider.java
@@ -53,8 +53,10 @@ public Properties getProperties(InputStream inputStream) {
 
       Object object = yaml.load(reader);
 
-      Map<String, Object> yamlAsMap = convertToMap(object);
-      properties.putAll(flatten(yamlAsMap));
+      if (object != null) {
+        Map<String, Object> yamlAsMap = convertToMap(object);
+        properties.putAll(flatten(yamlAsMap));
+      }
 
       return properties;
 

diff --git a/...est/java/org/cfg4j/source/context/propertiesprovider/YamlBasedPropertiesProviderTest.java b/...est/java/org/cfg4j/source/context/propertiesprovider/YamlBasedPropertiesProviderTest.java
@@ -101,6 +101,15 @@ public void shouldThrowForNonYamlFile() throws Exception {
       expectedException.expect(IllegalStateException.class);
       provider.getProperties(input);
     }
+  }
+
+  @Test
+  public void shouldSupportEmptyDocument() throws Exception {
+    String path = "org/cfg4j/source/propertiesprovider/YamlBasedPropertiesProviderTest_shouldSupportEmptyDocument.yaml";
+
+    try (InputStream input = getClass().getClassLoader().getResourceAsStream(path)) {
+      assertThat(provider.getProperties(input)).isEmpty();
+    }
 
   }
 }
diff --git a/...source/propertiesprovider/YamlBasedPropertiesProviderTest_shouldSupportEmptyDocument.yaml b/...source/propertiesprovider/YamlBasedPropertiesProviderTest_shouldSupportEmptyDocument.yaml