From 89392d4c4f8c3deb09ee875c8583a9ee20aaca67 Mon Sep 17 00:00:00 2001
From: Alex <alexander.suter.ch@gmail.com>
Date: Wed, 19 Sep 2018 18:16:00 +0200
Subject: [PATCH 1/2] TAMAYA-350 - Do not provide null as "null" string

---
 .../yaml/src/main/java/org/apache/tamaya/yaml/YAMLFormat.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/formats/yaml/src/main/java/org/apache/tamaya/yaml/YAMLFormat.java b/modules/formats/yaml/src/main/java/org/apache/tamaya/yaml/YAMLFormat.java
index 33d6bede..0f3b00b1 100644
--- a/modules/formats/yaml/src/main/java/org/apache/tamaya/yaml/YAMLFormat.java
+++ b/modules/formats/yaml/src/main/java/org/apache/tamaya/yaml/YAMLFormat.java
@@ -137,6 +137,9 @@ protected void mapYamlIntoProperties(String prefix, Object config, HashMap<Strin
     }
 
     protected String mapValueToString(Object val) {
+	if (val == null) {
+	    return null;
+	}
         return String.valueOf(val);
     }
 

From 7d8d3238faf471bcb658aa444ba9a4e0b93ec391 Mon Sep 17 00:00:00 2001
From: Alexander Suter <alexander.suter@axonivy.com>
Date: Mon, 24 Sep 2018 22:01:21 +0200
Subject: [PATCH 2/2] TAMAYA-350 - Do not provide null as "null" string

---
 .../org/apache/tamaya/yaml/YAMLFormat.java    |  7 +++----
 .../apache/tamaya/yaml/YAMLFormatTest.java    | 20 +++++++++++++++++--
 .../test/resources/configs/valid/contact.yaml |  3 ++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/modules/formats/yaml/src/main/java/org/apache/tamaya/yaml/YAMLFormat.java b/modules/formats/yaml/src/main/java/org/apache/tamaya/yaml/YAMLFormat.java
index 0f3b00b1..fb359303 100644
--- a/modules/formats/yaml/src/main/java/org/apache/tamaya/yaml/YAMLFormat.java
+++ b/modules/formats/yaml/src/main/java/org/apache/tamaya/yaml/YAMLFormat.java
@@ -132,14 +132,13 @@ protected void mapYamlIntoProperties(String prefix, Object config, HashMap<Strin
                 mapYamlIntoProperties(newPrefix, en.getValue(), values);
             }
         } else{
-            values.put(prefix, mapValueToString(config));
+        	if (config != null) {
+        		values.put(prefix, mapValueToString(config));
+        	}
         }
     }
 
     protected String mapValueToString(Object val) {
-	if (val == null) {
-	    return null;
-	}
         return String.valueOf(val);
     }
 
diff --git a/modules/formats/yaml/src/test/java/org/apache/tamaya/yaml/YAMLFormatTest.java b/modules/formats/yaml/src/test/java/org/apache/tamaya/yaml/YAMLFormatTest.java
index e5d30c6b..1efedcd1 100644
--- a/modules/formats/yaml/src/test/java/org/apache/tamaya/yaml/YAMLFormatTest.java
+++ b/modules/formats/yaml/src/test/java/org/apache/tamaya/yaml/YAMLFormatTest.java
@@ -56,13 +56,29 @@ public void testAcceptURL_BC3() throws MalformedURLException {
 
     @Test
     public void testRead() throws IOException {
-        URL configURL = YAMLPropertySourceTest.class.getResource("/configs/valid/contact.yaml");
+        URL configURL = getContactYaml();
         assertTrue(format.accepts(configURL));
-        ConfigurationData data = format.readConfiguration(configURL.toString(), configURL.openStream());
+        ConfigurationData data = loadConfigurationData(configURL);
         assertNotNull(data);
         for(Map.Entry<String,String> en:data.getDefaultProperties().entrySet()) {
             System.out.println(en.getKey() + " -> " + en.getValue());
         }
     }
+    
+    @Test
+    public void testRead_nullValues() throws IOException {
+    	URL configURL = getContactYaml();
+        ConfigurationData data = loadConfigurationData(configURL);
+        assertFalse(data.getDefaultProperties().containsKey("summary"));
+    }
+
+	private ConfigurationData loadConfigurationData(URL configURL) throws IOException {
+		return format.readConfiguration(configURL.toString(), configURL.openStream());
+	}
+
+	private URL getContactYaml() {
+		URL configURL = YAMLPropertySourceTest.class.getResource("/configs/valid/contact.yaml");
+		return configURL;
+	}
 
 }
\ No newline at end of file
diff --git a/modules/formats/yaml/src/test/resources/configs/valid/contact.yaml b/modules/formats/yaml/src/test/resources/configs/valid/contact.yaml
index 95d5a037..a5bc655a 100644
--- a/modules/formats/yaml/src/test/resources/configs/valid/contact.yaml
+++ b/modules/formats/yaml/src/test/resources/configs/valid/contact.yaml
@@ -43,4 +43,5 @@ total: 4443.52
 comments: >
     Late afternoon is best.
     Backup contact is Nancy
-    Billsmer @ 338-4338.
\ No newline at end of file
+    Billsmer @ 338-4338.
+summary: 
\ No newline at end of file