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 01/13] 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 02/13] 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   |  2 +-
 .../src/test/resources/yaml}/customers.yaml   |  0
 pom.xml                                       |  9 ++----
 snakeyaml/pom.xml                             | 29 -------------------
 15 files changed, 34 insertions(+), 70 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%)
 rename {snakeyaml/src/test/resources => libraries/src/test/resources/yaml}/customer_with_type.yaml (50%)
 rename {snakeyaml/src/test/resources => libraries/src/test/resources/yaml}/customers.yaml (100%)
 delete mode 100644 snakeyaml/pom.xml

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/snakeyaml/src/test/resources/customer_with_type.yaml b/libraries/src/test/resources/yaml/customer_with_type.yaml
similarity index 50%
rename from snakeyaml/src/test/resources/customer_with_type.yaml
rename to libraries/src/test/resources/yaml/customer_with_type.yaml
index 287bb7452d..6e13c26cea 100644
--- a/snakeyaml/src/test/resources/customer_with_type.yaml
+++ b/libraries/src/test/resources/yaml/customer_with_type.yaml
@@ -1,4 +1,4 @@
-!!com.baeldung.snakeyaml.model.Customer
+!!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>

From 2ac1ccbbb967d4f6ca050186219480d25f23c443 Mon Sep 17 00:00:00 2001
From: Sandip <sandip.03934@gmail.com>
Date: Mon, 30 Jul 2018 01:52:40 +0530
Subject: [PATCH 03/13] BAEL-1979 Removed the System.out.println() statements
 and converted the assertTrue to assertEquals wherever possible.

---
 .../java/com/baeldung/snakeyaml/Contact.java  |  7 +--
 .../java/com/baeldung/snakeyaml/Customer.java |  6 +--
 .../JavaToYAMLSerializationUnitTest.java      |  2 -
 .../YAMLToJavaDeserialisationUnitTest.java    | 50 ++++++++++---------
 4 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java b/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java
