From e55944b8c14c1475b32148c2558250184a03da77 Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Tue, 24 Jul 2018 11:23:39 +0530
Subject: [PATCH 1/2] BAEL-1979 Added examples for SnakeYAML Library

---
 pom.xml                                       |   3 +
 snakeyaml/pom.xml                             |  29 ++++
 .../com/baeldung/snakeyaml/model/Address.java |  41 ++++++
 .../com/baeldung/snakeyaml/model/Contact.java |  25 ++++
 .../baeldung/snakeyaml/model/Customer.java    |  62 ++++++++
 .../JavaToYAMLSerializationUnitTest.java      |  51 +++++++
 .../YAMLToJavaDeserialisationUnitTest.java    | 135 ++++++++++++++++++
 snakeyaml/src/test/resources/customer.yaml    |   3 +
 .../customer_with_contact_details.yaml        |   7 +
 ...omer_with_contact_details_and_address.yaml |  18 +++
 ...ustomer_with_contact_details_and_tags.yaml |   6 +
 .../test/resources/customer_with_type.yaml    |   4 +
 snakeyaml/src/test/resources/customers.yaml   |   8 ++
 13 files changed, 392 insertions(+)
 create mode 100644 snakeyaml/pom.xml
 create mode 100644 snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java
 create mode 100644 snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java
 create mode 100644 snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java
 create mode 100644 snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
 create mode 100644 snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
 create mode 100644 snakeyaml/src/test/resources/customer.yaml
 create mode 100644 snakeyaml/src/test/resources/customer_with_contact_details.yaml
 create mode 100644 snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml
 create mode 100644 snakeyaml/src/test/resources/customer_with_contact_details_and_tags.yaml
 create mode 100644 snakeyaml/src/test/resources/customer_with_type.yaml
 create mode 100644 snakeyaml/src/test/resources/customers.yaml

diff --git a/pom.xml b/pom.xml
index 06ec82e5f0..4aad8d43d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,6 +550,7 @@
 				<module>spring-reactive-kotlin</module>
 				<module>jnosql</module>
 				<module>testing-modules/junit-abstract</module>
+				<module>snakeyaml</module>
 			</modules>
 
 		</profile>
@@ -670,6 +671,7 @@
 				<module>spring-apache-camel</module>
 				<module>spring-batch</module>
 				<module>testing-modules/junit-abstract</module>
+				<module>snakeyaml</module>
 
 
 				<!-- group 2 - Pass, 11-16 min, 42 test failures, 4,020 KB -->
@@ -1076,6 +1078,7 @@
 				<module>maven-archetype</module>
 				<module>apache-meecrowave</module>
 				<module>testing-modules/junit-abstract</module>
+				<module>snakeyaml</module>
                 
                 <!-- problematic -->
                 <!-- 