index 5559c2c339..a808747786 100644
--- a/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java
+++ b/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java
@@ -4,7 +4,8 @@ public class Contact {
 
     private String type;
 
-    private Integer number;
+    private int number;
+
 
     public String getType() {
         return type;
@@ -14,11 +15,11 @@ public class Contact {
         this.type = type;
     }
 
-    public Integer getNumber() {
+    public int getNumber() {
         return number;
     }
 
-    public void setNumber(Integer number) {
+    public void setNumber(int number) {
         this.number = number;
     }
 
diff --git a/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java b/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java
index da35976d37..c741f6dc85 100644
--- a/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java
+++ b/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java
@@ -6,7 +6,7 @@ public class Customer {
 
     private String firstName;
     private String lastName;
-    private Integer age;
+    private int age;
     private List<Contact> contactDetails;
     private Address homeAddress;
 
@@ -26,11 +26,11 @@ public class Customer {
         this.lastName = lastName;
     }
 
-    public Integer getAge() {
+    public int getAge() {
         return age;
     }
 
-    public void setAge(Integer age) {
+    public void setAge(int age) {
         this.age = age;
     }
 
diff --git a/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java b/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
index c1b6c80353..f6836f6d56 100644
--- a/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
+++ b/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java
@@ -23,7 +23,6 @@ public class JavaToYAMLSerializationUnitTest {
         Yaml yaml = new Yaml();
         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());
     }
@@ -48,7 +47,6 @@ public class JavaToYAMLSerializationUnitTest {
         customer.setFirstName("Greg");
         customer.setLastName("McDowell");
         Yaml yaml = new Yaml();
-        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/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
index 0b9cd860f9..a0245c0a4d 100644
--- a/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
+++ b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
@@ -1,20 +1,15 @@
 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.Contact;
-import com.baeldung.snakeyaml.Customer;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.Map;
+
+import static org.junit.Assert.*;
 
 public class YAMLToJavaDeserialisationUnitTest {
 
@@ -25,6 +20,9 @@ public class YAMLToJavaDeserialisationUnitTest {
             .getClassLoader()
             .getResourceAsStream("yaml/customer.yaml");
         Map<String, Object> obj = yaml.load(inputStream);
+        assertEquals("John", obj.get("firstName"));
+        assertEquals("Doe", obj.get("lastName"));
+        assertEquals(20, obj.get("age"));
         System.out.println(obj);
     }
 
@@ -35,6 +33,9 @@ public class YAMLToJavaDeserialisationUnitTest {
             .getClassLoader()
             .getResourceAsStream("yaml/customer.yaml");
         Customer customer = yaml.load(inputStream);
+        assertEquals("John", customer.getFirstName());
+        assertEquals("Doe", customer.getLastName());
+        assertEquals(20, customer.getAge());
         System.out.println(customer);
     }
 
@@ -45,6 +46,9 @@ public class YAMLToJavaDeserialisationUnitTest {
             .getClassLoader()
             .getResourceAsStream("yaml/customer_with_type.yaml");
         Customer customer = yaml.load(inputStream);
+        assertEquals("John", customer.getFirstName());
+        assertEquals("Doe", customer.getLastName());
+        assertEquals(20, customer.getAge());
         System.out.println(customer);
     }
 
@@ -53,9 +57,9 @@ public class YAMLToJavaDeserialisationUnitTest {
         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);
+        assertEquals(1, document.size());
+        assertTrue(document.containsKey(3.0d));
+        assertTrue(document.get(3.0d) instanceof Date);
     }
 
     @Test
@@ -68,22 +72,21 @@ public class YAMLToJavaDeserialisationUnitTest {
         assertNotNull(customer);
         assertEquals("John", customer.getFirstName());
         assertEquals("Doe", customer.getLastName());
-        assertTrue(customer.getAge() == 31);
+        assertEquals(31, customer.getAge());
         assertNotNull(customer.getContactDetails());
-        assertTrue(customer.getContactDetails()
-            .size() == 2);
+        assertEquals(2, customer.getContactDetails().size());
         assertEquals("mobile", customer.getContactDetails()
             .get(0)
             .getType());
-        assertTrue(customer.getContactDetails()
+        assertEquals(123456789,customer.getContactDetails()
             .get(0)
-            .getNumber() == 123456789);
+            .getNumber());
         assertEquals("landline", customer.getContactDetails()
             .get(1)
             .getType());
-        assertTrue(customer.getContactDetails()
+        assertEquals(456786868, customer.getContactDetails()
             .get(1)
-            .getNumber() == 456786868);
+            .getNumber());
         assertNotNull(customer.getHomeAddress());
         assertEquals("Xyz, DEF Street", customer.getHomeAddress()
             .getLine());
@@ -103,10 +106,9 @@ public class YAMLToJavaDeserialisationUnitTest {
         assertNotNull(customer);
         assertEquals("John", customer.getFirstName());
         assertEquals("Doe", customer.getLastName());
-        assertTrue(customer.getAge() == 31);
+        assertEquals(31, customer.getAge());
         assertNotNull(customer.getContactDetails());
-        assertTrue(customer.getContactDetails()
-            .size() == 2);
+        assertEquals(2, customer.getContactDetails().size());
         assertEquals("mobile", customer.getContactDetails()
             .get(0)
             .getType());
@@ -126,7 +128,7 @@ public class YAMLToJavaDeserialisationUnitTest {
             count++;
             assertTrue(object instanceof Customer);
         }
-        assertTrue(count == 2);
+        assertEquals(2, count);
     }
 
 }

From 0b85752f23bea60d8bc0603eafd4f6e2c2856c77 Mon Sep 17 00:00:00 2001
From: Predrag Maric <predrag.maric@mangora.org>
Date: Mon, 30 Jul 2018 14:44:24 +0200
Subject: [PATCH 04/13] BAEL-1979 Removed println statements, small formatting
 fix in pom.xml

---
 libraries/pom.xml                                              | 2 +-
 .../baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 4c9227511e..b19a005d94 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -922,7 +922,7 @@
     </build>
 
     <properties>
-    	<snakeyaml.version>1.21</snakeyaml.version>
+        <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/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
index a0245c0a4d..56cd3c2b2e 100644
--- a/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
+++ b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java
@@ -23,7 +23,6 @@ public class YAMLToJavaDeserialisationUnitTest {
         assertEquals("John", obj.get("firstName"));
         assertEquals("Doe", obj.get("lastName"));
         assertEquals(20, obj.get("age"));
-        System.out.println(obj);
     }
 
     @Test
@@ -36,7 +35,6 @@ public class YAMLToJavaDeserialisationUnitTest {
         assertEquals("John", customer.getFirstName());
         assertEquals("Doe", customer.getLastName());
         assertEquals(20, customer.getAge());
-        System.out.println(customer);
     }
 
     @Test
@@ -49,7 +47,6 @@ public class YAMLToJavaDeserialisationUnitTest {
         assertEquals("John", customer.getFirstName());
         assertEquals("Doe", customer.getLastName());
         assertEquals(20, customer.getAge());
-        System.out.println(customer);
     }
 
     @Test

From f0d3a4ed4a4d0a0854b600584d937adda9f7d781 Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Tue, 14 Aug 2018 11:29:29 +0530
Subject: [PATCH 05/13] BAEL-1466 Added a new module for apache-geode

---
 apache-geode/pom.xml                          |  46 ++++++
 .../java/com/baeldung/geode/Customer.java     |  78 ++++++++++
 .../java/com/baeldung/geode/CustomerKey.java  |  57 +++++++
 .../baeldung/geode/functions/PrimeNumber.java |  49 ++++++
 .../geode/GeodeSamplesIntegrationTest.java    | 144 ++++++++++++++++++
 5 files changed, 374 insertions(+)
 create mode 100644 apache-geode/pom.xml
 create mode 100644 apache-geode/src/main/java/com/baeldung/geode/Customer.java
 create mode 100644 apache-geode/src/main/java/com/baeldung/geode/CustomerKey.java
 create mode 100644 apache-geode/src/main/java/com/baeldung/geode/functions/PrimeNumber.java
 create mode 100644 apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java

diff --git a/apache-geode/pom.xml b/apache-geode/pom.xml
new file mode 100644
index 0000000000..a3f6604ac4
--- /dev/null
+++ b/apache-geode/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>apache-geode</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    
+    <properties>
+        <geode.core>1.6.0</geode.core>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geode</groupId>
+            <artifactId>geode-core</artifactId>
+            <version>${geode.core}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
+    
+</project>
\ No newline at end of file
diff --git a/apache-geode/src/main/java/com/baeldung/geode/Customer.java b/apache-geode/src/main/java/com/baeldung/geode/Customer.java
new file mode 100644
index 0000000000..82ee5ecaeb
--- /dev/null
+++ b/apache-geode/src/main/java/com/baeldung/geode/Customer.java
@@ -0,0 +1,78 @@
+package com.baeldung.geode;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class Customer implements Serializable {
+
+    private static final long serialVersionUID = -7482516011038799900L;
+
+    private CustomerKey key;
+    private String firstName;
+    private String lastName;
+    private Integer age;
+
+    public Customer() {
+    }
+
+    public Customer(String firstName, String lastName, int age) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.age = age;
+    }
+
+    public Customer(CustomerKey key, String firstName, String lastName, int age) {
+        this(firstName, lastName, age);
+        this.key = key;
+    }
+
+    // setters and getters
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return "Customer{" + "firstName='" + firstName + '\'' + ", lastName='" + lastName + '\'' + ", age=" + age + '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Customer customer = (Customer) o;
+        return Objects.equals(firstName, customer.firstName) && Objects.equals(lastName, customer.lastName) && Objects.equals(age, customer.age);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(firstName, lastName, age);
+    }
+}
diff --git a/apache-geode/src/main/java/com/baeldung/geode/CustomerKey.java b/apache-geode/src/main/java/com/baeldung/geode/CustomerKey.java
new file mode 100644
index 0000000000..bfa64870c0
--- /dev/null
+++ b/apache-geode/src/main/java/com/baeldung/geode/CustomerKey.java
@@ -0,0 +1,57 @@
+package com.baeldung.geode;
+
+import java.io.Serializable;
+
+public class CustomerKey implements Serializable {
+
+    private static final long serialVersionUID = -3529253035303792458L;
+    private long id;
+    private String country;
+
+    public CustomerKey(long id) {
+        this.id = id;
+        this.country = "USA";
+    }
+
+    public CustomerKey(long id, String country) {
+        this.id = id;
+        this.country = country;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+
+        CustomerKey that = (CustomerKey) o;
+
+        if (id != that.id)
+            return false;
+        return country != null ? country.equals(that.country) : that.country == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) (id ^ (id >>> 32));
+        result = 31 * result + (country != null ? country.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/apache-geode/src/main/java/com/baeldung/geode/functions/PrimeNumber.java b/apache-geode/src/main/java/com/baeldung/geode/functions/PrimeNumber.java
new file mode 100644
index 0000000000..411816348a
--- /dev/null
+++ b/apache-geode/src/main/java/com/baeldung/geode/functions/PrimeNumber.java
@@ -0,0 +1,49 @@
+package com.baeldung.geode.functions;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.RegionFunctionContext;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+public class PrimeNumber implements Function {
+
+    public static final String ID = PrimeNumber.class.getSimpleName();
+
+    @Override
+    public void execute(FunctionContext context) {
+        RegionFunctionContext regionContext = (RegionFunctionContext) context;
+        Region<Integer, String> region = regionContext.getDataSet();
+
+        List<Integer> primes = new ArrayList<>();
+        Set<Integer> keys = region.keySet();
+        for (Integer key : keys) {
+            if (isPrime(key)) {
+                primes.add(key);
+            }
+        }
+        Collections.sort(primes);
+
+        context.getResultSender()
+            .lastResult(primes);
+    }
+
+    @Override
+    public String getId() {
+        return ID;
+    }
+
+    private boolean isPrime(int number) {
+        int limit = (int) Math.floor(Math.sqrt(number));
+        for (int divisor = 2; divisor <= limit; ++divisor) {
+            if (number % divisor == 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
new file mode 100644
index 0000000000..5445772259
--- /dev/null
+++ b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
@@ -0,0 +1,144 @@
+package com.baeldung.geode;
+
+import com.baeldung.geode.functions.PrimeNumber;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.execute.Execution;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.cache.query.*;
+import org.junit.Test;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class GeodeSamplesIntegrationTest {
+
+    @Test
+    public void whenSendMessageToRegion_thenMessageSavedSuccessfully() {
+        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
+            .create();
+        Region<String, String> region = cache.<String, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung");
+
+        region.put("1", "Hello");
+        region.put("2", "Baeldung");
+
+        assertEquals("Hello", region.get("1"));
+        assertEquals("Baeldung", region.get("2"));
+
+        cache.close();
+    }
+
+    @Test
+    public void whenPutMultipleValuesAtOnce_thenValuesSavedSuccessfully() {
+        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
+            .create();
+        Region<String, String> region = cache.<String, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung");
+
+        Map<String, String> values = IntStream.rangeClosed(1, 5)
+            .mapToObj(String::valueOf)
+            .collect(Collectors.toMap(Function.identity(), i -> "value" + i));
+
+        region.putAll(values);
+
+        IntStream.rangeClosed(1, 5)
+            .mapToObj(String::valueOf)
+            .forEach(e -> {
+                assertEquals("value".concat(e), region.get(e));
+            });
+        cache.close();
+    }
+
+    @Test
+    public void whenSaveCustomerDataOnPartitionedRegion_thenDataSavedCorrectly() {
+        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
+            .create();
+        Region<Integer, Customer> region = cache.<Integer, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung-partition");
+
+        Customer customer1 = new Customer(new CustomerKey(1l), "Gheorge", "Manuc", 36);
+        Customer customer2 = new Customer(new CustomerKey(2l), "Allan", "McDowell", 43);
+        Customer customer3 = new Customer(new CustomerKey(3l), "Alan", "McClean", 23);
+        Customer customer4 = new Customer(new CustomerKey(4l), "Allan", "Donald", 46);
+
+        Map<Integer, Customer> customerData = new HashMap<>();
+        customerData.put(1, customer1);
+        customerData.put(2, customer2);
+        customerData.put(3, customer3);
+        customerData.put(4, customer4);
+
+        region.putAll(customerData);
+        // assert the size on the cache server.
+        assertEquals(4, region.sizeOnServer());
+        cache.close();
+    }
+
+    @Test
+    public void whenFindACustomerUsingOQL_thenCorrectCustomerObject() throws NameResolutionException, TypeMismatchException, QueryInvocationTargetException, FunctionDomainException {
+        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
+            .create();
+        Region<Integer, Customer> region = cache.<Integer, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung-oql");
+
+        Customer customer1 = new Customer("Gheorge", "Manuc", 36);
+        Customer customer2 = new Customer("Allan", "McDowell", 43);
+        Customer customer3 = new Customer("Alan", "McClean", 23);
+        Customer customer4 = new Customer("Allan", "Donald", 46);
+
+        Map<Integer, Customer> customerData = new HashMap<>();
+        customerData.put(1, customer1);
+        customerData.put(2, customer2);
+        customerData.put(3, customer3);
+        customerData.put(4, customer4);
+
+        region.putAll(customerData);
+        // assert the size on the cache server.
+        assertEquals(4, region.sizeOnServer());
+
+        QueryService queryService = cache.getQueryService();
+        String query = "select * from /baeldung-oql c where c.firstName = 'Allan'";
+        SelectResults<Customer> queryResults = (SelectResults<Customer>) queryService.newQuery(query)
+            .execute();
+        assertEquals(2, queryResults.size());
+
+        cache.close();
+
+    }
+
+    @Test
+    public void whenExecutePrimeNumberFunction_thenReturnOnlyPrimeNumbers() {
+        // connect to the locator using default port 10334
+        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
+            .create();
+
+        // create a local region that matches the server region
+        Region<Integer, String> region = cache.<Integer, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung-function");
+
+        Execution execution = FunctionService.onRegion(region);
+
+        IntStream.rangeClosed(1, 5)
+            .forEach(i -> region.put(i, String.valueOf(i)));
+
+        ResultCollector<Integer, List> results = execution.execute(PrimeNumber.ID);
+        Set<Integer> primes = new HashSet<>();
+        List resultList = results.getResult();
+        assertNotNull(resultList);
+        assertEquals(1, resultList.size());
+
+        primes.addAll((List<? extends Integer>) resultList.iterator()
+            .next());
+        assertEquals(4, primes.size());
+        cache.close();
+    }
+
+}

From b6816bdcdd66540f483403a273f2862e1820fb57 Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Fri, 24 Aug 2018 23:50:40 +0530
Subject: [PATCH 06/13] BAEL-1466 Updated the Integration Tests.

---
 .../geode/GeodeSamplesIntegrationTest.java    | 112 ++++++++++--------
 1 file changed, 64 insertions(+), 48 deletions(-)

diff --git a/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
index 5445772259..1eb71671a1 100644
--- a/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
+++ b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
@@ -9,62 +9,93 @@ import org.apache.geode.cache.execute.Execution;
 import org.apache.geode.cache.execute.FunctionService;
 import org.apache.geode.cache.execute.ResultCollector;
 import org.apache.geode.cache.query.*;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.*;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 public class GeodeSamplesIntegrationTest {
 
+    ClientCache cache = null;
+    Region<String, String> region = null;
+    Region<Integer, Customer> partitionedRegion = null;
+    Region<Integer, Customer> queryRegion = null;
+    Region<Integer, String> functionRegion = null;
+    Region<CustomerKey, Customer> customKeyRegion = null;
+
+    @Before
+    public void connect() {
+        this.cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
+            .create();
+        this.region = this.cache.<String, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung");
+        this.partitionedRegion = this.cache.<Integer, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung-partition");
+        this.queryRegion = this.cache.<Integer, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung-oql");
+        this.functionRegion = this.cache.<Integer, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung-function");
+        this.customKeyRegion = this.cache.<CustomerKey, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung-custom");
+    }
+
+    @After
+    public void cleanup() {
+        this.cache.close();
+    }
+
     @Test
     public void whenSendMessageToRegion_thenMessageSavedSuccessfully() {
-        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
-            .create();
-        Region<String, String> region = cache.<String, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
-            .create("baeldung");
 
-        region.put("1", "Hello");
-        region.put("2", "Baeldung");
+        this.region.put("1", "Hello");
+        this.region.put("2", "Baeldung");
 
         assertEquals("Hello", region.get("1"));
         assertEquals("Baeldung", region.get("2"));
 
-        cache.close();
     }
 
     @Test
     public void whenPutMultipleValuesAtOnce_thenValuesSavedSuccessfully() {
-        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
-            .create();
-        Region<String, String> region = cache.<String, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
-            .create("baeldung");
 
-        Map<String, String> values = IntStream.rangeClosed(1, 5)
-            .mapToObj(String::valueOf)
-            .collect(Collectors.toMap(Function.identity(), i -> "value" + i));
+        Supplier<Stream<String>> keys = () -> Stream.of("A", "B", "C", "D", "E");
+        Map<String, String> values = keys.get()
+            .collect(Collectors.toMap(Function.identity(), String::toLowerCase));
 
-        region.putAll(values);
+        this.region.putAll(values);
+
+        keys.get()
+            .forEach(k -> assertEquals(k.toLowerCase(), this.region.get(k)));
+
+    }
+
+    @Test
+    public void whenPutCustomKey_thenValuesSavedSuccessfully() {
+        CustomerKey key = new CustomerKey(123);
+        Customer customer = new Customer(key, "William", "Russell", 35);
+
+        Map<CustomerKey, Customer> customerInfo = new HashMap<>();
+        customerInfo.put(key, customer);
+
+        this.customKeyRegion.putAll(customerInfo);
+
+        Customer storedCustomer = this.customKeyRegion.get(key);
+        assertEquals("William", storedCustomer.getFirstName());
+        assertEquals("Russell", storedCustomer.getLastName());
 
-        IntStream.rangeClosed(1, 5)
-            .mapToObj(String::valueOf)
-            .forEach(e -> {
-                assertEquals("value".concat(e), region.get(e));
-            });
-        cache.close();
     }
 
     @Test
     public void whenSaveCustomerDataOnPartitionedRegion_thenDataSavedCorrectly() {
-        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
-            .create();
-        Region<Integer, Customer> region = cache.<Integer, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
-            .create("baeldung-partition");
-
         Customer customer1 = new Customer(new CustomerKey(1l), "Gheorge", "Manuc", 36);
         Customer customer2 = new Customer(new CustomerKey(2l), "Allan", "McDowell", 43);
         Customer customer3 = new Customer(new CustomerKey(3l), "Alan", "McClean", 23);
@@ -76,18 +107,13 @@ public class GeodeSamplesIntegrationTest {
         customerData.put(3, customer3);
         customerData.put(4, customer4);
 
-        region.putAll(customerData);
+        this.partitionedRegion.putAll(customerData);
         // assert the size on the cache server.
-        assertEquals(4, region.sizeOnServer());
-        cache.close();
+        assertEquals(4, this.partitionedRegion.sizeOnServer());
     }
 
     @Test
     public void whenFindACustomerUsingOQL_thenCorrectCustomerObject() throws NameResolutionException, TypeMismatchException, QueryInvocationTargetException, FunctionDomainException {
-        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
-            .create();
-        Region<Integer, Customer> region = cache.<Integer, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
-            .create("baeldung-oql");
 
         Customer customer1 = new Customer("Gheorge", "Manuc", 36);
         Customer customer2 = new Customer("Allan", "McDowell", 43);
@@ -100,34 +126,25 @@ public class GeodeSamplesIntegrationTest {
         customerData.put(3, customer3);
         customerData.put(4, customer4);
 
-        region.putAll(customerData);
+        this.queryRegion.putAll(customerData);
         // assert the size on the cache server.
-        assertEquals(4, region.sizeOnServer());
+        assertEquals(4, this.queryRegion.sizeOnServer());
 
-        QueryService queryService = cache.getQueryService();
+        QueryService queryService = this.cache.getQueryService();
         String query = "select * from /baeldung-oql c where c.firstName = 'Allan'";
         SelectResults<Customer> queryResults = (SelectResults<Customer>) queryService.newQuery(query)
             .execute();
         assertEquals(2, queryResults.size());
 
-        cache.close();
-
     }
 
     @Test
     public void whenExecutePrimeNumberFunction_thenReturnOnlyPrimeNumbers() {
-        // connect to the locator using default port 10334
-        ClientCache cache = new ClientCacheFactory().addPoolLocator("localhost", 10334)
-            .create();
 
-        // create a local region that matches the server region
-        Region<Integer, String> region = cache.<Integer, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
-            .create("baeldung-function");
-
-        Execution execution = FunctionService.onRegion(region);
+        Execution execution = FunctionService.onRegion(this.functionRegion);
 
         IntStream.rangeClosed(1, 5)
-            .forEach(i -> region.put(i, String.valueOf(i)));
+            .forEach(i -> this.functionRegion.put(i, String.valueOf(i)));
 
         ResultCollector<Integer, List> results = execution.execute(PrimeNumber.ID);
         Set<Integer> primes = new HashSet<>();
@@ -138,7 +155,6 @@ public class GeodeSamplesIntegrationTest {
         primes.addAll((List<? extends Integer>) resultList.iterator()
             .next());
         assertEquals(4, primes.size());
-        cache.close();
     }
 
 }

From eafbe5d88a73dc32c36a00bbf46a345b34ade240 Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Mon, 3 Sep 2018 22:44:11 +0530
Subject: [PATCH 07/13] BAEL-1466 Updated the Integration Tests.

---
 .../geode/functions/CustomerWithMaxAge.java   | 39 +++++++++++++++++++
 .../geode/GeodeSamplesIntegrationTest.java    | 14 +++++++
 2 files changed, 53 insertions(+)
 create mode 100644 apache-geode/src/main/java/com/baeldung/geode/functions/CustomerWithMaxAge.java

diff --git a/apache-geode/src/main/java/com/baeldung/geode/functions/CustomerWithMaxAge.java b/apache-geode/src/main/java/com/baeldung/geode/functions/CustomerWithMaxAge.java
new file mode 100644
index 0000000000..ef729a1ac2
--- /dev/null
+++ b/apache-geode/src/main/java/com/baeldung/geode/functions/CustomerWithMaxAge.java
@@ -0,0 +1,39 @@
+package com.baeldung.geode.functions;
+
+import com.baeldung.geode.Customer;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.RegionFunctionContext;
+
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Optional;
+
+public class CustomerWithMaxAge implements Function<Customer> {
+
+    public static final String ID = CustomerWithMaxAge.class.getSimpleName();
+
+    private static final long serialVersionUID = -6023734758827953742L;
+
+    @Override
+    public void execute(FunctionContext<Customer> context) {
+        RegionFunctionContext regionContext = (RegionFunctionContext) context;
+        Region<Integer, Customer> region = regionContext.getDataSet();
+
+        Comparator<Customer> ageComparator = Comparator.comparing(Customer::getAge);
+
+        Optional<Customer> customer = region.entrySet()
+            .stream()
+            .map(Map.Entry::getValue)
+            .max(ageComparator);
+
+        customer.ifPresent(c -> context.getResultSender()
+            .lastResult(c));
+    }
+
+    @Override
+    public String getId() {
+        return ID;
+    }
+}
diff --git a/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
index 1eb71671a1..9c47d099da 100644
--- a/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
+++ b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.geode;
 
+import com.baeldung.geode.functions.CustomerWithMaxAge;
 import com.baeldung.geode.functions.PrimeNumber;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.ClientCache;
@@ -138,6 +139,19 @@ public class GeodeSamplesIntegrationTest {
 
     }
 
+    @Test
+    public void whenExecuteFindEldestCustomerFunction_thenReturnTheEldestCustomer() {
+        Execution execution = FunctionService.onRegion(this.queryRegion);
+
+        ResultCollector<Customer, Customer> result = execution.execute(CustomerWithMaxAge.ID);
+        List<Customer> resultList = (List<Customer>) result.getResult();
+        assertNotNull(resultList);
+        assertEquals(1, resultList.size());
+
+        Customer customer = resultList.get(0);
+        assertEquals(Integer.valueOf(46), customer.getAge());
+    }
+
     @Test
     public void whenExecutePrimeNumberFunction_thenReturnOnlyPrimeNumbers() {
 

From d152facd1dfbdfdb76d9c48d28f66283ebc6bd72 Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Mon, 10 Sep 2018 23:25:57 +0530
Subject: [PATCH 08/13] BAEL-1466 Updated the Integration Tests.

---
 .../geode/functions/UpperCaseNames.java       | 34 +++++++
 .../geode/GeodeSamplesIntegrationTest.java    | 94 ++++---------------
 2 files changed, 51 insertions(+), 77 deletions(-)
 create mode 100644 apache-geode/src/main/java/com/baeldung/geode/functions/UpperCaseNames.java

diff --git a/apache-geode/src/main/java/com/baeldung/geode/functions/UpperCaseNames.java b/apache-geode/src/main/java/com/baeldung/geode/functions/UpperCaseNames.java
new file mode 100644
index 0000000000..5ff8e53da8
--- /dev/null
+++ b/apache-geode/src/main/java/com/baeldung/geode/functions/UpperCaseNames.java
@@ -0,0 +1,34 @@
+package com.baeldung.geode.functions;
+
+import com.baeldung.geode.Customer;
+import com.baeldung.geode.CustomerKey;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.RegionFunctionContext;
+
+import java.util.Map;
+
+public class UpperCaseNames implements Function<Boolean> {
+    private static final long serialVersionUID = -8946294032165677602L;
+
+    @Override
+    public void execute(FunctionContext<Boolean> context) {
+        RegionFunctionContext regionContext = (RegionFunctionContext) context;
+        Region<CustomerKey, Customer> region = regionContext.getDataSet();
+
+        for (Map.Entry<CustomerKey, Customer> entry : region.entrySet()) {
+            Customer customer = entry.getValue();
+            customer.setFirstName(customer.getFirstName()
+                .toUpperCase());
+        }
+
+        context.getResultSender()
+            .lastResult(true);
+    }
+
+    @Override
+    public String getId() {
+        return getClass().getName();
+    }
+}
diff --git a/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
index 9c47d099da..eb9affde8e 100644
--- a/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
+++ b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
@@ -2,6 +2,7 @@ package com.baeldung.geode;
 
 import com.baeldung.geode.functions.CustomerWithMaxAge;
 import com.baeldung.geode.functions.PrimeNumber;
+import com.baeldung.geode.functions.UpperCaseNames;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.client.ClientCacheFactory;
@@ -28,10 +29,8 @@ public class GeodeSamplesIntegrationTest {
 
     ClientCache cache = null;
     Region<String, String> region = null;
-    Region<Integer, Customer> partitionedRegion = null;
     Region<Integer, Customer> queryRegion = null;
-    Region<Integer, String> functionRegion = null;
-    Region<CustomerKey, Customer> customKeyRegion = null;
+    Region<CustomerKey, Customer> customerRegion = null;
 
     @Before
     public void connect() {
@@ -39,14 +38,8 @@ public class GeodeSamplesIntegrationTest {
             .create();
         this.region = this.cache.<String, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
             .create("baeldung");
-        this.partitionedRegion = this.cache.<Integer, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
-            .create("baeldung-partition");
-        this.queryRegion = this.cache.<Integer, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
-            .create("baeldung-oql");
-        this.functionRegion = this.cache.<Integer, String> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
-            .create("baeldung-function");
-        this.customKeyRegion = this.cache.<CustomerKey, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
-            .create("baeldung-custom");
+        this.customerRegion = this.cache.<CustomerKey, Customer> createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+            .create("baeldung-customers");
     }
 
     @After
@@ -87,88 +80,35 @@ public class GeodeSamplesIntegrationTest {
         Map<CustomerKey, Customer> customerInfo = new HashMap<>();
         customerInfo.put(key, customer);
 
-        this.customKeyRegion.putAll(customerInfo);
+        this.customerRegion.putAll(customerInfo);
 
-        Customer storedCustomer = this.customKeyRegion.get(key);
+        Customer storedCustomer = this.customerRegion.get(key);
         assertEquals("William", storedCustomer.getFirstName());
         assertEquals("Russell", storedCustomer.getLastName());
 
     }
 
-    @Test
-    public void whenSaveCustomerDataOnPartitionedRegion_thenDataSavedCorrectly() {
-        Customer customer1 = new Customer(new CustomerKey(1l), "Gheorge", "Manuc", 36);
-        Customer customer2 = new Customer(new CustomerKey(2l), "Allan", "McDowell", 43);
-        Customer customer3 = new Customer(new CustomerKey(3l), "Alan", "McClean", 23);
-        Customer customer4 = new Customer(new CustomerKey(4l), "Allan", "Donald", 46);
-
-        Map<Integer, Customer> customerData = new HashMap<>();
-        customerData.put(1, customer1);
-        customerData.put(2, customer2);
-        customerData.put(3, customer3);
-        customerData.put(4, customer4);
-
-        this.partitionedRegion.putAll(customerData);
-        // assert the size on the cache server.
-        assertEquals(4, this.partitionedRegion.sizeOnServer());
-    }
-
     @Test
     public void whenFindACustomerUsingOQL_thenCorrectCustomerObject() throws NameResolutionException, TypeMismatchException, QueryInvocationTargetException, FunctionDomainException {
 
-        Customer customer1 = new Customer("Gheorge", "Manuc", 36);
-        Customer customer2 = new Customer("Allan", "McDowell", 43);
-        Customer customer3 = new Customer("Alan", "McClean", 23);
-        Customer customer4 = new Customer("Allan", "Donald", 46);
-
-        Map<Integer, Customer> customerData = new HashMap<>();
-        customerData.put(1, customer1);
-        customerData.put(2, customer2);
-        customerData.put(3, customer3);
-        customerData.put(4, customer4);
-
-        this.queryRegion.putAll(customerData);
-        // assert the size on the cache server.
-        assertEquals(4, this.queryRegion.sizeOnServer());
+        Map<CustomerKey, Customer> data = new HashMap<>();
+        data.put(new CustomerKey(1), new Customer("Gheorge", "Manuc", 36));
+        data.put(new CustomerKey(2), new Customer("Allan", "McDowell", 43));
+        this.customerRegion.putAll(data);
 
         QueryService queryService = this.cache.getQueryService();
-        String query = "select * from /baeldung-oql c where c.firstName = 'Allan'";
+        String query = "select * from /baeldung-customers c where c.firstName = 'Allan'";
         SelectResults<Customer> queryResults = (SelectResults<Customer>) queryService.newQuery(query)
             .execute();
-        assertEquals(2, queryResults.size());
+        assertEquals(1, queryResults.size());
 
     }
 
     @Test
-    public void whenExecuteFindEldestCustomerFunction_thenReturnTheEldestCustomer() {
-        Execution execution = FunctionService.onRegion(this.queryRegion);
-
-        ResultCollector<Customer, Customer> result = execution.execute(CustomerWithMaxAge.ID);
-        List<Customer> resultList = (List<Customer>) result.getResult();
-        assertNotNull(resultList);
-        assertEquals(1, resultList.size());
-
-        Customer customer = resultList.get(0);
-        assertEquals(Integer.valueOf(46), customer.getAge());
+    public void whenExecuteUppercaseNames_thenCustomerNamesAreUppercased() {
+        Execution execution = FunctionService.onRegion(this.customerRegion);
+        execution.execute(UpperCaseNames.class.getName());
+        Customer customer = this.customerRegion.get(new CustomerKey(1));
+        assertEquals("GHEORGE", customer.getFirstName());
     }
-
-    @Test
-    public void whenExecutePrimeNumberFunction_thenReturnOnlyPrimeNumbers() {
-
-        Execution execution = FunctionService.onRegion(this.functionRegion);
-
-        IntStream.rangeClosed(1, 5)
-            .forEach(i -> this.functionRegion.put(i, String.valueOf(i)));
-
-        ResultCollector<Integer, List> results = execution.execute(PrimeNumber.ID);
-        Set<Integer> primes = new HashSet<>();
-        List resultList = results.getResult();
-        assertNotNull(resultList);
-        assertEquals(1, resultList.size());
-
-        primes.addAll((List<? extends Integer>) resultList.iterator()
-            .next());
-        assertEquals(4, primes.size());
-    }
-
 }

From af526099b5cebacdaf47235ff24d0dcdd056b195 Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Mon, 1 Oct 2018 11:01:14 +0530
Subject: [PATCH 09/13] BAEL-1466 Removed the Unnecessary code.

---
 .../geode/functions/CustomerWithMaxAge.java   | 39 ---------------
 .../baeldung/geode/functions/PrimeNumber.java | 49 -------------------
 .../geode/GeodeSamplesIntegrationTest.java    |  8 +--
 3 files changed, 2 insertions(+), 94 deletions(-)
 delete mode 100644 apache-geode/src/main/java/com/baeldung/geode/functions/CustomerWithMaxAge.java
 delete mode 100644 apache-geode/src/main/java/com/baeldung/geode/functions/PrimeNumber.java

diff --git a/apache-geode/src/main/java/com/baeldung/geode/functions/CustomerWithMaxAge.java b/apache-geode/src/main/java/com/baeldung/geode/functions/CustomerWithMaxAge.java
deleted file mode 100644
index ef729a1ac2..0000000000
--- a/apache-geode/src/main/java/com/baeldung/geode/functions/CustomerWithMaxAge.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.baeldung.geode.functions;
-
-import com.baeldung.geode.Customer;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.execute.RegionFunctionContext;
-
-import java.util.Comparator;
-import java.util.Map;
-import java.util.Optional;
-
-public class CustomerWithMaxAge implements Function<Customer> {
-
-    public static final String ID = CustomerWithMaxAge.class.getSimpleName();
-
-    private static final long serialVersionUID = -6023734758827953742L;
-
-    @Override
-    public void execute(FunctionContext<Customer> context) {
-        RegionFunctionContext regionContext = (RegionFunctionContext) context;
-        Region<Integer, Customer> region = regionContext.getDataSet();
-
-        Comparator<Customer> ageComparator = Comparator.comparing(Customer::getAge);
-
-        Optional<Customer> customer = region.entrySet()
-            .stream()
-            .map(Map.Entry::getValue)
-            .max(ageComparator);
-
-        customer.ifPresent(c -> context.getResultSender()
-            .lastResult(c));
-    }
-
-    @Override
-    public String getId() {
-        return ID;
-    }
-}
diff --git a/apache-geode/src/main/java/com/baeldung/geode/functions/PrimeNumber.java b/apache-geode/src/main/java/com/baeldung/geode/functions/PrimeNumber.java
deleted file mode 100644
index 411816348a..0000000000
--- a/apache-geode/src/main/java/com/baeldung/geode/functions/PrimeNumber.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.baeldung.geode.functions;
-
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.execute.RegionFunctionContext;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-public class PrimeNumber implements Function {
-
-    public static final String ID = PrimeNumber.class.getSimpleName();
-
-    @Override
-    public void execute(FunctionContext context) {
-        RegionFunctionContext regionContext = (RegionFunctionContext) context;
-        Region<Integer, String> region = regionContext.getDataSet();
-
-        List<Integer> primes = new ArrayList<>();
-        Set<Integer> keys = region.keySet();
-        for (Integer key : keys) {
-            if (isPrime(key)) {
-                primes.add(key);
-            }
-        }
-        Collections.sort(primes);
-
-        context.getResultSender()
-            .lastResult(primes);
-    }
-
-    @Override
-    public String getId() {
-        return ID;
-    }
-
-    private boolean isPrime(int number) {
-        int limit = (int) Math.floor(Math.sqrt(number));
-        for (int divisor = 2; divisor <= limit; ++divisor) {
-            if (number % divisor == 0) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
diff --git a/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
index eb9affde8e..b96d2c9b6a 100644
--- a/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
+++ b/apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesIntegrationTest.java
@@ -1,7 +1,5 @@
 package com.baeldung.geode;
 
-import com.baeldung.geode.functions.CustomerWithMaxAge;
-import com.baeldung.geode.functions.PrimeNumber;
 import com.baeldung.geode.functions.UpperCaseNames;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.ClientCache;
@@ -9,21 +7,19 @@ import org.apache.geode.cache.client.ClientCacheFactory;
 import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.cache.execute.Execution;
 import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.cache.execute.ResultCollector;
 import org.apache.geode.cache.query.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
 public class GeodeSamplesIntegrationTest {
 

From 2c6635bef2f5ead9c938af231a31b78674a2f924 Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Sun, 21 Oct 2018 23:58:43 +0530
Subject: [PATCH 10/13] BAEL-2262 Added code for demonstration of HTTPS enabled
 Spring Boot Application

---
 spring-security-mvc-boot/pom.xml              |   6 +-
 .../baeldung/ssl/HttpsEnabledApplication.java |  14 ++++
 .../java/org/baeldung/ssl/SecurityConfig.java |  36 ++++++++++
 .../org/baeldung/ssl/WelcomeController.java   |  15 ++++
 .../main/resources/application-ssl.properties |  20 ++++++
 .../src/main/resources/keystore/baeldung.p12  | Bin 0 -> 2603 bytes
 .../main/resources/templates/ssl/welcome.html |   1 +
 .../web/HttpsApplicationIntegrationTest.java  |  67 ++++++++++++++++++
 8 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ssl/WelcomeController.java
 create mode 100644 spring-security-mvc-boot/src/main/resources/application-ssl.properties
 create mode 100644 spring-security-mvc-boot/src/main/resources/keystore/baeldung.p12
 create mode 100644 spring-security-mvc-boot/src/main/resources/templates/ssl/welcome.html
 create mode 100644 spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java

diff --git a/spring-security-mvc-boot/pom.xml b/spring-security-mvc-boot/pom.xml
index 4090beab99..d2316ddca5 100644
--- a/spring-security-mvc-boot/pom.xml
+++ b/spring-security-mvc-boot/pom.xml
@@ -229,12 +229,16 @@
         <!--<start-class>org.baeldung.multiplelogin.MultipleLoginApplication</start-class> -->
         <!--If you want to run the example with the multiple http elements, 
             comment the tag above and uncomment the one below -->
-        <!--<start-class>org.baeldung.multipleentrypoints.MultipleEntryPointsApplication</start-class> -->
+        <!--<start-class>org.baeldung.multipleentrypoints.MultipleEntryPointsApplication</start-class>-->
+        <!--If you want to run the example with the Https enabled endpoints,
+            comment the tag above and uncomment the one below -->
+       <!-- <start-class>org.baeldung.ssl.HttpsEnabledApplication</start-class> -->
 
         <taglibs-standard.version>1.1.2</taglibs-standard.version>
         <jstl.version>1.2</jstl.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <ehcache-core.version>2.6.11</ehcache-core.version>
+        <java.version>1.8</java.version>
     </properties>
 
 </project>
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java
new file mode 100644
index 0000000000..70fe30abdc
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java
@@ -0,0 +1,14 @@
+package org.baeldung.ssl;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class HttpsEnabledApplication {
+
+    public static void main(String... args) {
+        SpringApplication application = new SpringApplication(HttpsEnabledApplication.class);
+        application.setAdditionalProfiles("ssl");
+        application.run(args);
+    }
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java
new file mode 100644
index 0000000000..98a59b11bb
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java
@@ -0,0 +1,36 @@
+package org.baeldung.ssl;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Override
+    public void configure(AuthenticationManagerBuilder auth) throws Exception {
+
+        auth.inMemoryAuthentication()
+            .withUser("memuser")
+            .password(passwordEncoder().encode("pass"))
+            .roles("USER");
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.httpBasic()
+            .and()
+            .authorizeRequests()
+            .antMatchers("/**")
+            .authenticated();
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/WelcomeController.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/WelcomeController.java
new file mode 100644
index 0000000000..72ad8abb85
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/WelcomeController.java
@@ -0,0 +1,15 @@
+package org.baeldung.ssl;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class WelcomeController {
+
+    @GetMapping("/welcome")
+    public String welcome() {
+        return "ssl/welcome";
+    }
+
+}
diff --git a/spring-security-mvc-boot/src/main/resources/application-ssl.properties b/spring-security-mvc-boot/src/main/resources/application-ssl.properties
new file mode 100644
index 0000000000..090b775d03
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/resources/application-ssl.properties
@@ -0,0 +1,20 @@
+
+http.port=8080
+
+server.port=8443
+
+security.require-ssl=true
+
+# The format used for the keystore
+server.ssl.key-store-type=PKCS12
+# The path to the keystore containing the certificate
+server.ssl.key-store=classpath:keystore/baeldung.p12
+# The password used to generate the certificate
+server.ssl.key-store-password=password
+# The alias mapped to the certificate
+server.ssl.key-alias=baeldung
+
+#trust store location
+trust.store=classpath:keystore/baeldung.p12
+#trust store password
+trust.store.password=password
diff --git a/spring-security-mvc-boot/src/main/resources/keystore/baeldung.p12 b/spring-security-mvc-boot/src/main/resources/keystore/baeldung.p12
new file mode 100644
index 0000000000000000000000000000000000000000..cd8eb284297009e987aa1a1d6b53c48af587776e
GIT binary patch
literal 2603
zcmY+EXEYlM8^;r3M9o+w1hFbbqGHbuyEIm+snTk!hO1FpR7GP|aZ6j;auK8UtQAG7
zV$YhT2qmc9Vcsg&`=0l`_uLQ9dCvL$|IhRBhaz(+vH)38WbiCI7!hqAy~_jS08+@{
zK@b_-cZ|DGWH#S_MQko0G8^s~V~@v<{lx#SxVeBV6f)>1iVWICDY0|?A0I!5f`s^3
zu&dJJ6F~Z?bJm7OhKe^z>^=)CfQ|u?L7h6GkAgI65DwJB{KM&_MXKTI9lIqxhN`1}
z`A*KRClYJWaEY_s^N|voc6A00ThR7qHjQvZX+gn$-BvCy^h*XX<xTNv<}#w&H(PI{
z@*DR=*iQn4s<9Zo29qgc|EW{cR$k3xSU2nRXEUi;_==`Z*4o}mKJg1?$OldwG-}I@
zX{zp53hbfF3B^p_iq^f6qU}o<t-5zW+Xsdp>d@(9FFl&uIA(ye3~t$x%OvdtZ6kea
z?f2mYKd}#kcfPd2Qj@BWsJYAQV?UWEV$3xr?2MMkh<@aOLyI5fS+HWE`b(`(J^ht}
zkR*eWyqT*v5%MaZOvmUzs+mdtjC<oZ*dXgS;ow=oV)AfXBL6cj(PcGmSH{VEu=!%n
zUO%bd?cU1lMBrc=@E?B+;qB6p_@H|F63sY=sCAY0A;~Y?ukzZ~p<(&*%C_6U>G$7e
zk&q|W%V|!jeWjxuJY*Pp@C-pN0z$3MU$4}90$#HPd)>y0K?<6Y7T0Chq0uk<Fobcf
zoV*hA+6t8)-fxHcUeGB89u9_RPuH6@lqIK<Gs!&4dG+RAwY_|-=57MDt23Ic0S-ki
z@9TCH$iY=hZnWsS!1vMTQd9iPK57mtGeVoFn^!_&ERMLLHUTA$8!De9=a^^cWJ&j`
zs(Ueq$dB3>e7wbomuc|C+<LJyVrf%&tKm&WQ}H<7#^Ih(<)BT;=eVQiQ0X1k&KBp5
zvd7|a>P#-z{m`<D?qUw1Z&W-Tihf{;t_|P%gE9Kw6fzj8oXCpy&4o|ypMPtMt{#+^
z1bcQ)C|TN{WMm9!TP)!y`S-`VmBZ~s?k{f_5mwkwCOp=IC}cE*<&_otati9S<=1Fs
zcwjg(W;b^db~dTor+w7y>4c1|1GBI(woGP!Qhl7t_2@B=gTCU}klA|2uD~LA$B|Hf
z9?q|vYv$T8RN`JF0)WU?;jGXd*@?42n)lJLP?O%qsJ(!~)+G!#4|R;Q2h*6mO8XIX
z_P~j+liPKyQLV85WsE0HQ+2F7!T=w$#*rGM@2eK}v3Xvw^kEK*b_!6)K@Oy{^#nzK
zYsydd{?(y@;X^STEU`R(o3B3DQ=gQ{TalEFacTQ$WwZ_3$NLf1A`ue15ske5Gbvrn
zM<Q{StNU(urEjz5L5W*6T5DCeY*x3iPm}vTq~ul;%6h#IS9})WFSWil3G<u>VwpM5
z$^;r{*cZwNsXDeph+W0HFoH3@>rvgs;VhhQP@SeG3Lch{p&iNZS<<GwXe0@r(=eCe
zcY_N;>9O-`k>9`V^$Bvi__Z&f2RwKK4svAZO_QzY-Q+9boQ0)of~0dFq|de&s}-DZ
zouW8d&sajPQE^wEim{+NZ&76^e#4I@Eafg)-eAhQByD>`a|b0n*iCC6(-a?G59!K!
z%WNH4FA|B~`8ZHpAgsSh=iwt@gM6V;X^Lic=Ze*TrTDT{<TyBQ=@vL{Fvd3Lz7Wr2
zb2cieq@jMpuG6GeF{UuNJEQ&DVJh{<cJ-H)Kz??9FEb;}$>_smO{wb$xT3!aB9Ix$
zDHJb#IrUW=`ki_aY+ttWxkRR7JPdppxA8pLHc788pN$m`*!udm1)o>{gp13CMePDg
z>Tgwoh14K0et;X`2EZNQ1Hc0U0lxt}Q8ND&gw=#V5C?BxcWE^ZbsbGD4K!Lq9j$XL
zP=~)u9PGzVH91CSS%84!rTb3;{Fi0f|6^H4*Oa*e3xdCLeiF;!_o?h<e_o~kS~i>v
z0tk<&E}^>5tfsiw#0xZ84jjfMZW)O9@|xuvB=#S<e_og!fU-?dtD_#$Aqc3%)zOA2
zO5bU|KXJg&T)inD-Ccp^ZWW4bagdCG*&t*9k`yO)a`#q2sTXd!A4~5pQcm1{$f+H~
zdKa;sBo0ALVK`pk7_vQrH@w7pLRD@D`@JbAsid8C7WejX`-&us*6cNF!nBsiaCEM~
zN&W8Y7Tnl`OE!~uM`BoWeqyls1aH!yRFrCSor3(0^PsDsKb)bzw_4Pee`J@H=?N)=
zO%INXh&*Ti5(RqAlQ<S0`(alKi*-v-W?vy<ejg+?4$!l%^=^0S1n^m94$pR^l_5A<
zU4#|p^tJ@$()A~d*CB^tUHQ<!_FdkWbL6@wId+y^653xoet=jRRKYK$D)(sSO&@H!
zGOD0)&m||l`I>%RSw(YvpJl=fC<ne^9xk)3(eii=QDOfQ=Vb@$e14-);#BuzH8-RY
z&Vpe<gq`}tJKs4y*>sPWzeWCMix(mA7RsU@{fe{o=X<vD*qh^4!J<p!v$*=2)8N7?
z)!b%*LSrR9oHCrq0VokaD6~rt!CTGVCz^@azFJG~@IQmcKCiYZzrT~|1mmO)C23w5
zwCdrq)P!eVfN94K^7&OnQW84pCNtc`#!~9wwpyhO_hs3Dkl#S;CL_K5*Qv!JrTV$A
zEYp4wc~AIn)ej6F-LE`rA0a`wBUzQn{rXEP2|>y>Pp*}`%+i`nlk|N9x!FxG2)|X4
zEKw@1^=34F&2qQi9j@PN8d^HCdnwkH+SwDtAaoOs>MrPVqq+6GsLWG{iP!raR{296
zn)bo1Ypxj{s&Zq3PJ)r!`Io^PGnnr+kk7{UX+IJgRt#f%T8fU$?%w|Vop*RwEGqa{
z(WG3c0FW|}N4&}s$|j#R<j=LxdAR|Sc!p#odj2U>GGV2oSE>W{OZ@E-b47trP;YC$
z=vPW$1m1o3sc292)J35Y(%$!P4;0VKD5xumEa}b>FU<cjKmGMH)UfhiWBHKl+#yu*
z#2Ijm)y0X6^K4JUBW}HT?qn+7DLG#5T?JQz!5JoZ<j3O`Vmr!;K1G^drFvW1ro@O`
zcp!PD4x)SMrNN3%LroX;$RxNg)zP`?K_tvJfWK!iBsbC~Y=%QLyMgWII(9ZKtA%`W
ze{I#r2+;K`n=D}O^yj4BIqCL(LJvt!R^gP$9E+Okv<I`$3IEYh!!^j5b0s`7T?{GE
zU+`K6sHyZmd(rYS!}*qKQ{IaP<){uPoZudcG}>(NpzSChk7S=$(X9<JpR7vrJ5}`b
zvB;>73=-bj9{y};Q81=IyKM8_P=YATS4wx<d7&iL8Epk$^+6e;WKdvsw$r?<EaGec
zkkFQc(CjGQM1Fm!k+kS!CU>XidLc;YHIX!VEoy)KSNh5GdGhbD-AIfz3o9_1@)sB)
B#c}`u

literal 0
HcmV?d00001

diff --git a/spring-security-mvc-boot/src/main/resources/templates/ssl/welcome.html b/spring-security-mvc-boot/src/main/resources/templates/ssl/welcome.html
new file mode 100644
index 0000000000..93b3577f5c
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/resources/templates/ssl/welcome.html
@@ -0,0 +1 @@
+<h1>Welcome to Secured Site</h1>
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java
new file mode 100644
index 0000000000..63b421604a
--- /dev/null
+++ b/spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java
@@ -0,0 +1,67 @@
+package org.baeldung.web;
+
+import org.apache.http.client.HttpClient;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.baeldung.ssl.HttpsEnabledApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.io.Resource;
+import org.springframework.http.*;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.client.RestTemplate;
+
+import javax.net.ssl.SSLContext;
+import java.util.Base64;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = HttpsEnabledApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+@ActiveProfiles("ssl")
+public class HttpsApplicationIntegrationTest {
+
+    private static final String WELCOME_URL = "https://localhost:8443/welcome";
+
+    @Value("${trust.store}")
+    private Resource trustStore;
+
+    @Value("${trust.store.password}")
+    private String trustStorePassword;
+
+    @Test
+    public void whenGETanHTTPSResource_thenCorrectResponse() throws Exception {
+        ResponseEntity<String> response = restTemplate().exchange(WELCOME_URL, HttpMethod.GET, new HttpEntity<String>(withAuthorization("memuser", "pass")), String.class);
+
+        assertEquals("<h1>Welcome to Secured Site</h1>", response.getBody());
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+    }
+
+    RestTemplate restTemplate() throws Exception {
+        SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(trustStore.getURL(), trustStorePassword.toCharArray())
+            .build();
+        SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(sslContext);
+        HttpClient httpClient = HttpClients.custom()
+            .setSSLSocketFactory(socketFactory)
+            .build();
+        HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient);
+        return new RestTemplate(factory);
+    }
+
+    HttpHeaders withAuthorization(String userName, String password) {
+        return new HttpHeaders() {
+            {
+                String auth = userName + ":" + password;
+                String authHeader = "Basic " + new String(Base64.getEncoder()
+                    .encode(auth.getBytes()));
+                set("Authorization", authHeader);
+            }
+        };
+    }
+
+}

From 0ee48a7d92d100a6164ee425abdb0dfdde1b4745 Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Mon, 22 Oct 2018 09:05:47 +0530
Subject: [PATCH 11/13] BAEL-2262 Removed the Basic Authentication from the
 HttpsEnabledApplication.

---
 .../java/org/baeldung/ssl/SecurityConfig.java | 26 +++----------------
 .../web/HttpsApplicationIntegrationTest.java  | 19 +++-----------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java
index 98a59b11bb..92f92d8fc7 100644
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java
@@ -1,36 +1,16 @@
 package org.baeldung.ssl;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
 
 @EnableWebSecurity
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Override
-    public void configure(AuthenticationManagerBuilder auth) throws Exception {
-
-        auth.inMemoryAuthentication()
-            .withUser("memuser")
-            .password(passwordEncoder().encode("pass"))
-            .roles("USER");
-    }
-
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.httpBasic()
-            .and()
-            .authorizeRequests()
-            .antMatchers("/**")
-            .authenticated();
-    }
-
-    @Bean
-    public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
+        http.authorizeRequests()
+                .antMatchers("/**")
+                .permitAll();
     }
 }
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java
index 63b421604a..fe7883ec94 100644
--- a/spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java
+++ b/spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java
@@ -10,14 +10,15 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.io.Resource;
-import org.springframework.http.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;
 
 import javax.net.ssl.SSLContext;
-import java.util.Base64;
+import java.util.Collections;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +37,7 @@ public class HttpsApplicationIntegrationTest {
 
     @Test
     public void whenGETanHTTPSResource_thenCorrectResponse() throws Exception {
-        ResponseEntity<String> response = restTemplate().exchange(WELCOME_URL, HttpMethod.GET, new HttpEntity<String>(withAuthorization("memuser", "pass")), String.class);
+        ResponseEntity<String> response = restTemplate().getForEntity(WELCOME_URL, String.class, Collections.emptyMap());
 
         assertEquals("<h1>Welcome to Secured Site</h1>", response.getBody());
         assertEquals(HttpStatus.OK, response.getStatusCode());
@@ -52,16 +53,4 @@ public class HttpsApplicationIntegrationTest {
         HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient);
         return new RestTemplate(factory);
     }
-
-    HttpHeaders withAuthorization(String userName, String password) {
-        return new HttpHeaders() {
-            {
-                String auth = userName + ":" + password;
-                String authHeader = "Basic " + new String(Base64.getEncoder()
-                    .encode(auth.getBytes()));
-                set("Authorization", authHeader);
-            }
-        };
-    }
-
 }

From e1b47c72a06d38d8007428589b40abb0fb8b655e Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Fri, 2 Nov 2018 20:41:50 +0530
Subject: [PATCH 12/13] BAEL-2303 Added sample code to demo how to replace
 multiple if statements in java.

---
 .../baeldung/reducingIfElse/AddCommand.java   | 19 +++++
 .../com/baeldung/reducingIfElse/AddRule.java  | 21 +++++
 .../com/baeldung/reducingIfElse/Addition.java |  8 ++
 .../baeldung/reducingIfElse/Calculator.java   | 84 +++++++++++++++++++
 .../com/baeldung/reducingIfElse/Command.java  |  7 ++
 .../com/baeldung/reducingIfElse/Division.java |  7 ++
 .../baeldung/reducingIfElse/Expression.java   | 26 ++++++
 .../com/baeldung/reducingIfElse/Modulo.java   |  7 ++
 .../reducingIfElse/Multiplication.java        |  7 ++
 .../baeldung/reducingIfElse/Operation.java    |  5 ++
 .../com/baeldung/reducingIfElse/Operator.java | 41 +++++++++
 .../reducingIfElse/OperatorFactory.java       | 21 +++++
 .../com/baeldung/reducingIfElse/Rule.java     |  8 ++
 .../baeldung/reducingIfElse/RuleEngine.java   | 20 +++++
 .../baeldung/reducingIfElse/Subtraction.java  |  7 ++
 .../reduceIfelse/RuleEngineUnitTest.java      | 27 ++++++
 16 files changed, 315 insertions(+)
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Addition.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Division.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Expression.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Modulo.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Multiplication.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Operation.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Operator.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Subtraction.java
 create mode 100644 core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java

diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
new file mode 100644
index 0000000000..5aa0de7adc
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
@@ -0,0 +1,19 @@
+package com.baeldung.reducingIfElse;
+
+public class AddCommand implements Command<Integer, Integer, Integer> {
+
+    private int a;
+    private int b;
+
+    @Override
+    public Integer execute() {
+        return a + b;
+    }
+
+    @Override
+    public Command<Integer, Integer, Integer> takeInput(Integer a, Integer b) {
+        this.a = a;
+        this.b = b;
+        return this;
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java
new file mode 100644
index 0000000000..871ff1f2d1
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java
@@ -0,0 +1,21 @@
+package com.baeldung.reducingIfElse;
+
+public class AddRule implements Rule {
+
+    private int result;
+
+    @Override
+    public boolean evaluate(Expression expression) {
+        boolean evalResult = false;
+        if (expression.getOperator() == Operator.ADD) {
+            this.result = expression.getX() + expression.getY();
+            evalResult = true;
+        }
+        return evalResult;
+    }
+
+    @Override
+    public int getResult() {
+        return result;
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Addition.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Addition.java
new file mode 100644
index 0000000000..3174ea558c
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Addition.java
@@ -0,0 +1,8 @@
+package com.baeldung.reducingIfElse;
+
+public class Addition implements Operation {
+    @Override
+    public int apply(int a, int b) {
+        return a + b;
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java
new file mode 100644
index 0000000000..9b8cce130f
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java
@@ -0,0 +1,84 @@
+package com.baeldung.reducingIfElse;
+
+public class Calculator {
+
+    public int calculate(int a, int b, String operator) {
+        int result = Integer.MIN_VALUE;
+
+        if ("add".equals(operator)) {
+            result = a + b;
+        } else if ("multiply".equals(operator)) {
+            result = a * b;
+        } else if ("divide".equals(operator)) {
+            result = a / b;
+        } else if ("subtract".equals(operator)) {
+            result = a - b;
+        } else if ("modulo".equals(operator)) {
+            result = a % b;
+        }
+        return result;
+    }
+
+    public int calculateUsingSwitch(int a, int b, String operator) {
+        int result = 0;
+        switch (operator) {
+        case "add":
+            result = a + b;
+            break;
+        case "multiply":
+            result = a * b;
+            break;
+        case "divide":
+            result = a / b;
+            break;
+        case "subtract":
+            result = a - b;
+            break;
+        case "modulo":
+            result = a % b;
+            break;
+        default:
+            result = Integer.MIN_VALUE;
+        }
+        return result;
+    }
+
+    public int calculateUsingSwitch(int a, int b, Operator operator) {
+        int result = 0;
+        switch (operator) {
+        case ADD:
+            result = a + b;
+            break;
+        case MULTIPLY:
+            result = a * b;
+            break;
+        case DIVIDE:
+            result = a / b;
+            break;
+        case SUBTRACT:
+            result = a - b;
+            break;
+        case MODULO:
+            result = a % b;
+            break;
+        default:
+            result = Integer.MIN_VALUE;
+        }
+        return result;
+    }
+
+    public int calculate(int a, int b, Operator operator) {
+        return operator.apply(a, b);
+    }
+
+    public int calculateUsingFactory(int a, int b, String operation) {
+        Operation targetOperation = OperatorFactory.getOperation(operation)
+            .orElseThrow(() -> new IllegalArgumentException("Invalid Operator"));
+        return targetOperation.apply(a, b);
+    }
+
+    public int calculate(int a, int b, Command<Integer, Integer, Integer> command) {
+        return command.takeInput(a, b)
+            .execute();
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java
new file mode 100644
index 0000000000..d9f00e31b4
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java
@@ -0,0 +1,7 @@
+package com.baeldung.reducingIfElse;
+
+public interface Command<A, B, R> {
+    R execute();
+
+    Command<A, B, R> takeInput(A a, B b);
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Division.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Division.java
new file mode 100644
index 0000000000..75b1297655
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Division.java
@@ -0,0 +1,7 @@
+package com.baeldung.reducingIfElse;
+
+public class Division implements Operation {
+        @Override public int apply(int a, int b) {
+                return a / b;
+        }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Expression.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Expression.java
new file mode 100644
index 0000000000..4d3fe1b824
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Expression.java
@@ -0,0 +1,26 @@
+package com.baeldung.reducingIfElse;
+
+public class Expression {
+
+        private Integer x;
+        private Integer y;
+        private Operator operator;
+
+        public Expression(Integer x, Integer y, Operator operator) {
+                this.x = x;
+                this.y = y;
+                this.operator = operator;
+        }
+
+        public Integer getX() {
+                return x;
+        }
+
+        public Integer getY() {
+                return y;
+        }
+
+        public Operator getOperator() {
+                return operator;
+        }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Modulo.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Modulo.java
new file mode 100644
index 0000000000..a7a081704c
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Modulo.java
@@ -0,0 +1,7 @@
+package com.baeldung.reducingIfElse;
+
+public class Modulo implements Operation {
+        @Override public int apply(int a, int b) {
+                return a % b;
+        }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Multiplication.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Multiplication.java
new file mode 100644
index 0000000000..e1a39b33c4
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Multiplication.java
@@ -0,0 +1,7 @@
+package com.baeldung.reducingIfElse;
+
+public class Multiplication implements Operation {
+        @Override public int apply(int a, int b) {
+                return 0;
+        }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operation.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operation.java
new file mode 100644
index 0000000000..41241fa810
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operation.java
@@ -0,0 +1,5 @@
+package com.baeldung.reducingIfElse;
+
+public interface Operation {
+    int apply(int a, int b);
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operator.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operator.java
new file mode 100644
index 0000000000..831b8fa146
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Operator.java
@@ -0,0 +1,41 @@
+package com.baeldung.reducingIfElse;
+
+public enum Operator {
+
+    ADD {
+        @Override
+        public int apply(int a, int b) {
+            return a + b;
+        }
+    },
+
+    MULTIPLY {
+        @Override
+        public int apply(int a, int b) {
+            return a * b;
+        }
+    },
+
+    SUBTRACT {
+        @Override
+        public int apply(int a, int b) {
+            return a - b;
+        }
+    },
+
+    DIVIDE {
+        @Override
+        public int apply(int a, int b) {
+            return a / b;
+        }
+    },
+
+    MODULO {
+        @Override
+        public int apply(int a, int b) {
+            return a % b;
+        }
+    };
+
+    public abstract int apply(int a, int b);
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java
new file mode 100644
index 0000000000..18ed63adbd
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java
@@ -0,0 +1,21 @@
+package com.baeldung.reducingIfElse;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+public class OperatorFactory {
+
+    static Map<String, Operation> operationMap = new HashMap<>();
+    static {
+        operationMap.put("add", new Addition());
+        operationMap.put("divide", new Division());
+        operationMap.put("multiply", new Multiplication());
+        operationMap.put("subtract", new Subtraction());
+        operationMap.put("modulo", new Modulo());
+    }
+
+    public static Optional<Operation> getOperation(String operation) {
+        return Optional.ofNullable(operationMap.get(operation));
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java
new file mode 100644
index 0000000000..202072dd66
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java
@@ -0,0 +1,8 @@
+package com.baeldung.reducingIfElse;
+
+public interface Rule {
+
+    boolean evaluate(Expression expression);
+
+    int getResult();
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
new file mode 100644
index 0000000000..3af67aff11
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
@@ -0,0 +1,20 @@
+package com.baeldung.reducingIfElse;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class RuleEngine {
+
+    private static List<Rule> rules = new ArrayList<>();
+
+    static {
+        rules.add(new AddRule());
+    }
+
+    public List<Rule> process(Expression expression) {
+        return rules.stream()
+            .filter(r -> r.evaluate(expression))
+            .collect(Collectors.toList());
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Subtraction.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Subtraction.java
new file mode 100644
index 0000000000..948998810e
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Subtraction.java
@@ -0,0 +1,7 @@
+package com.baeldung.reducingIfElse;
+
+public class Subtraction implements Operation {
+        @Override public int apply(int a, int b) {
+                return a - b;
+        }
+}
diff --git a/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java b/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
new file mode 100644
index 0000000000..227dd12f0d
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.reduceIfelse;
+
+import com.baeldung.reducingIfElse.Expression;
+import com.baeldung.reducingIfElse.Operator;
+import com.baeldung.reducingIfElse.Rule;
+import com.baeldung.reducingIfElse.RuleEngine;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class RuleEngineUnitTest {
+
+    @Test
+    public void whenNumbersGivenToRuleEngine_thenReturnCorrectResult() {
+        Expression expression = new Expression(5, 5, Operator.ADD);
+        RuleEngine engine = new RuleEngine();
+        List<Rule> rules = engine.process(expression);
+
+        assertNotNull(rules);
+        assertEquals(1, rules.size());
+        assertEquals(10, rules.get(0)
+            .getResult());
+    }
+}

From 3c558d642798f3f977f7466463649bbfdc65b8a6 Mon Sep 17 00:00:00 2001
From: Sandip Singh <sandip.03934@gmail.com>
Date: Tue, 6 Nov 2018 14:21:19 +0530
Subject: [PATCH 13/13] BAEL-2303 Updated the code as per the review comments.

---
 .../baeldung/reducingIfElse/AddCommand.java   | 14 ++++----
 .../com/baeldung/reducingIfElse/AddRule.java  |  4 +--
 .../baeldung/reducingIfElse/Calculator.java   |  5 ++-
 .../com/baeldung/reducingIfElse/Command.java  |  8 ++---
 .../com/baeldung/reducingIfElse/Result.java   | 13 ++++++++
 .../com/baeldung/reducingIfElse/Rule.java     |  2 +-
 .../baeldung/reducingIfElse/RuleEngine.java   | 10 ++++--
 .../reduceIfelse/CalculatorUnitTest.java      | 32 +++++++++++++++++++
 .../reduceIfelse/RuleEngineUnitTest.java      | 12 +++----
 9 files changed, 70 insertions(+), 30 deletions(-)
 create mode 100644 core-java-8/src/main/java/com/baeldung/reducingIfElse/Result.java
 create mode 100644 core-java-8/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java

diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
index 5aa0de7adc..279a3b2c55 100644
--- a/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
@@ -1,19 +1,17 @@
 package com.baeldung.reducingIfElse;
 
-public class AddCommand implements Command<Integer, Integer, Integer> {
+public class AddCommand implements Command {
 
     private int a;
     private int b;
 
+    public AddCommand(int a, int b) {
+        this.a = a;
+        this.b = b;
+    }
+
     @Override
     public Integer execute() {
         return a + b;
     }
-
-    @Override
-    public Command<Integer, Integer, Integer> takeInput(Integer a, Integer b) {
-        this.a = a;
-        this.b = b;
-        return this;
-    }
 }
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java
index 871ff1f2d1..f24c973ead 100644
--- a/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/AddRule.java
@@ -15,7 +15,7 @@ public class AddRule implements Rule {
     }
 
     @Override
-    public int getResult() {
-        return result;
+    public Result getResult() {
+        return new Result(result);
     }
 }
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java
index 9b8cce130f..550d92e183 100644
--- a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Calculator.java
@@ -77,8 +77,7 @@ public class Calculator {
         return targetOperation.apply(a, b);
     }
 
-    public int calculate(int a, int b, Command<Integer, Integer, Integer> command) {
-        return command.takeInput(a, b)
-            .execute();
+    public int calculate(Command command) {
+        return command.execute();
     }
 }
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java
index d9f00e31b4..c084fcc6a0 100644
--- a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Command.java
@@ -1,7 +1,5 @@
 package com.baeldung.reducingIfElse;
 
-public interface Command<A, B, R> {
-    R execute();
-
-    Command<A, B, R> takeInput(A a, B b);
-}
+public interface Command {
+    Integer execute();
+}
\ No newline at end of file
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Result.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Result.java
new file mode 100644
index 0000000000..d5ed12202e
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Result.java
@@ -0,0 +1,13 @@
+package com.baeldung.reducingIfElse;
+
+public class Result {
+    int value;
+
+    public Result(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java
index 202072dd66..5a6c84b0f9 100644
--- a/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/Rule.java
@@ -4,5 +4,5 @@ public interface Rule {
 
     boolean evaluate(Expression expression);
 
-    int getResult();
+    Result getResult();
 }
diff --git a/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java b/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
index 3af67aff11..ac56915dee 100644
--- a/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
+++ b/core-java-8/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
@@ -2,6 +2,7 @@ package com.baeldung.reducingIfElse;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class RuleEngine {
@@ -12,9 +13,12 @@ public class RuleEngine {
         rules.add(new AddRule());
     }
 
-    public List<Rule> process(Expression expression) {
-        return rules.stream()
+    public Result process(Expression expression) {
+
+        Rule rule = rules.stream()
             .filter(r -> r.evaluate(expression))
-            .collect(Collectors.toList());
+            .findFirst()
+            .orElseThrow(() -> new IllegalArgumentException("Expression does not matches any Rule"));
+        return rule.getResult();
     }
 }
diff --git a/core-java-8/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java b/core-java-8/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java
new file mode 100644
index 0000000000..fa351930d8
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.reduceIfelse;
+
+import com.baeldung.reducingIfElse.AddCommand;
+import com.baeldung.reducingIfElse.Calculator;
+import com.baeldung.reducingIfElse.Operator;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class CalculatorUnitTest {
+
+    @Test
+    public void whenCalculateUsingStringOperator_thenReturnCorrectResult() {
+        Calculator calculator = new Calculator();
+        int result = calculator.calculate(3, 4, "add");
+        assertEquals(7, result);
+    }
+
+    @Test
+    public void whenCalculateUsingEnumOperator_thenReturnCorrectResult() {
+        Calculator calculator = new Calculator();
+        int result = calculator.calculate(3, 4, Operator.valueOf("ADD"));
+        assertEquals(7, result);
+    }
+
+    @Test
+    public void whenCalculateUsingCommand_thenReturnCorrectResult() {
+        Calculator calculator = new Calculator();
+        int result = calculator.calculate(new AddCommand(3, 7));
+        assertEquals(10, result);
+    }
+}
diff --git a/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java b/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
index 227dd12f0d..4a30b3efac 100644
--- a/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
+++ b/core-java-8/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
@@ -2,12 +2,10 @@ package com.baeldung.reduceIfelse;
 
 import com.baeldung.reducingIfElse.Expression;
 import com.baeldung.reducingIfElse.Operator;
-import com.baeldung.reducingIfElse.Rule;
+import com.baeldung.reducingIfElse.Result;
 import com.baeldung.reducingIfElse.RuleEngine;
 import org.junit.Test;
 
-import java.util.List;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -17,11 +15,9 @@ public class RuleEngineUnitTest {
     public void whenNumbersGivenToRuleEngine_thenReturnCorrectResult() {
         Expression expression = new Expression(5, 5, Operator.ADD);
         RuleEngine engine = new RuleEngine();
-        List<Rule> rules = engine.process(expression);
+        Result result = engine.process(expression);
 
-        assertNotNull(rules);
-        assertEquals(1, rules.size());
-        assertEquals(10, rules.get(0)
-            .getResult());
+        assertNotNull(result);
+        assertEquals(10, result.getValue());
     }
 }