diff --git a/snakeyaml/pom.xml b/snakeyaml/pom.xml
new file mode 100644
index 0000000000..6a339b84a8
--- /dev/null
+++ b/snakeyaml/pom.xml
@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>snakeyaml</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>snakeyaml</name>
+	<url>http://maven.apache.org</url>
+
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-modules</artifactId>
+		<version>1.0.0-SNAPSHOT</version>		
+	</parent>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>1.21</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java b/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java
new file mode 100644
index 0000000000..1e0174df56
--- /dev/null
+++ b/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java
@@ -0,0 +1,41 @@
+package com.baeldung.snakeyaml.model;
+
+public class Address {
+    private String line;
+    private String city;
+    private String state;
+    private Integer zip;
+
+    public String getLine() {
+        return line;
+    }
+
+    public void setLine(String line) {
+        this.line = line;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public Integer getZip() {
+        return zip;
+    }
+
+    public void setZip(Integer zip) {
+        this.zip = zip;
+    }
+
+}
diff --git a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java b/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java
new file mode 100644
index 0000000000..063564cf43
--- /dev/null
+++ b/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java
@@ -0,0 +1,25 @@
+package com.baeldung.snakeyaml.model;
+
+public class Contact {
+
+    private String type;
+
+    private Integer number;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+}
diff --git a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java b/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java
new file mode 100644
index 0000000000..6ebd70508e
--- /dev/null
+++ b/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java
@@ -0,0 +1,62 @@
+package com.baeldung.snakeyaml.model;
+
+import java.util.List;
+
+public class Customer {
+
+    private String firstName;
+    private String lastName;
+    private Integer age;
+    private List<Contact> contactDetails;
+    private Address homeAddress;
+    private Address officeAddress;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public List<Contact> getContactDetails() {
+        return contactDetails;
+    }
+
+    public void setContactDetails(List<Contact> contactDetails) {
+        this.contactDetails = contactDetails;
+    }
+
+    public Address getHomeAddress() {
+        return homeAddress;
+    }
+
+    public void setHomeAddress(Address homeAddress) {
+        this.homeAddress = homeAddress;
+    }
+
+    public Address getOfficeAddress() {
+        return officeAddress;
+    }
+
+    public void setOfficeAddress(Address officeAddress) {
+        this.officeAddress = officeAddress;
+    }
+
+}
diff --git a/snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java b/snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
new file mode 100644
index 0000000000..be1e19fd51
--- /dev/null
+++ b/snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
@@ -0,0 +1,51 @@
+package com.baeldung.snakeyaml;
+
+import java.io.StringWriter;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.nodes.Tag;
+
+import com.baeldung.snakeyaml.model.Customer;
+
+public class JavaToYAMLSerializationUnitTest {
+
+    @Test
+    public void whenDumpMap_thenGenerateCorrectYAML() {
+        Map<String, Object> data = new LinkedHashMap<String, Object>();
+        data.put("name", "Silenthand Olleander");
+        data.put("race", "Human");
+        data.put("traits", new String[] { "ONE_HAND", "ONE_EYE" });
+        Yaml yaml = new Yaml();
+        StringWriter writer = new StringWriter();
+        yaml.dump(data, writer);
+        System.out.println(writer.toString());
+        
+    }
+
+    @Test
+    public void whenDumpACustomType_thenGenerateCorrectYAML() {
+        Customer customer = new Customer();
+        customer.setAge(45);
+        customer.setFirstName("Greg");
+        customer.setLastName("McDowell");
+        Yaml yaml = new Yaml();
+        StringWriter writer = new StringWriter();
+        yaml.dump(customer, writer);
+        System.out.println(writer.toString());
+    }
+
+    @Test
+    public void whenDumpAsCustomType_thenGenerateCorrectYAML() {
+        Customer customer = new Customer();
+        customer.setAge(45);
+        customer.setFirstName("Greg");
+        customer.setLastName("McDowell");
+        Yaml yaml = new Yaml();
+        yaml.dumpAs(customer, Tag.MAP, null);
+        System.out.println(yaml.dumpAs(customer, Tag.MAP, null));
+    }
+
+}
diff --git a/snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java b/snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
new file mode 100644
index 0000000000..14016f0cca
--- /dev/null
+++ b/snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
@@ -0,0 +1,135 @@
+package com.baeldung.snakeyaml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
+import java.util.Date;
+import java.util.Map;
+
+import org.junit.Test;
+import org.yaml.snakeyaml.TypeDescription;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+
+import com.baeldung.snakeyaml.model.Contact;
+import com.baeldung.snakeyaml.model.Customer;
+
+public class YAMLToJavaDeserialisationUnitTest {
+
+    @Test
+    public void whenLoadYAMLDocument_thenLoadCorrectMap() {
+        Yaml yaml = new Yaml();
+        InputStream inputStream = this.getClass()
+            .getClassLoader()
+            .getResourceAsStream("customer.yaml");
+        Map<String, Object> obj = yaml.load(inputStream);
+        System.out.println(obj);
+    }
+
+    @Test
+    public void whenLoadYAMLDocumentWithTopLevelClass_thenLoadCorrectJavaObject() {
+        Yaml yaml = new Yaml(new Constructor(Customer.class));
+        InputStream inputStream = this.getClass()
+            .getClassLoader()
+            .getResourceAsStream("customer.yaml");
+        Customer customer = yaml.load(inputStream);
+        System.out.println(customer);
+    }
+
+    @Test
+    public void whenLoadYAMLDocumentWithAssumedClass_thenLoadCorrectJavaObject() {
+        Yaml yaml = new Yaml();
+        InputStream inputStream = this.getClass()
+            .getClassLoader()
+            .getResourceAsStream("customer_with_type.yaml");
+        Customer customer = yaml.load(inputStream);
+        System.out.println(customer);
+    }
+
+    @Test
+    public void whenLoadYAML_thenLoadCorrectImplicitTypes() {
+        Yaml yaml = new Yaml();
+        Map<Object, Object> document = yaml.load("3.0: 2018-07-22");
+        assertNotNull(document);
+        assertTrue(document.size() == 1);
+        assertTrue(document.containsKey(Double.valueOf(3.0)));
+        assertTrue(document.get(Double.valueOf(3.0)) instanceof Date);
+    }
+
+    @Test
+    public void whenLoadYAMLDocumentWithTopLevelClass_thenLoadCorrectJavaObjectWithNestedObjects() {
+        Yaml yaml = new Yaml(new Constructor(Customer.class));
+        InputStream inputStream = this.getClass()
+            .getClassLoader()
+            .getResourceAsStream("customer_with_contact_details_and_address.yaml");
+        Customer customer = yaml.load(inputStream);
+        assertNotNull(customer);
+        assertEquals("John", customer.getFirstName());
+        assertEquals("Doe", customer.getLastName());
+        assertTrue(customer.getAge() == 31);
+        assertNotNull(customer.getContactDetails());
+        assertTrue(customer.getContactDetails()
+            .size() == 2);
+        assertEquals("mobile", customer.getContactDetails()
+            .get(0)
+            .getType());
+        assertTrue(customer.getContactDetails()
+            .get(0)
+            .getNumber() == 123456789);
+        assertEquals("landline", customer.getContactDetails()
+            .get(1)
+            .getType());
+        assertTrue(customer.getContactDetails()
+            .get(1)
+            .getNumber() == 456786868);
+        assertNotNull(customer.getHomeAddress());
+        assertEquals("Xyz, DEF Street", customer.getHomeAddress()
+            .getLine());
+        assertNotNull(customer.getHomeAddress());
+        assertEquals("Xyz, Office Street", customer.getOfficeAddress()
+            .getLine());
+    }
+
+    @Test
+    public void whenLoadYAMLDocumentWithTypeDescription_thenLoadCorrectJavaObjectWithCorrectGenericType() {
+        Constructor constructor = new Constructor(Customer.class);
+        TypeDescription customTypeDescription = new TypeDescription(Customer.class);
+        customTypeDescription.addPropertyParameters("contactDetails", Contact.class);
+        constructor.addTypeDescription(customTypeDescription);
+        Yaml yaml = new Yaml(constructor);
+        InputStream inputStream = this.getClass()
+            .getClassLoader()
+            .getResourceAsStream("customer_with_contact_details.yaml");
+        Customer customer = yaml.load(inputStream);
+        assertNotNull(customer);
+        assertEquals("John", customer.getFirstName());
+        assertEquals("Doe", customer.getLastName());
+        assertTrue(customer.getAge() == 31);
+        assertNotNull(customer.getContactDetails());
+        assertTrue(customer.getContactDetails()
+            .size() == 2);
+        assertEquals("mobile", customer.getContactDetails()
+            .get(0)
+            .getType());
+        assertEquals("landline", customer.getContactDetails()
+            .get(1)
+            .getType());
+    }
+
+    @Test
+    public void whenLoadMultipleYAMLDocuments_thenLoadCorrectJavaObjects() {
+        Yaml yaml = new Yaml(new Constructor(Customer.class));
+        InputStream inputStream = this.getClass()
+            .getClassLoader()
+            .getResourceAsStream("customers.yaml");
+        int count = 0;
+        for (Object object : yaml.loadAll(inputStream)) {
+            count++;
+            assertTrue(object instanceof Customer);
+        }
+        assertTrue(count == 2);
+    }
+
+}
diff --git a/snakeyaml/src/test/resources/customer.yaml b/snakeyaml/src/test/resources/customer.yaml
new file mode 100644
index 0000000000..aa76141c7d
--- /dev/null
+++ b/snakeyaml/src/test/resources/customer.yaml
@@ -0,0 +1,3 @@
+firstName: "John"
+lastName: "Doe"
+age: 20
\ No newline at end of file
diff --git a/snakeyaml/src/test/resources/customer_with_contact_details.yaml b/snakeyaml/src/test/resources/customer_with_contact_details.yaml
new file mode 100644
index 0000000000..34563cbd21
--- /dev/null
+++ b/snakeyaml/src/test/resources/customer_with_contact_details.yaml
@@ -0,0 +1,7 @@
+firstName: "John"
+lastName: "Doe"
+age: 31
+contactDetails:
+   - { type: "mobile", number: 123456789}
+   - { type: "landline", number: 456786868}
+   
\ No newline at end of file
diff --git a/snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml b/snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml
new file mode 100644
index 0000000000..bc73654389
--- /dev/null
+++ b/snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml
@@ -0,0 +1,18 @@
+firstName: "John"
+lastName: "Doe"
+age: 31
+contactDetails:
+   - type: "mobile"
+     number: 123456789
+   - type: "landline"
+     number: 456786868
+homeAddress:
+   line: "Xyz, DEF Street"
+   city: "City Y"
+   state: "State Y"
+   zip: 345657
+officeAddress:
+   line: "Xyz, Office Street"
+   city: "City Y"
+   state: "State Y"
+   zip: 345657
diff --git a/snakeyaml/src/test/resources/customer_with_contact_details_and_tags.yaml b/snakeyaml/src/test/resources/customer_with_contact_details_and_tags.yaml
new file mode 100644
index 0000000000..145da256d9
--- /dev/null
+++ b/snakeyaml/src/test/resources/customer_with_contact_details_and_tags.yaml
@@ -0,0 +1,6 @@
+firstName: "John"
+lastName: "Doe"
+age: 31
+contactDetails:
+   - !contact { type: "mobile", number: 123456789}
+   - !contact { type: "landline", number: 456786868}
diff --git a/snakeyaml/src/test/resources/customer_with_type.yaml b/snakeyaml/src/test/resources/customer_with_type.yaml
new file mode 100644
index 0000000000..287bb7452d
--- /dev/null
+++ b/snakeyaml/src/test/resources/customer_with_type.yaml
@@ -0,0 +1,4 @@
+!!com.baeldung.snakeyaml.model.Customer
+firstName: "John"
+lastName: "Doe"
+age: 20
\ No newline at end of file
diff --git a/snakeyaml/src/test/resources/customers.yaml b/snakeyaml/src/test/resources/customers.yaml
new file mode 100644
index 0000000000..23b9039c2e
--- /dev/null
+++ b/snakeyaml/src/test/resources/customers.yaml
@@ -0,0 +1,8 @@
+---
+firstName: "John"
+lastName: "Doe"
+age: 20
+---
+firstName: "Jack"
+lastName: "Jones"
+age: 25
\ No newline at end of file

From 388645a34c5c14519de42816873adce313f7961d Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Fri, 27 Jul 2018 01:57:58 +0530
Subject: [PATCH 2/2] BAEL-1979 Moved the snakeyaml related code to libraries
 module

---
 libraries/.gitignore                          |  1 +
 libraries/pom.xml                             |  7 +++++
 .../java/com/baeldung/snakeyaml}/Address.java |  2 +-
 .../java/com/baeldung/snakeyaml}/Contact.java |  2 +-
 .../com/baeldung/snakeyaml}/Customer.java     | 13 ++-------
 .../JavaToYAMLSerializationUnitTest.java      | 15 ++++++----
 .../YAMLToJavaDeserialisationUnitTest.java    | 19 +++++-------
 .../src/test/resources/yaml}/customer.yaml    |  0
 .../yaml}/customer_with_contact_details.yaml  |  0
 ...omer_with_contact_details_and_address.yaml |  5 ----
 ...ustomer_with_contact_details_and_tags.yaml |  0
 .../resources/yaml/customer_with_type.yaml    |  4 +++
 .../src/test/resources/yaml}/customers.yaml   |  0
 pom.xml                                       |  9 ++----
 snakeyaml/pom.xml                             | 29 -------------------
 .../test/resources/customer_with_type.yaml    |  4 ---
 16 files changed, 37 insertions(+), 73 deletions(-)
 rename {snakeyaml/src/main/java/com/baeldung/snakeyaml/model => libraries/src/main/java/com/baeldung/snakeyaml}/Address.java (94%)
 rename {snakeyaml/src/main/java/com/baeldung/snakeyaml/model => libraries/src/main/java/com/baeldung/snakeyaml}/Contact.java (90%)
 rename {snakeyaml/src/main/java/com/baeldung/snakeyaml/model => libraries/src/main/java/com/baeldung/snakeyaml}/Customer.java (79%)
 rename {snakeyaml => libraries}/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java (66%)
 rename {snakeyaml => libraries}/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java (88%)
 rename {snakeyaml/src/test/resources => libraries/src/test/resources/yaml}/customer.yaml (100%)
 rename {snakeyaml/src/test/resources => libraries/src/test/resources/yaml}/customer_with_contact_details.yaml (100%)
 rename {snakeyaml/src/test/resources => libraries/src/test/resources/yaml}/customer_with_contact_details_and_address.yaml (70%)
 rename {snakeyaml/src/test/resources => libraries/src/test/resources/yaml}/customer_with_contact_details_and_tags.yaml (100%)
 create mode 100644 libraries/src/test/resources/yaml/customer_with_type.yaml
 rename {snakeyaml/src/test/resources => libraries/src/test/resources/yaml}/customers.yaml (100%)
 delete mode 100644 snakeyaml/pom.xml
 delete mode 100644 snakeyaml/src/test/resources/customer_with_type.yaml

diff --git a/libraries/.gitignore b/libraries/.gitignore
index ac45fafa62..e594daf27a 100644
--- a/libraries/.gitignore
+++ b/libraries/.gitignore
@@ -6,3 +6,4 @@
 
 # Packaged files #
 *.jar
+/bin/
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 163f5872ce..a9b8f45c52 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -771,6 +771,12 @@
             <version>${hamcrest-all.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>            
+        </dependency>
+        
 
     </dependencies>
 
@@ -909,6 +915,7 @@
     </build>
 
     <properties>
+    	<snakeyaml.version>1.21</snakeyaml.version>
         <googleclient.version>1.23.0</googleclient.version>
         <crdt.version>0.1.0</crdt.version>
         <multiverse.version>0.7.0</multiverse.version>
diff --git a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java b/libraries/src/main/java/com/baeldung/snakeyaml/Address.java
similarity index 94%
rename from snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java
rename to libraries/src/main/java/com/baeldung/snakeyaml/Address.java
index 1e0174df56..83c327a4ed 100644
--- a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java
+++ b/libraries/src/main/java/com/baeldung/snakeyaml/Address.java
@@ -1,4 +1,4 @@
-package com.baeldung.snakeyaml.model;
+package com.baeldung.snakeyaml;
 
 public class Address {
     private String line;
diff --git a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java b/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java
similarity index 90%
rename from snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java
rename to libraries/src/main/java/com/baeldung/snakeyaml/Contact.java
index 063564cf43..5559c2c339 100644
--- a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java
+++ b/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java
@@ -1,4 +1,4 @@
-package com.baeldung.snakeyaml.model;
+package com.baeldung.snakeyaml;
 
 public class Contact {
 
diff --git a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java b/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java
similarity index 79%
rename from snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java
rename to libraries/src/main/java/com/baeldung/snakeyaml/Customer.java
index 6ebd70508e..da35976d37 100644
--- a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java
+++ b/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java
@@ -1,4 +1,4 @@
-package com.baeldung.snakeyaml.model;
+package com.baeldung.snakeyaml;
 
 import java.util.List;
 
@@ -9,7 +9,6 @@ public class Customer {
     private Integer age;
     private List<Contact> contactDetails;
     private Address homeAddress;
-    private Address officeAddress;
 
     public String getFirstName() {
         return firstName;
@@ -49,14 +48,6 @@ public class Customer {
 
     public void setHomeAddress(Address homeAddress) {
         this.homeAddress = homeAddress;
-    }
-
-    public Address getOfficeAddress() {
-        return officeAddress;
-    }
-
-    public void setOfficeAddress(Address officeAddress) {
-        this.officeAddress = officeAddress;
-    }
+    }    
 
 }
diff --git a/snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java b/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
similarity index 66%
rename from snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
rename to libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
index be1e19fd51..c1b6c80353 100644
--- a/snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
+++ b/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
@@ -1,5 +1,7 @@
 package com.baeldung.snakeyaml;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.StringWriter;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -8,7 +10,7 @@ import org.junit.Test;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.nodes.Tag;
 
-import com.baeldung.snakeyaml.model.Customer;
+import com.baeldung.snakeyaml.Customer;
 
 public class JavaToYAMLSerializationUnitTest {
 
@@ -22,7 +24,8 @@ public class JavaToYAMLSerializationUnitTest {
         StringWriter writer = new StringWriter();
         yaml.dump(data, writer);
         System.out.println(writer.toString());
-        
+        String expectedYaml = "name: Silenthand Olleander\nrace: Human\ntraits: [ONE_HAND, ONE_EYE]\n";
+        assertEquals(expectedYaml, writer.toString());
     }
 
     @Test
@@ -33,8 +36,9 @@ public class JavaToYAMLSerializationUnitTest {
         customer.setLastName("McDowell");
         Yaml yaml = new Yaml();
         StringWriter writer = new StringWriter();
-        yaml.dump(customer, writer);
-        System.out.println(writer.toString());
+        yaml.dump(customer, writer);        
+        String expectedYaml = "!!com.baeldung.snakeyaml.Customer {age: 45, contactDetails: null, firstName: Greg,\n  homeAddress: null, lastName: McDowell}\n";
+        assertEquals(expectedYaml, writer.toString());
     }
 
     @Test
@@ -44,8 +48,9 @@ public class JavaToYAMLSerializationUnitTest {
         customer.setFirstName("Greg");
         customer.setLastName("McDowell");
         Yaml yaml = new Yaml();
-        yaml.dumpAs(customer, Tag.MAP, null);
         System.out.println(yaml.dumpAs(customer, Tag.MAP, null));
+        String expectedYaml = "{age: 45, contactDetails: null, firstName: Greg, homeAddress: null, lastName: McDowell}\n";
+        assertEquals(expectedYaml, yaml.dumpAs(customer, Tag.MAP, null));
     }
 
 }
diff --git a/snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
similarity index 88%
rename from snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
rename to libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
index 14016f0cca..0b9cd860f9 100644
--- a/snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
+++ b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
@@ -13,8 +13,8 @@ import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
-import com.baeldung.snakeyaml.model.Contact;
-import com.baeldung.snakeyaml.model.Customer;
+import com.baeldung.snakeyaml.Contact;
+import com.baeldung.snakeyaml.Customer;
 
 public class YAMLToJavaDeserialisationUnitTest {
 
@@ -23,7 +23,7 @@ public class YAMLToJavaDeserialisationUnitTest {
         Yaml yaml = new Yaml();
         InputStream inputStream = this.getClass()
             .getClassLoader()
-            .getResourceAsStream("customer.yaml");
+            .getResourceAsStream("yaml/customer.yaml");
         Map<String, Object> obj = yaml.load(inputStream);
         System.out.println(obj);
     }
@@ -33,7 +33,7 @@ public class YAMLToJavaDeserialisationUnitTest {
         Yaml yaml = new Yaml(new Constructor(Customer.class));
         InputStream inputStream = this.getClass()
             .getClassLoader()
-            .getResourceAsStream("customer.yaml");
+            .getResourceAsStream("yaml/customer.yaml");
         Customer customer = yaml.load(inputStream);
         System.out.println(customer);
     }
@@ -43,7 +43,7 @@ public class YAMLToJavaDeserialisationUnitTest {
         Yaml yaml = new Yaml();
         InputStream inputStream = this.getClass()
             .getClassLoader()
-            .getResourceAsStream("customer_with_type.yaml");
+            .getResourceAsStream("yaml/customer_with_type.yaml");
         Customer customer = yaml.load(inputStream);
         System.out.println(customer);
     }
@@ -63,7 +63,7 @@ public class YAMLToJavaDeserialisationUnitTest {
         Yaml yaml = new Yaml(new Constructor(Customer.class));
         InputStream inputStream = this.getClass()
             .getClassLoader()
-            .getResourceAsStream("customer_with_contact_details_and_address.yaml");
+            .getResourceAsStream("yaml/customer_with_contact_details_and_address.yaml");
         Customer customer = yaml.load(inputStream);
         assertNotNull(customer);
         assertEquals("John", customer.getFirstName());
@@ -87,9 +87,6 @@ public class YAMLToJavaDeserialisationUnitTest {
         assertNotNull(customer.getHomeAddress());
         assertEquals("Xyz, DEF Street", customer.getHomeAddress()
             .getLine());
-        assertNotNull(customer.getHomeAddress());
-        assertEquals("Xyz, Office Street", customer.getOfficeAddress()
-            .getLine());
     }
 
     @Test
@@ -101,7 +98,7 @@ public class YAMLToJavaDeserialisationUnitTest {
         Yaml yaml = new Yaml(constructor);
         InputStream inputStream = this.getClass()
             .getClassLoader()
-            .getResourceAsStream("customer_with_contact_details.yaml");
+            .getResourceAsStream("yaml/customer_with_contact_details.yaml");
         Customer customer = yaml.load(inputStream);
         assertNotNull(customer);
         assertEquals("John", customer.getFirstName());
@@ -123,7 +120,7 @@ public class YAMLToJavaDeserialisationUnitTest {
         Yaml yaml = new Yaml(new Constructor(Customer.class));
         InputStream inputStream = this.getClass()
             .getClassLoader()
-            .getResourceAsStream("customers.yaml");
+            .getResourceAsStream("yaml/customers.yaml");
         int count = 0;
         for (Object object : yaml.loadAll(inputStream)) {
             count++;
diff --git a/snakeyaml/src/test/resources/customer.yaml b/libraries/src/test/resources/yaml/customer.yaml
similarity index 100%
rename from snakeyaml/src/test/resources/customer.yaml
rename to libraries/src/test/resources/yaml/customer.yaml
diff --git a/snakeyaml/src/test/resources/customer_with_contact_details.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details.yaml
similarity index 100%
rename from snakeyaml/src/test/resources/customer_with_contact_details.yaml
rename to libraries/src/test/resources/yaml/customer_with_contact_details.yaml
diff --git a/snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml
similarity index 70%
rename from snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml
rename to libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml
index bc73654389..664afe8594 100644
--- a/snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml
+++ b/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml
@@ -11,8 +11,3 @@ homeAddress:
    city: "City Y"
    state: "State Y"
    zip: 345657
-officeAddress:
-   line: "Xyz, Office Street"
-   city: "City Y"
-   state: "State Y"
-   zip: 345657
diff --git a/snakeyaml/src/test/resources/customer_with_contact_details_and_tags.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml
similarity index 100%
rename from snakeyaml/src/test/resources/customer_with_contact_details_and_tags.yaml
rename to libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml
diff --git a/libraries/src/test/resources/yaml/customer_with_type.yaml b/libraries/src/test/resources/yaml/customer_with_type.yaml
new file mode 100644
index 0000000000..6e13c26cea
--- /dev/null
+++ b/libraries/src/test/resources/yaml/customer_with_type.yaml
@@ -0,0 +1,4 @@
+!!com.baeldung.snakeyaml.Customer
+firstName: "John"
+lastName: "Doe"
+age: 20
\ No newline at end of file
diff --git a/snakeyaml/src/test/resources/customers.yaml b/libraries/src/test/resources/yaml/customers.yaml
similarity index 100%
rename from snakeyaml/src/test/resources/customers.yaml
rename to libraries/src/test/resources/yaml/customers.yaml
diff --git a/pom.xml b/pom.xml
index 4aad8d43d6..986119b87f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -549,8 +549,7 @@
 				<module>apache-meecrowave</module>
 				<module>spring-reactive-kotlin</module>
 				<module>jnosql</module>
-				<module>testing-modules/junit-abstract</module>
-				<module>snakeyaml</module>
+				<module>testing-modules/junit-abstract</module>				
 			</modules>
 
 		</profile>
@@ -670,8 +669,7 @@
 				<module>spring-amqp-simple</module>
 				<module>spring-apache-camel</module>
 				<module>spring-batch</module>
-				<module>testing-modules/junit-abstract</module>
-				<module>snakeyaml</module>
+				<module>testing-modules/junit-abstract</module>				
 
 
 				<!-- group 2 - Pass, 11-16 min, 42 test failures, 4,020 KB -->
@@ -1077,8 +1075,7 @@
 				<module>antlr</module>
 				<module>maven-archetype</module>
 				<module>apache-meecrowave</module>
-				<module>testing-modules/junit-abstract</module>
-				<module>snakeyaml</module>
+				<module>testing-modules/junit-abstract</module>				
                 
                 <!-- problematic -->
                 <!-- 
diff --git a/snakeyaml/pom.xml b/snakeyaml/pom.xml
deleted file mode 100644
index 6a339b84a8..0000000000
--- a/snakeyaml/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>snakeyaml</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>snakeyaml</name>
-	<url>http://maven.apache.org</url>
-
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-modules</artifactId>
-		<version>1.0.0-SNAPSHOT</version>		
-	</parent>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.yaml</groupId>
-			<artifactId>snakeyaml</artifactId>
-			<version>1.21</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/snakeyaml/src/test/resources/customer_with_type.yaml b/snakeyaml/src/test/resources/customer_with_type.yaml
deleted file mode 100644
index 287bb7452d..0000000000
--- a/snakeyaml/src/test/resources/customer_with_type.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-!!com.baeldung.snakeyaml.model.Customer
-firstName: "John"
-lastName: "Doe"
-age: 20
\ No newline at end of file