From 945932fa1d96bcfe576ce92fe4d8b61ba1b3c04b Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Sun, 22 Jul 2018 17:56:20 +0530
Subject: [PATCH 001/114] Real Time Event Streaming with Spring Webflux

---
 .../EventStreamingApplication.java            | 38 +++++++++++++++++++
 .../eventstreaming/EventWebSocketClient.java  | 24 ++++++++++++
 .../eventstreaming/EventWebSocketHandler.java | 27 +++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventStreamingApplication.java
 create mode 100644 spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java
 create mode 100644 spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketHandler.java

diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventStreamingApplication.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventStreamingApplication.java
new file mode 100644
index 0000000000..5deff35fa7
--- /dev/null
+++ b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventStreamingApplication.java
@@ -0,0 +1,38 @@
+package com.baeldung.reactive.webflux.eventstreaming;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.reactive.HandlerMapping;
+import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
+import org.springframework.web.reactive.socket.WebSocketHandler;
+import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
+
+@SpringBootApplication
+public class EventStreamingApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(EventStreamingApplication.class, args);
+	}
+
+	
+	@Bean
+	public HandlerMapping webSocketMapping() {
+		Map<String, WebSocketHandler> map = new HashMap<>();
+		map.put("/events", new EventWebSocketHandler());
+
+		SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
+		mapping.setUrlMap(map);
+		mapping.setOrder(1);
+		return mapping;
+	}
+
+	@Bean
+	public WebSocketHandlerAdapter handlerAdapter() {
+		return new WebSocketHandlerAdapter();
+	}
+	
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java
new file mode 100644
index 0000000000..3fa4027449
--- /dev/null
+++ b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java
@@ -0,0 +1,24 @@
+package com.baeldung.reactive.webflux.eventstreaming;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.time.Duration;
+
+import org.springframework.web.reactive.socket.WebSocketMessage;
+import org.springframework.web.reactive.socket.client.ReactorNettyWebSocketClient;
+import org.springframework.web.reactive.socket.client.WebSocketClient;
+
+public class EventWebSocketClient {
+
+	public static void main(String[] args) throws URISyntaxException {
+		
+		WebSocketClient client = new ReactorNettyWebSocketClient();
+		
+		client.execute(
+		          URI.create("ws://localhost:8080/events"), 
+		          session -> session.receive()
+		              .map(WebSocketMessage::getPayloadAsText)
+		              .log().then())
+		            .block(Duration.ofMinutes(10L));
+	}
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketHandler.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketHandler.java
new file mode 100644
index 0000000000..37deaf3d1b
--- /dev/null
+++ b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketHandler.java
@@ -0,0 +1,27 @@
+package com.baeldung.reactive.webflux.eventstreaming;
+
+import java.text.MessageFormat;
+import java.time.Duration;
+import java.time.LocalTime;
+import java.util.UUID;
+
+import org.springframework.web.reactive.socket.WebSocketHandler;
+import org.springframework.web.reactive.socket.WebSocketSession;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public class EventWebSocketHandler implements WebSocketHandler {
+
+    MessageFormat mf = new MessageFormat("EventID: {0} , Event Time: {1}") ;
+    
+    @Override
+    public Mono<Void> handle(WebSocketSession session) {
+        return session.send(
+            Flux.<String> generate(sink -> sink.next(
+                mf.format(new Object[] {UUID.randomUUID(),LocalTime.now()})))
+            .delayElements(Duration.ofSeconds(1))
+            .map(session::textMessage));
+    }
+
+}

From f95092d90a24b6629798bf99a1811a5dd192fc19 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Mon, 23 Jul 2018 21:10:03 +0530
Subject: [PATCH 002/114] Real Time Event Streaming with Spring Webflux

---
 .../webflux/eventstreaming/EventWebSocketClient.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java
index 3fa4027449..357a5677c1 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java
+++ b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java
@@ -10,12 +10,14 @@ import org.springframework.web.reactive.socket.client.WebSocketClient;
 
 public class EventWebSocketClient {
 
-	public static void main(String[] args) throws URISyntaxException {
+	private static final String REMOTE_URL = "ws://localhost:8080/events";
+
+    public static void main(String[] args) throws URISyntaxException {
 		
 		WebSocketClient client = new ReactorNettyWebSocketClient();
 		
 		client.execute(
-		          URI.create("ws://localhost:8080/events"), 
+		          URI.create(REMOTE_URL), 
 		          session -> session.receive()
 		              .map(WebSocketMessage::getPayloadAsText)
 		              .log().then())

From 3fdb4877eca66b317d07a726d2472872b04bf51b Mon Sep 17 00:00:00 2001
From: Jon Cook <jonathan.cook@erars.plus.com>
Date: Sun, 29 Jul 2018 17:22:14 +0200
Subject: [PATCH 003/114] BAEL-1552 - Jersey MVC Support

---
 jersey/pom.xml                                | 29 ++++++++++
 .../server/config/ViewApplicationConfig.java  | 14 +++++
 .../server/http/EmbeddedHttpServer.java       | 35 ++++++++++++
 .../baeldung/jersey/server/model/Fruit.java   | 23 ++++++++
 .../jersey/server/rest/FruitResource.java     | 55 +++++++++++++++++++
 .../resources/templates/freemarker/all.ftl    | 14 +++++
 .../resources/templates/freemarker/error.ftl  |  8 +++
 .../resources/templates/freemarker/index.ftl  |  8 +++
 .../resources/templates/freemarker/named.ftl  |  8 +++
 .../rest/FruitResourceIntegrationTest.java    | 42 ++++++++++++++
 10 files changed, 236 insertions(+)
 create mode 100644 jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java
 create mode 100644 jersey/src/main/java/com/baeldung/jersey/server/http/EmbeddedHttpServer.java
 create mode 100644 jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
 create mode 100644 jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
 create mode 100644 jersey/src/main/resources/templates/freemarker/all.ftl
 create mode 100644 jersey/src/main/resources/templates/freemarker/error.ftl
 create mode 100644 jersey/src/main/resources/templates/freemarker/index.ftl
 create mode 100644 jersey/src/main/resources/templates/freemarker/named.ftl
 create mode 100644 jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java

diff --git a/jersey/pom.xml b/jersey/pom.xml
index 78e6d621ad..e248f9cf90 100644
--- a/jersey/pom.xml
+++ b/jersey/pom.xml
@@ -29,6 +29,28 @@
             <artifactId>jaxrs-ri</artifactId>
             <version>${jersey.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-grizzly2-servlet</artifactId>
+             <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.ext</groupId>
+            <artifactId>jersey-mvc-freemarker</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.test-framework</groupId>
+            <artifactId>jersey-test-framework-core</artifactId>
+            <version>${jersey.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+            <version>${jersey.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -41,6 +63,13 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.jersey.server.http.EmbeddedHttpServer</mainClass>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java b/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java
new file mode 100644
index 0000000000..d4744066c4
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java
@@ -0,0 +1,14 @@
+package com.baeldung.jersey.server.config;
+
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.server.mvc.freemarker.FreemarkerMvcFeature;
+
+public class ViewApplicationConfig extends ResourceConfig {
+    
+    public ViewApplicationConfig() {
+        packages("com.baeldung.jersey.server");
+        property(FreemarkerMvcFeature.TEMPLATE_BASE_PATH, "templates/freemarker");
+        register(FreemarkerMvcFeature.class);;
+    }
+
+}
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/http/EmbeddedHttpServer.java b/jersey/src/main/java/com/baeldung/jersey/server/http/EmbeddedHttpServer.java
new file mode 100644
index 0000000000..4afa086858
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/server/http/EmbeddedHttpServer.java
@@ -0,0 +1,35 @@
+package com.baeldung.jersey.server.http;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.glassfish.grizzly.http.server.HttpServer;
+import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
+
+import com.baeldung.jersey.server.config.ViewApplicationConfig;
+
+public class EmbeddedHttpServer {
+
+    private static final URI BASE_URI = URI.create("http://localhost:8082/");
+
+    public static void main(String[] args) {
+        try {
+            final HttpServer server = GrizzlyHttpServerFactory.createHttpServer(BASE_URI, new ViewApplicationConfig(), false);
+
+            Runtime.getRuntime()
+                .addShutdownHook(new Thread(() -> {
+                    server.shutdownNow();
+                }));
+
+            server.start();
+
+            System.out.println(String.format("Application started.\nTry out %s\nStop the application using CTRL+C", BASE_URI + "fruit"));
+        } catch (IOException ex) {
+            Logger.getLogger(EmbeddedHttpServer.class.getName())
+                .log(Level.SEVERE, null, ex);
+        }
+
+    }
+}
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
new file mode 100644
index 0000000000..da4865e9ab
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
@@ -0,0 +1,23 @@
+package com.baeldung.jersey.server.model;
+
+public class Fruit {
+
+    private final String name;
+    private final String colour;
+
+    public Fruit(String name, String colour) {
+        this.name = name;
+        this.colour = colour;
+    }
+    
+    public String getName() {
+        return name;
+    }
+
+    public String getColour() {
+        return colour;
+    }
+
+    
+
+}
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java b/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
new file mode 100644
index 0000000000..4e1fa4aa11
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
@@ -0,0 +1,55 @@
+package com.baeldung.jersey.server.rest;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.glassfish.jersey.server.mvc.ErrorTemplate;
+import org.glassfish.jersey.server.mvc.Template;
+import org.glassfish.jersey.server.mvc.Viewable;
+
+import com.baeldung.jersey.server.model.Fruit;
+
+@Path("/fruit")
+public class FruitResource {
+
+    @GET
+    public Viewable get() {
+        return new Viewable("/index.ftl", "Fruit Index Page");
+    }
+
+    @GET
+    @Template(name = "/all.ftl")
+    @Path("/all")
+    @Produces(MediaType.TEXT_HTML)
+    public Map<String, Object> getAllFruit() {
+        final List<Fruit> fruits = new ArrayList<>();
+        fruits.add(new Fruit("banana", "yellow"));
+        fruits.add(new Fruit("apple", "red"));
+        fruits.add(new Fruit("kiwi", "green"));
+
+        final Map<String, Object> model = new HashMap<String, Object>();
+        model.put("items", fruits);
+        return model;
+    }
+
+    @GET
+    @ErrorTemplate(name = "/error.ftl")
+    @Template(name = "/named.ftl")
+    @Path("{name}")
+    @Produces(MediaType.TEXT_HTML)
+    public String getFruitByName(@PathParam("name") String name) {
+        if (!"banana".equalsIgnoreCase(name)) {
+            throw new IllegalArgumentException("Fruit not found: " + name);
+        }
+        return name;
+    }
+
+}
diff --git a/jersey/src/main/resources/templates/freemarker/all.ftl b/jersey/src/main/resources/templates/freemarker/all.ftl
new file mode 100644
index 0000000000..59406a60ca
--- /dev/null
+++ b/jersey/src/main/resources/templates/freemarker/all.ftl
@@ -0,0 +1,14 @@
+<html>
+    <head>
+      <title>All fruit!</title>
+    </head>
+    <body>
+      <h1>All fruit!</h1>
+      <p>Fruits:</p>
+      <ul>
+		<#list items as fruit>
+			<li>${fruit.name}</li>
+		</#list>
+	  </ul>	
+    </body>
+</html>
\ No newline at end of file
diff --git a/jersey/src/main/resources/templates/freemarker/error.ftl b/jersey/src/main/resources/templates/freemarker/error.ftl
new file mode 100644
index 0000000000..8ea6828ba5
--- /dev/null
+++ b/jersey/src/main/resources/templates/freemarker/error.ftl
@@ -0,0 +1,8 @@
+<html>
+    <head>
+      <title>Welcome!</title>
+    </head>
+    <body>
+      <h1>Error -  ${model.message}!</h1>
+    </body>
+</html>
\ No newline at end of file
diff --git a/jersey/src/main/resources/templates/freemarker/index.ftl b/jersey/src/main/resources/templates/freemarker/index.ftl
new file mode 100644
index 0000000000..01447f24e8
--- /dev/null
+++ b/jersey/src/main/resources/templates/freemarker/index.ftl
@@ -0,0 +1,8 @@
+<html>
+    <head>
+      <title>Welcome!</title>
+    </head>
+    <body>
+      <h1>Welcome ${model}!</h1>
+    </body>
+</html>
\ No newline at end of file
diff --git a/jersey/src/main/resources/templates/freemarker/named.ftl b/jersey/src/main/resources/templates/freemarker/named.ftl
new file mode 100644
index 0000000000..ccde3307e6
--- /dev/null
+++ b/jersey/src/main/resources/templates/freemarker/named.ftl
@@ -0,0 +1,8 @@
+<html>
+    <head>
+      <title>Welcome!</title>
+    </head>
+    <body>
+      <h1>Found fruit - ${model}!</h1>
+    </body>
+</html>
\ No newline at end of file
diff --git a/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java b/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
new file mode 100644
index 0000000000..a0b6daed51
--- /dev/null
+++ b/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
@@ -0,0 +1,42 @@
+package com.baeldung.jersey.server.rest;
+
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+
+import javax.ws.rs.core.Application;
+
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.baeldung.jersey.server.config.ViewApplicationConfig;
+
+public class FruitResourceIntegrationTest extends JerseyTest {
+
+    @Override
+    protected Application configure() {
+        return new ViewApplicationConfig();
+    }
+
+    @Test
+    public void testAllFruit() {
+        final String response = target("/fruit/all").request()
+            .get(String.class);
+        Assert.assertThat(response, allOf(containsString("banana"), containsString("apple"), containsString("kiwi")));
+    }
+
+    @Test
+    public void testIndex() {
+        final String response = target("/fruit").request()
+            .get(String.class);
+        Assert.assertThat(response, containsString("Welcome Fruit Index Page!"));
+    }
+
+    @Test
+    public void testErrorTemplate() {
+        final String response = target("/fruit/orange").request()
+            .get(String.class);
+        Assert.assertThat(response, containsString("Error -  Fruit not found: orange!"));
+    }
+
+}

From 4373eea810eea4ac142a3a570778cc3fdd9b7f83 Mon Sep 17 00:00:00 2001
From: Jon Cook <jonathan.cook@erars.plus.com>
Date: Sun, 29 Jul 2018 17:34:10 +0200
Subject: [PATCH 004/114] BAEL-1552 - Jersey MVC Support

---
 .../src/main/java/com/baeldung/jersey/server/model/Fruit.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
index da4865e9ab..30620e331d 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
@@ -17,7 +17,4 @@ public class Fruit {
     public String getColour() {
         return colour;
     }
-
-    
-
 }

From 216715010be058330a08cdb5946abdec9c864ed5 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Wed, 8 Aug 2018 22:19:00 +0530
Subject: [PATCH 005/114] Adding Hello world Servlet and HTML impl

---
 .../com/baeldung/jetty/HelloWorldServlet.java | 28 +++++++++++++++++++
 libraries/src/main/webapp/WEB-INF/web.xml     | 10 +++++++
 libraries/src/main/webapp/helloworld.html     |  9 ++++++
 3 files changed, 47 insertions(+)
 create mode 100644 libraries/src/main/java/com/baeldung/jetty/HelloWorldServlet.java
 create mode 100644 libraries/src/main/webapp/WEB-INF/web.xml
 create mode 100644 libraries/src/main/webapp/helloworld.html

diff --git a/libraries/src/main/java/com/baeldung/jetty/HelloWorldServlet.java b/libraries/src/main/java/com/baeldung/jetty/HelloWorldServlet.java
new file mode 100644
index 0000000000..d730e70ad2
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/jetty/HelloWorldServlet.java
@@ -0,0 +1,28 @@
+package com.baeldung.jetty;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet("/helloworld")
+public class HelloWorldServlet extends HttpServlet {
+
+    private static final long serialVersionUID = 2851388791344172542L;
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        
+        PrintWriter writer = resp.getWriter();
+        writer.println("<!DOCTYPE html>");
+        writer.println("<html>");
+        writer.println("<body>");
+        writer.println("<p>Hello World!</p>");
+        writer.println("</body>");
+        writer.println("</html>");
+    }
+}
diff --git a/libraries/src/main/webapp/WEB-INF/web.xml b/libraries/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..364bcd9587
--- /dev/null
+++ b/libraries/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,10 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+	      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
+
+	<welcome-file-list>
+		<welcome-file>helloworld.html</welcome-file>
+	</welcome-file-list>
+</web-app>
\ No newline at end of file
diff --git a/libraries/src/main/webapp/helloworld.html b/libraries/src/main/webapp/helloworld.html
new file mode 100644
index 0000000000..bfc75f2592
--- /dev/null
+++ b/libraries/src/main/webapp/helloworld.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Hello World</title>
+</head>
+<body>Hello World!
+</body>
+</html>
\ No newline at end of file

From 99b800c5b914c19aae5ec6f8784d7335a82e6a82 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Wed, 8 Aug 2018 22:28:28 +0530
Subject: [PATCH 006/114] Removing unmerged files from demo article

---
 .../EventStreamingApplication.java            | 38 -------------------
 .../eventstreaming/EventWebSocketClient.java  | 26 -------------
 .../eventstreaming/EventWebSocketHandler.java | 27 -------------
 3 files changed, 91 deletions(-)
 delete mode 100644 spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventStreamingApplication.java
 delete mode 100644 spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java
 delete mode 100644 spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketHandler.java

diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventStreamingApplication.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventStreamingApplication.java
deleted file mode 100644
index 5deff35fa7..0000000000
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventStreamingApplication.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.baeldung.reactive.webflux.eventstreaming;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.reactive.HandlerMapping;
-import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
-import org.springframework.web.reactive.socket.WebSocketHandler;
-import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
-
-@SpringBootApplication
-public class EventStreamingApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(EventStreamingApplication.class, args);
-	}
-
-	
-	@Bean
-	public HandlerMapping webSocketMapping() {
-		Map<String, WebSocketHandler> map = new HashMap<>();
-		map.put("/events", new EventWebSocketHandler());
-
-		SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
-		mapping.setUrlMap(map);
-		mapping.setOrder(1);
-		return mapping;
-	}
-
-	@Bean
-	public WebSocketHandlerAdapter handlerAdapter() {
-		return new WebSocketHandlerAdapter();
-	}
-	
-}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java
deleted file mode 100644
index 357a5677c1..0000000000
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketClient.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baeldung.reactive.webflux.eventstreaming;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.time.Duration;
-
-import org.springframework.web.reactive.socket.WebSocketMessage;
-import org.springframework.web.reactive.socket.client.ReactorNettyWebSocketClient;
-import org.springframework.web.reactive.socket.client.WebSocketClient;
-
-public class EventWebSocketClient {
-
-	private static final String REMOTE_URL = "ws://localhost:8080/events";
-
-    public static void main(String[] args) throws URISyntaxException {
-		
-		WebSocketClient client = new ReactorNettyWebSocketClient();
-		
-		client.execute(
-		          URI.create(REMOTE_URL), 
-		          session -> session.receive()
-		              .map(WebSocketMessage::getPayloadAsText)
-		              .log().then())
-		            .block(Duration.ofMinutes(10L));
-	}
-}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketHandler.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketHandler.java
deleted file mode 100644
index 37deaf3d1b..0000000000
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/eventstreaming/EventWebSocketHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.baeldung.reactive.webflux.eventstreaming;
-
-import java.text.MessageFormat;
-import java.time.Duration;
-import java.time.LocalTime;
-import java.util.UUID;
-
-import org.springframework.web.reactive.socket.WebSocketHandler;
-import org.springframework.web.reactive.socket.WebSocketSession;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public class EventWebSocketHandler implements WebSocketHandler {
-
-    MessageFormat mf = new MessageFormat("EventID: {0} , Event Time: {1}") ;
-    
-    @Override
-    public Mono<Void> handle(WebSocketSession session) {
-        return session.send(
-            Flux.<String> generate(sink -> sink.next(
-                mf.format(new Object[] {UUID.randomUUID(),LocalTime.now()})))
-            .delayElements(Duration.ofSeconds(1))
-            .map(session::textMessage));
-    }
-
-}

From 8a6cd931ca41cf74d7e3580a02bb7ab7ad8a079c Mon Sep 17 00:00:00 2001
From: Philippe <phil@lighthouse.com.br>
Date: Wed, 15 Aug 2018 00:47:53 -0300
Subject: [PATCH 007/114] [BAEL-455] Initial code

---
 spring-cloud/pom.xml                          |   1 +
 spring-cloud/spring-cloud-vault/.gitignore    |  29 ++++++
 spring-cloud/spring-cloud-vault/pom.xml       |  90 ++++++++++++++++++
 .../vaultsample/VaultSampleApplication.java   |  12 +++
 .../cloud/vaultsample/domain/Account.java     |  58 +++++++++++
 .../repository/AccountRepository.java         |  10 ++
 .../src/main/resources/application.yml        |   6 ++
 .../src/main/resources/bootstrap.yml          |  37 +++++++
 .../src/main/resources/vault.jks              | Bin 0 -> 833 bytes
 .../VaultSampleApplicationLiveTest.java       |  66 +++++++++++++
 .../src/test/resources/bootstrap.properties   |   3 +
 .../src/test/resources/vault.jks              | Bin 0 -> 833 bytes
 .../src/test/vault-config/localhost.cert      |  18 ++++
 .../src/test/vault-config/localhost.key       |  27 ++++++
 .../src/test/vault-config/vault-test.hcl      |  20 ++++
 .../spring-cloud-vault/vault-cheatsheet.txt   |  82 ++++++++++++++++
 spring-cloud/spring-cloud-vault/vault-env.bat |   5 +
 spring-cloud/spring-cloud-vault/vault-env.sh  |   6 ++
 .../spring-cloud-vault/vault-start.bat        |   3 +
 .../spring-cloud-vault/vault-start.sh         |   5 +
 .../spring-cloud-vault/vault-unseal.bat       |   7 ++
 .../spring-cloud-vault/vault-unseal.sh        |   8 ++
 22 files changed, 493 insertions(+)
 create mode 100644 spring-cloud/spring-cloud-vault/.gitignore
 create mode 100644 spring-cloud/spring-cloud-vault/pom.xml
 create mode 100644 spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java
 create mode 100644 spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java
 create mode 100644 spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/repository/AccountRepository.java
 create mode 100644 spring-cloud/spring-cloud-vault/src/main/resources/application.yml
 create mode 100644 spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
 create mode 100644 spring-cloud/spring-cloud-vault/src/main/resources/vault.jks
 create mode 100644 spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java
 create mode 100644 spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties
 create mode 100644 spring-cloud/spring-cloud-vault/src/test/resources/vault.jks
 create mode 100644 spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.cert
 create mode 100644 spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.key
 create mode 100644 spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl
 create mode 100644 spring-cloud/spring-cloud-vault/vault-cheatsheet.txt
 create mode 100644 spring-cloud/spring-cloud-vault/vault-env.bat
 create mode 100644 spring-cloud/spring-cloud-vault/vault-env.sh
 create mode 100644 spring-cloud/spring-cloud-vault/vault-start.bat
 create mode 100644 spring-cloud/spring-cloud-vault/vault-start.sh
 create mode 100644 spring-cloud/spring-cloud-vault/vault-unseal.bat
 create mode 100644 spring-cloud/spring-cloud-vault/vault-unseal.sh

diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 373a12da9e..cc723534f8 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -31,6 +31,7 @@
         <module>spring-cloud-zuul-eureka-integration</module>
         <module>spring-cloud-contract</module>
         <module>spring-cloud-kubernetes</module>
+        <module>spring-cloud-vault</module>
     </modules>
 
     <build>
diff --git a/spring-cloud/spring-cloud-vault/.gitignore b/spring-cloud/spring-cloud-vault/.gitignore
new file mode 100644
index 0000000000..e6237b6f81
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/.gitignore
@@ -0,0 +1,29 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+## Extra
+/vault-data/
+*.log
diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/spring-cloud/spring-cloud-vault/pom.xml
new file mode 100644
index 0000000000..29141534c3
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/pom.xml
@@ -0,0 +1,90 @@
+<?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>org.baeldung.spring.cloud</groupId>
+	<artifactId>spring-cloud-vault</artifactId>
+	<packaging>jar</packaging>
+
+	<name>spring-cloud-vault</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-boot-2</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../parent-boot-2</relativePath>
+	</parent>
+
+	<!-- <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> 
+		<version>2.0.4.RELEASE</version> <relativePath/> </parent> -->
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
+	</properties>
+
+	<dependencies>
+	
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-rest</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		
+		
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-vault-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-vault-config-databases</artifactId>
+		</dependency>
+
+	</dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>
diff --git a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java
new file mode 100644
index 0000000000..81ece1ca4c
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java
@@ -0,0 +1,12 @@
+package org.baeldung.spring.cloud.vaultsample;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class VaultSampleApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(VaultSampleApplication.class, args);
+	}
+}
diff --git a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java
new file mode 100644
index 0000000000..042cbbb09d
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java
@@ -0,0 +1,58 @@
+package org.baeldung.spring.cloud.vaultsample.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.validation.constraints.NotNull;
+
+@Entity
+public class Account {
+    
+    @Id
+    private Long id;
+    
+    @NotNull
+    private String name;
+    
+    @NotNull
+    private Long branchId;
+    
+    @NotNull
+    private Long customerId;
+    
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getBranchId() {
+        return branchId;
+    }
+
+    public void setBranchId(Long branchId) {
+        this.branchId = branchId;
+    }
+
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    
+    
+
+}
diff --git a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/repository/AccountRepository.java b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/repository/AccountRepository.java
new file mode 100644
index 0000000000..e1f5583571
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/repository/AccountRepository.java
@@ -0,0 +1,10 @@
+package org.baeldung.spring.cloud.vaultsample.repository;
+
+import org.baeldung.spring.cloud.vaultsample.domain.Account;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource(collectionResourceRel="accounts", path="accounts")
+public interface AccountRepository extends PagingAndSortingRepository<Account, Long> {
+
+}
diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/application.yml b/spring-cloud/spring-cloud-vault/src/main/resources/application.yml
new file mode 100644
index 0000000000..3d347ec855
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/main/resources/application.yml
@@ -0,0 +1,6 @@
+spring:
+  application:
+    name: fakebank
+    
+  datasource:
+    url: jdbc:mysql://localhost:3306/fakebank
diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml b/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000..1dcffc021a
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
@@ -0,0 +1,37 @@
+spring:
+  cloud:
+    vault:
+      uri: https://localhost:8200
+      connection-timeout: 5000
+      read-timeout: 15000
+      config:
+          order: -10
+          
+      token: b93d1b0d-15b5-f69e-d311-352a65fa7bc8
+      ssl:
+        trust-store: classpath:/vault.jks
+        trust-store-password: changeit
+      
+      generic:
+        enabled: true
+        application-name: fakebank
+        
+      kv:
+        enabled: true
+        backend: kv
+        application-name: fakebank
+        
+      database:
+        enabled: true
+        role: fakebank-accounts-rw
+#        username-property: spring.datasource.username
+#        password-property: spring.datasource.password
+        
+              
+        
+      
+      
+        
+      
+          
+          
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/vault.jks b/spring-cloud/spring-cloud-vault/src/main/resources/vault.jks
new file mode 100644
index 0000000000000000000000000000000000000000..70907075432856883494aa93cda8fa55db51e836
GIT binary patch
literal 833
zcmezO_TO6u1_mY|W(3omIr+(nIT`uIB|wo>&G@Cp46G4)rUsTkMgI+&n0^~HF+N_v
z%*4pV#L2MA=*fcwi)97|ylk9WZ60mkc^Mg5Ss4sO4228?*qB3En0XN98OVwA8d?}w
z7+4w@8k-s$MTzqofw*Q+E)HEyj7rGHGqN%;H!<=v0G+|b)WpchaP*Pfg38kNLiPAr
zxr#fVv3)nWWnOO_J;|zm3zO=VP`ML2o9zFzxa|~~B$)h&!+v!bd%*kqThH>B>_5r6
z)X`_<=gktD@5Jm&9aYkn-hAC3e$nfsqIl_jKHvA@-1hPPJzB38Ig1uPHT~qYn_I1K
zmddGw$hCh(PCD#tbvl)%S{&51?sL!wg;T#Ip4yz8zgf?#?RebU>SdK_Kg*soF`Nv#
zU*x{P>E=b(+a5E6yC=u%PIar0*L|~n`MX8)UC#B`$p{?EI>aj7r(`qxhl_`%+}22~
zi@92pT;n5zi_gzmB~cuhC+2w2?vk;yUfj!lE8MK-@3`Z@X~|;t>w0BUD943MH<_3j
z85kD_82A~;0z+Juk420{q)ge_|F|0KUAC&8M@HxSau(F-%Nxjpq?K7D48$6+E8qbs
z5N2UDU}j|ej~wQ}C<TT&BZJ8N->;SCZ24OfdFY4Sy6w|4TbG=E^TG6wdRnWw%dMZT
zHi;W<2>dAiq1htMuBq%Ud~eZOtJawQC(~C(<#I(n`Ol{E#JhHZ(e(Ku{((`ag?=dN
zeAqO9%DTn7F8xVKR(g`-l)Q6|$Ntz1t43#~c^Rx$^H`&pYL7fly7Kx*kHK^;Z@aC*
zbBx{MXYnhDT@Hx8c<EkX#<ql+MVH?n6l_iIR=Bk=NpJDnZ&Ggghn}?9n14Co)m<I#
z(j%Xe`{LJU)qO#_@!G$&jGGgJYW)_b`g9#&2sE#Gxn%XJvo})1`u%pQZa>~~`)+(w
zi2on1ln<^yqVlga&H6bjJF!stz5R{HS0hY6=}DjG-jdX_;D~t1P5z(XYa*&L0TSd&
AIsgCw

literal 0
HcmV?d00001

diff --git a/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java
new file mode 100644
index 0000000000..ea782a5a6b
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java
@@ -0,0 +1,66 @@
+package org.baeldung.spring.cloud.vaultsample;
+
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.env.Environment;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.vault.annotation.VaultPropertySource;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class VaultSampleApplicationLiveTest {
+
+    @Autowired
+    Environment env;
+
+    @Autowired
+    DataSource datasource;
+
+    @Test
+    public void whenGenericBackendEnabled_thenEnvHasAccessToVaultSecrets() {
+
+        String fooValue = env.getProperty("foo");
+        assertEquals("bar", fooValue);
+
+    }
+    
+    @Test
+    public void whenKvBackendEnabled_thenEnvHasAccessToVaultSecrets() {
+
+        String fooValue = env.getProperty("foo.versioned");
+        assertEquals("bar1", fooValue);
+
+
+    }
+    
+
+    @Test
+    public void whenDatabaseBackendEnabled_thenDatasourceUsesVaultCredentials() {
+
+        try (Connection c = datasource.getConnection()) {
+
+            ResultSet rs = c.createStatement()
+              .executeQuery("select 1");
+            
+            rs.next();
+            Long value = rs.getLong(1);
+
+            assertEquals(Long.valueOf(1), value);
+
+        } catch (SQLException sex) {
+            throw new RuntimeException(sex);
+        }
+
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties b/spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties
new file mode 100644
index 0000000000..d5c8100f98
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties
@@ -0,0 +1,3 @@
+#spring.cloud.vault.token=b93d1b0d-15b5-f69e-d311-352a65fa7bc8
+
+logging.level.org.springframework=INFO
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-vault/src/test/resources/vault.jks b/spring-cloud/spring-cloud-vault/src/test/resources/vault.jks
new file mode 100644
index 0000000000000000000000000000000000000000..70907075432856883494aa93cda8fa55db51e836
GIT binary patch
literal 833
zcmezO_TO6u1_mY|W(3omIr+(nIT`uIB|wo>&G@Cp46G4)rUsTkMgI+&n0^~HF+N_v
z%*4pV#L2MA=*fcwi)97|ylk9WZ60mkc^Mg5Ss4sO4228?*qB3En0XN98OVwA8d?}w
z7+4w@8k-s$MTzqofw*Q+E)HEyj7rGHGqN%;H!<=v0G+|b)WpchaP*Pfg38kNLiPAr
zxr#fVv3)nWWnOO_J;|zm3zO=VP`ML2o9zFzxa|~~B$)h&!+v!bd%*kqThH>B>_5r6
z)X`_<=gktD@5Jm&9aYkn-hAC3e$nfsqIl_jKHvA@-1hPPJzB38Ig1uPHT~qYn_I1K
zmddGw$hCh(PCD#tbvl)%S{&51?sL!wg;T#Ip4yz8zgf?#?RebU>SdK_Kg*soF`Nv#
zU*x{P>E=b(+a5E6yC=u%PIar0*L|~n`MX8)UC#B`$p{?EI>aj7r(`qxhl_`%+}22~
zi@92pT;n5zi_gzmB~cuhC+2w2?vk;yUfj!lE8MK-@3`Z@X~|;t>w0BUD943MH<_3j
z85kD_82A~;0z+Juk420{q)ge_|F|0KUAC&8M@HxSau(F-%Nxjpq?K7D48$6+E8qbs
z5N2UDU}j|ej~wQ}C<TT&BZJ8N->;SCZ24OfdFY4Sy6w|4TbG=E^TG6wdRnWw%dMZT
zHi;W<2>dAiq1htMuBq%Ud~eZOtJawQC(~C(<#I(n`Ol{E#JhHZ(e(Ku{((`ag?=dN
zeAqO9%DTn7F8xVKR(g`-l)Q6|$Ntz1t43#~c^Rx$^H`&pYL7fly7Kx*kHK^;Z@aC*
zbBx{MXYnhDT@Hx8c<EkX#<ql+MVH?n6l_iIR=Bk=NpJDnZ&Ggghn}?9n14Co)m<I#
z(j%Xe`{LJU)qO#_@!G$&jGGgJYW)_b`g9#&2sE#Gxn%XJvo})1`u%pQZa>~~`)+(w
zi2on1ln<^yqVlga&H6bjJF!stz5R{HS0hY6=}DjG-jdX_;D~t1P5z(XYa*&L0TSd&
AIsgCw

literal 0
HcmV?d00001

diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.cert b/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.cert
new file mode 100644
index 0000000000..6a598df419
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.cert
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeOgAwIBAgIJAKoy5OBgOKYwMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAeFw0xODA4MDkwMTM1MzJaFw0yODA4MDYwMTM1MzJaMBQx
+EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMXiHqB5dYdxJ1+abSG55gb3NNo3fzNbkjp/tAIl1FUeyCyyP/yERrkUkhFj
+4gg/q1YHUO/ftc0PdL/JBaVBTKnzsxgp7hY/dUEkZqXZ649X0UrJIRd13w5N71cL
+P1+PjCrqokMVceU18kK7CyaOmiTKYFmt/RTJQLmFQspmJXNSiq7zUvAgyvoY5TzJ
+n7MuSobHXq17pnlm+XbnAgDJUt9yR6BC2dFF20iZU4uTXy2VRngfLey3p+6in0TO
+jD4cEMJqwgUbjiI8m/hESCketVkq0W0qkkVfWBNzz5qqGHNRbhZBwT7SM0MuXum+
+qEY7n7jcQAk5BDb613liVQjQ0tkCAwEAAaNQME4wHQYDVR0OBBYEFHYjQ0/HJgXd
+BnqM4jLPjmygfi8fMB8GA1UdIwQYMBaAFHYjQ0/HJgXdBnqM4jLPjmygfi8fMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABSf++sinLT9dFnC+B6ut5Zp
+haTL7PA1/CdmhTdE2vlFPGGw2BD4c/gphBsHKSNHE96irTqFXI/kl6labQpZ5P8G
+JORLfaAyl58UT1FayxL4ISzwsp+UrqO60vxkYyLkbEJjuaxIv11oOoFDIp5oBTqe
+BVoCfcTjYtTr+IwwlypLPrVTnDNGX5oPIBbTUFvR0t5RaLZgmXLT78ERhWOLINqh
+Yi6j7fYaRm/C5IQ8N/TASot7V0SMH2Rt6PrzJb5SLV8r+yozg2BSfU6hZUyKwABR
+N3zppKvKzdhlVo9OuSW3x4Tb3V+CVE/8CmTwRfhab9SCmvmaa2FxI+8/2OPVWDU=
+-----END CERTIFICATE-----
diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.key b/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.key
new file mode 100644
index 0000000000..eba611823a
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAxeIeoHl1h3EnX5ptIbnmBvc02jd/M1uSOn+0AiXUVR7ILLI/
+/IRGuRSSEWPiCD+rVgdQ79+1zQ90v8kFpUFMqfOzGCnuFj91QSRmpdnrj1fRSskh
+F3XfDk3vVws/X4+MKuqiQxVx5TXyQrsLJo6aJMpgWa39FMlAuYVCymYlc1KKrvNS
+8CDK+hjlPMmfsy5KhsderXumeWb5ducCAMlS33JHoELZ0UXbSJlTi5NfLZVGeB8t
+7Len7qKfRM6MPhwQwmrCBRuOIjyb+ERIKR61WSrRbSqSRV9YE3PPmqoYc1FuFkHB
+PtIzQy5e6b6oRjufuNxACTkENvrXeWJVCNDS2QIDAQABAoIBACEyB5VACtlHwCUn
+kLshplbwzWr1+F6zM9qgZaAenHoTCd2FoXpI7lxJ+R71tItRsvphi9BRpPvbZehu
+XoYUaDnyac7Z6djNmGvvIVEdN4j6YF+9UdHPsjWCGW5uspjjSc5BQisiw9KBtDxB
+iGNVdMJLONKSf2wnPrZgho3RiOLJX/poPyGTkMHuhBVvo4oy7Ax3XalaAcufgqwm
+YBQJ1Tka+33EUiLkxzJTXxNbIAI2scP8jhGn6mokS0V4gZPxJKUZEyydXRWwi6ex
+ua/7q76ELJS5b+xKRYfGsvavFDx8R+LqX8oegALD33ki3rm1MQW7GmikRL98+EVW
+Q9mQsqECgYEA/IrP8vycbJOgn1vriNItFcZtczSBlrXCRF0up2cqKMs9c+T5i51x
+ZKXK5lo3DfMT+YDM+iiGZ9+vM0UA2VxbFD3XV9mQDBaNC+Duknqxx+OLmWva9YwR
+nMaevqVV9LCn+GgUcK+IygEnpzpdP4q8YcXAfGAnZgnihN/AUYAaB70CgYEAyJe4
+yO0S9gAH5aoDdooL0YXrH/Dzd+fAgNsawLhoOltcoZqZFWeAllM0GsrCpfTRltuy
+dn9ca3YK0GlWl7h5rDle1HO3nhp1FcpeG1oxmkeQta3PG66uUuMccTAljCLFrEe3
+DguH8+qdjhLk+ZnUB9AVkS79pzdwuEHVljCK600CgYB6mMygkh9B2lzkX9Q0xItc
+gcqKXdf3GN9pHq9SVxOxYBDCHUtDirgMeyvHrc4COJneyrc3TcsJzB4aToo9+sbA
+SdErdZOnOp9YP+axN1zsw7r2TNSr1UaLjCRuOodC1SuFvMkHdz95iRv946h2+1u+
+PyjVeDxIHc5YYOLU7dI1JQKBgQDF5KDBYNm25brkwcCe3nvgXfzjyyN25KUOupn/
+DS6Oe/m72Lgz3KOIKleaIvS7IvbunJnIu8dioNb0Wye5kJ5A4WyDrhG1IabnM3l6
+BJYw/W9vPSS4y7FhRnuV0wkH4nofh7S5X3jlk02Sj2NkN3Vtq8TLMY++uzwyG4jq
+ncM/dQKBgQC+6mA5OfbVN4lRn+zrSiIH5gpvZYPh9wXeTnDWHa13sJsu3e8AQxtk
+TfE0W13UV5jhGL8Wvyyxn+doGFTdcZapOlwuoQ6RcgHcVQm2sOl60GAa4idmm0A6
+TcgnIOTyVRlNBoWLCfN83BlGz4gcDpnuZZ/0JuguixgLS323hQlLvg==
+-----END RSA PRIVATE KEY-----
diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl b/spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl
new file mode 100644
index 0000000000..c880f2d744
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl
@@ -0,0 +1,20 @@
+/*
+ * Sample configuration file for tests
+ */
+ 
+// Enable UI
+ui = true
+
+// Filesystem storage
+storage "file" {
+  path    = "./vault-data"
+}
+
+// TCP Listener using a self-signed certificate
+listener "tcp" {
+  address     = "127.0.0.1:8200"
+  tls_cert_file = "./src/test/vault-config/localhost.cert"
+  tls_key_file = "./src/test/vault-config/localhost.key"
+}
+
+
diff --git a/spring-cloud/spring-cloud-vault/vault-cheatsheet.txt b/spring-cloud/spring-cloud-vault/vault-cheatsheet.txt
new file mode 100644
index 0000000000..b965a95321
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/vault-cheatsheet.txt
@@ -0,0 +1,82 @@
+== Vault server bootstrap
+
+1. Run vaul-start in one shell
+
+2. Open another shell and execute the command below:
+> vault operator init
+
+Vault will output the unseal keys and root token: STORE THEM SAFELY !!!
+
+Example output:
+Unseal Key 1: OfCseaSZzjTZmrxhfx+5clKobwLGCNiJdAlfixSG9E3o
+Unseal Key 2: iplVLPTHW0n0WL5XuI6QWwyNtWbKTek1SoKcG0gR7vdT
+Unseal Key 3: K0TleK3OYUvWFF+uIDsQuf5a+/gkv1PtZ3O47ornzRoF
+Unseal Key 4: +5zhysLAO4hIdZs0kiZpkrRovw11uQacfloiBwnZBJA/
+Unseal Key 5: GDwSq18lXV3Cw4MoHsKIH137kuI0mdl36UiD9WxOdulc
+
+Initial Root Token: d341fdaf-1cf9-936a-3c38-cf5eec94b5c0
+
+...
+
+== Admin token setup
+
+1. Set the VAULT_TOKEN environment variable with the root token value 
+export VAULT_TOKEN=d341fdaf-1cf9-936a-3c38-cf5eec94b5c0 (Linux) 
+set VAULT_TOKEN=d341fdaf-1cf9-936a-3c38-cf5eec94b5c0 (Windows)
+
+2. Create another admin token
+
+>vault token create -display-name=admin
+Key                  Value
+---                  -----
+token                3779c3ca-9f5e-1d8f-3842-efa96d88de43  <=== this is the new root token
+token_accessor       2dfa4031-973b-cf88-c749-ee6f520ecaea
+token_duration       ∞
+token_renewable      false
+token_policies       ["root"]
+identity_policies    []
+policies             ["root"]
+
+3. Create ~/.vault-secret with your root token
+4. Unset the VAULT_TOKEN environment variable !
+
+=== Test DB setup (MySQL only, for now)
+
+1. Create test db
+2. Create admin account used to create dynamic accounts:
+
+create schema fakebank;
+create user 'fakebank-admin'@'%' identified by 'Sup&rSecre7!'
+grant all privileges on fakebank.* to 'fakebank-admin'@'%' with grant option;
+grant create user on *.* to 'fakebank-admin' with grant option;
+flush privileges;
+
+
+=== Database secret backend setup
+> vault secrets enable database
+
+==== Create db configuration
+> vault write database/config/mysql-fakebank ^
+  plugin_name=mysql-legacy-database-plugin ^
+  connection_url="{{username}}:{{password}}@tcp(127.0.0.1:3306)/fakebank" ^
+  allowed_roles="*" ^
+  username="fakebank-admin" ^
+  password="Sup&rSecre7!" 
+  
+==== Create roles
+> vault write database/roles/fakebank-accounts-ro ^
+    db_name=mysql-fakebank ^
+    creation_statements="CREATE USER '{{name}}'@'%' IDENTIFIED BY '{{password}}';GRANT SELECT ON fakebank.* TO '{{name}}'@'%';" ^
+    default_ttl="1h" ^
+    max_ttl="24h"  
+
+> vault write database/roles/fakebank-accounts-rw ^
+    db_name=mysql-fakebank ^
+    creation_statements="CREATE USER '{{name}}'@'%' IDENTIFIED BY '{{password}}';GRANT SELECT,INSERT,UPDATE ON fakebank.* TO '{{name}}'@'%';" ^
+    default_ttl="1m" ^
+    max_ttl="2m"  
+	
+=== Get credentials
+> vault read database/creds/fakebank-accounts-rw
+
+
diff --git a/spring-cloud/spring-cloud-vault/vault-env.bat b/spring-cloud/spring-cloud-vault/vault-env.bat
new file mode 100644
index 0000000000..f1831a547f
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/vault-env.bat
@@ -0,0 +1,5 @@
+@echo off
+echo Setting environment variables to access local vault..
+set VAULT_ADDR=https://localhost:8200
+set VAULT_CACERT=%~dp0%/src/test/vault-config/localhost.cert
+set VAULT_TLS_SERVER_NAME=localhost
diff --git a/spring-cloud/spring-cloud-vault/vault-env.sh b/spring-cloud/spring-cloud-vault/vault-env.sh
new file mode 100644
index 0000000000..8814860410
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/vault-env.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+echo Setting environment variables to access local vault..
+SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
+export VAULT_ADDR=https://localhost:8200
+export VAULT_CACERT=$SCRIPTPATH/src/test/vault-config/localhost.cert
+export VAULT_TLS_SERVER_NAME=localhost
diff --git a/spring-cloud/spring-cloud-vault/vault-start.bat b/spring-cloud/spring-cloud-vault/vault-start.bat
new file mode 100644
index 0000000000..e8f6ce4c9f
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/vault-start.bat
@@ -0,0 +1,3 @@
+echo Starting vault server...
+pushd %~dp0%
+vault server -config %~dp0%/src/test/vault-config/vault-test.hcl
diff --git a/spring-cloud/spring-cloud-vault/vault-start.sh b/spring-cloud/spring-cloud-vault/vault-start.sh
new file mode 100644
index 0000000000..d5af7cfee6
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/vault-start.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
+pushd $SCRIPTPATH
+echo Starting vault server...
+vault server -config $SCRIPTPATH/src/test/vault-config/vault-test.hcl
diff --git a/spring-cloud/spring-cloud-vault/vault-unseal.bat b/spring-cloud/spring-cloud-vault/vault-unseal.bat
new file mode 100644
index 0000000000..8133f90892
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/vault-unseal.bat
@@ -0,0 +1,7 @@
+
+call %~dp0%/vault-env.bat
+
+vault operator unseal OfCseaSZzjTZmrxhfx+5clKobwLGCNiJdAlfixSG9E3o
+vault operator unseal iplVLPTHW0n0WL5XuI6QWwyNtWbKTek1SoKcG0gR7vdT
+vault operator unseal iplVLPTHW0n0WL5XuI6QWwyNtWbKTek1SoKcG0gR7vdT
+vault operator unseal K0TleK3OYUvWFF+uIDsQuf5a+/gkv1PtZ3O47ornzRoF
diff --git a/spring-cloud/spring-cloud-vault/vault-unseal.sh b/spring-cloud/spring-cloud-vault/vault-unseal.sh
new file mode 100644
index 0000000000..699b383801
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/vault-unseal.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
+. $SCRIPTPATH/vault-env.sh
+
+# Please replace the unseal keys below for your own
+vault operator unseal OfCseaSZzjTZmrxhfx+5clKobwLGCNiJdAlfixSG9E3o
+vault operator unseal iplVLPTHW0n0WL5XuI6QWwyNtWbKTek1SoKcG0gR7vdT
+vault operator unseal K0TleK3OYUvWFF+uIDsQuf5a+/gkv1PtZ3O47ornzRoF

From 4798036089d1db858d60a045e8fa4ebd84070ed4 Mon Sep 17 00:00:00 2001
From: Priyesh Mashelkar <mashelkar.priyesh@gmail.com>
Date: Tue, 4 Sep 2018 00:01:25 +0100
Subject: [PATCH 008/114] Added entities and basic select

---
 .../hibernate/entities/Department.java        | 16 +++++++
 .../baeldung/hibernate/entities/Employee.java | 47 +++++++++++++++++++
 .../hibernate/CustomClassIntegrationTest.java | 36 ++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java
 create mode 100644 hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java

diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
new file mode 100644
index 0000000000..12a9bda5f9
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
@@ -0,0 +1,16 @@
+package com.baeldung.hibernate.entities;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity
+public class Department {
+    @Id
+    long id;
+    String name;
+    @OneToMany(mappedBy="department")
+    List<Employee> employees;
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java
new file mode 100644
index 0000000000..8b5c554c44
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java
@@ -0,0 +1,47 @@
+package com.baeldung.hibernate.entities;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Employee {
+    @Id
+    long id;
+    String employeeNumber;
+    String name;
+    String designation;
+    @ManyToOne    
+    Department department;
+    
+    public long getId() {
+        return id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public String getEmployeeNumber() {
+        return employeeNumber;
+    }
+    public void setEmployeeNumber(String employeeNumber) {
+        this.employeeNumber = employeeNumber;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getDesignation() {
+        return designation;
+    }
+    public void setDesignation(String designation) {
+        this.designation = designation;
+    }
+    public Department getDepartment() {
+        return department;
+    }
+    public void setDepartment(Department department) {
+        this.department = department;
+    }
+}
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
new file mode 100644
index 0000000000..8b2fd4854d
--- /dev/null
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.hibernate;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
+
+class CustomClassIntegrationTest {
+
+    private Session session;
+
+    private Transaction transaction;
+
+    @Before
+    public void setUp() throws IOException {
+        session = HibernateUtil.getSessionFactory().openSession();
+        transaction = session.beginTransaction();
+        session.createNativeQuery("delete from employee").executeUpdate();
+        session.createNativeQuery("delete from department").executeUpdate();
+        transaction.commit();
+    }
+    
+    @Test
+    void whenAllEmployeesSelected_ThenObjectGraphReturned() {
+        Query query = session.createQuery("from employee");
+        List employees = query.list();
+    }
+
+}

From 723068246bd31c0b70ba8b800221600c961a4e42 Mon Sep 17 00:00:00 2001
From: Philippe <phil@lighthouse.com.br>
Date: Tue, 4 Sep 2018 00:46:58 -0300
Subject: [PATCH 009/114] [BAEL-2166]/[BAEL-455]

---
 spring-cloud/spring-cloud-vault/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/spring-cloud/spring-cloud-vault/pom.xml
index afda1661c5..b5cf1b4094 100644
--- a/spring-cloud/spring-cloud-vault/pom.xml
+++ b/spring-cloud/spring-cloud-vault/pom.xml
@@ -58,10 +58,6 @@
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>	</artifactId>
-		</dependency>
 
 	</dependencies>
 

From fbe433ebb47a6306028a3878de2b053e8597c8eb Mon Sep 17 00:00:00 2001
From: Priyesh Mashelkar <mashelkar.priyesh@gmail.com>
Date: Wed, 5 Sep 2018 00:13:08 +0100
Subject: [PATCH 010/114] Added Result

---
 .../hibernate/entities/Department.java        | 19 +++++++++++++
 .../baeldung/hibernate/entities/Employee.java |  1 +
 .../com/baeldung/hibernate/pojo/Result.java   | 27 +++++++++++++++++++
 .../hibernate/CustomClassIntegrationTest.java | 21 +++++++++++----
 4 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java

diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
index 12a9bda5f9..fec7b04462 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 public class Department {
@@ -13,4 +14,22 @@ public class Department {
     String name;
     @OneToMany(mappedBy="department")
     List<Employee> employees;
+    public long getId() {
+        return id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public List<Employee> getEmployees() {
+        return employees;
+    }
+    public void setEmployees(List<Employee> employees) {
+        this.employees = employees;
+    }
 }
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java
index 8b5c554c44..eec7c54d93 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java
@@ -3,6 +3,7 @@ package com.baeldung.hibernate.entities;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 public class Employee {
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
new file mode 100644
index 0000000000..6893060dd8
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
@@ -0,0 +1,27 @@
+package com.baeldung.hibernate.pojo;
+
+public class Result {
+    String employeeName;
+    String departmentName;
+    
+    public Result(String employeeName, String departmentName) {
+        this.employeeName = employeeName;
+        this.departmentName = departmentName;
+    }
+
+    public String getEmployeeName() {
+        return employeeName;
+    }
+
+    public void setEmployeeName(String employeeName) {
+        this.employeeName = employeeName;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+}
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
index 8b2fd4854d..c2ccef5c85 100644
--- a/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
@@ -10,27 +10,38 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.query.Query;
 import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import com.baeldung.hibernate.pojo.Result;
+
 class CustomClassIntegrationTest {
 
     private Session session;
 
     private Transaction transaction;
 
-    @Before
+    @BeforeEach
     public void setUp() throws IOException {
         session = HibernateUtil.getSessionFactory().openSession();
         transaction = session.beginTransaction();
-        session.createNativeQuery("delete from employee").executeUpdate();
-        session.createNativeQuery("delete from department").executeUpdate();
+        session.createNativeQuery("delete from emp").executeUpdate();
+        session.createNativeQuery("delete from dept").executeUpdate();
         transaction.commit();
+        transaction = session.beginTransaction();
     }
     
     @Test
-    void whenAllEmployeesSelected_ThenObjectGraphReturned() {
-        Query query = session.createQuery("from employee");
+    public void whenAllEmployeesSelected_ThenObjectGraphReturned() {
+        @SuppressWarnings("unchecked")
+        Query<Object> query = session.createQuery("from Employee");
         List employees = query.list();
     }
 
+    
+    @Test
+    public void whenResultConstructorInSelect_ThenListOfResultReturned() {
+        Query query = session.createQuery("select new Result(e.name, e.department.name) from Employee e");
+        List<Result> employees = query.list();
+    }
 }

From a50baf1be379bc5e339e0db881301f7c7f76cf13 Mon Sep 17 00:00:00 2001
From: priyeshmashelkar <mashelkar.priyesh@gmail.com>
Date: Wed, 5 Sep 2018 17:27:25 +0100
Subject: [PATCH 011/114] Added tests

---
 .../com/baeldung/hibernate/HibernateUtil.java | 46 ++++++++++++----
 .../hibernate/entities/Department.java        | 12 +++--
 .../entities/{Employee.java => Manager.java}  | 16 +++---
 .../com/baeldung/hibernate/pojo/Result.java   |  3 ++
 .../hibernate/CustomClassIntegrationTest.java | 54 ++++++++++++++-----
 5 files changed, 94 insertions(+), 37 deletions(-)
 rename hibernate5/src/main/java/com/baeldung/hibernate/entities/{Employee.java => Manager.java} (78%)

diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
index e8fdabebbc..c75f8e358f 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
@@ -1,12 +1,10 @@
 package com.baeldung.hibernate;
 
-import com.baeldung.hibernate.pessimisticlocking.Individual;
-import com.baeldung.hibernate.pessimisticlocking.PessimisticLockingCourse;
-import com.baeldung.hibernate.pessimisticlocking.PessimisticLockingEmployee;
-import com.baeldung.hibernate.pessimisticlocking.PessimisticLockingStudent;
-import com.baeldung.hibernate.pojo.*;
-import com.baeldung.hibernate.pojo.Person;
-import com.baeldung.hibernate.pojo.inheritance.*;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.Metadata;
@@ -14,10 +12,34 @@ import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.service.ServiceRegistry;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
+import com.baeldung.hibernate.pessimisticlocking.Individual;
+import com.baeldung.hibernate.pessimisticlocking.PessimisticLockingCourse;
+import com.baeldung.hibernate.pessimisticlocking.PessimisticLockingEmployee;
+import com.baeldung.hibernate.pessimisticlocking.PessimisticLockingStudent;
+import com.baeldung.hibernate.pojo.Course;
+import com.baeldung.hibernate.pojo.Employee;
+import com.baeldung.hibernate.pojo.EntityDescription;
+import com.baeldung.hibernate.pojo.OrderEntry;
+import com.baeldung.hibernate.pojo.OrderEntryIdClass;
+import com.baeldung.hibernate.pojo.OrderEntryPK;
+import com.baeldung.hibernate.pojo.Person;
+import com.baeldung.hibernate.pojo.Phone;
+import com.baeldung.hibernate.pojo.PointEntity;
+import com.baeldung.hibernate.pojo.PolygonEntity;
+import com.baeldung.hibernate.pojo.Product;
+import com.baeldung.hibernate.pojo.Student;
+import com.baeldung.hibernate.pojo.TemporalValues;
+import com.baeldung.hibernate.pojo.User;
+import com.baeldung.hibernate.pojo.UserProfile;
+import com.baeldung.hibernate.pojo.inheritance.Animal;
+import com.baeldung.hibernate.pojo.inheritance.Bag;
+import com.baeldung.hibernate.pojo.inheritance.Book;
+import com.baeldung.hibernate.pojo.inheritance.Car;
+import com.baeldung.hibernate.pojo.inheritance.MyEmployee;
+import com.baeldung.hibernate.pojo.inheritance.MyProduct;
+import com.baeldung.hibernate.pojo.inheritance.Pen;
+import com.baeldung.hibernate.pojo.inheritance.Pet;
+import com.baeldung.hibernate.pojo.inheritance.Vehicle;
 
 public class HibernateUtil {
     private static SessionFactory sessionFactory;
@@ -70,6 +92,8 @@ public class HibernateUtil {
         metadataSources.addAnnotatedClass(PessimisticLockingCourse.class);
         metadataSources.addAnnotatedClass(com.baeldung.hibernate.pessimisticlocking.Customer.class);
         metadataSources.addAnnotatedClass(com.baeldung.hibernate.pessimisticlocking.Address.class);
+        metadataSources.addAnnotatedClass(com.baeldung.hibernate.entities.Manager.class);
+        metadataSources.addAnnotatedClass(com.baeldung.hibernate.entities.Department.class);
 
         Metadata metadata = metadataSources.buildMetadata();
         return metadata.getSessionFactoryBuilder()
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
index fec7b04462..ceabfc742e 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
@@ -5,7 +5,6 @@ import java.util.List;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
-import javax.persistence.Table;
 
 @Entity
 public class Department {
@@ -13,7 +12,12 @@ public class Department {
     long id;
     String name;
     @OneToMany(mappedBy="department")
-    List<Employee> employees;
+    List<Manager> employees;
+
+    public Department(String name) {
+        this.name = name;
+    }
+
     public long getId() {
         return id;
     }
@@ -26,10 +30,10 @@ public class Department {
     public void setName(String name) {
         this.name = name;
     }
-    public List<Employee> getEmployees() {
+    public List<Manager> getEmployees() {
         return employees;
     }
-    public void setEmployees(List<Employee> employees) {
+    public void setEmployees(List<Manager> employees) {
         this.employees = employees;
     }
 }
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Manager.java
similarity index 78%
rename from hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java
rename to hibernate5/src/main/java/com/baeldung/hibernate/entities/Manager.java
index eec7c54d93..d9d8e8d40f 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Employee.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Manager.java
@@ -3,18 +3,22 @@ package com.baeldung.hibernate.entities;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.Table;
 
 @Entity
-public class Employee {
+public class Manager {
     @Id
     long id;
     String employeeNumber;
     String name;
-    String designation;
     @ManyToOne    
     Department department;
     
+    public Manager(String name, String employeeNumber, Department department) {
+        this.name = name;
+        this.employeeNumber = employeeNumber;
+        this.department = department;
+    }
+
     public long getId() {
         return id;
     }
@@ -33,12 +37,6 @@ public class Employee {
     public void setName(String name) {
         this.name = name;
     }
-    public String getDesignation() {
-        return designation;
-    }
-    public void setDesignation(String designation) {
-        this.designation = designation;
-    }
     public Department getDepartment() {
         return department;
     }
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
index 6893060dd8..588a895c14 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
@@ -9,6 +9,9 @@ public class Result {
         this.departmentName = departmentName;
     }
 
+    public Result() {
+    }
+
     public String getEmployeeName() {
         return employeeName;
     }
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
index c2ccef5c85..622063b828 100644
--- a/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
@@ -1,18 +1,19 @@
 package com.baeldung.hibernate;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.TimeZone;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.query.Query;
-import org.junit.Before;
+import org.hibernate.transform.Transformers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import com.baeldung.hibernate.entities.Department;
+import com.baeldung.hibernate.entities.Manager;
 import com.baeldung.hibernate.pojo.Result;
 
 class CustomClassIntegrationTest {
@@ -25,23 +26,50 @@ class CustomClassIntegrationTest {
     public void setUp() throws IOException {
         session = HibernateUtil.getSessionFactory().openSession();
         transaction = session.beginTransaction();
-        session.createNativeQuery("delete from emp").executeUpdate();
-        session.createNativeQuery("delete from dept").executeUpdate();
+        session.createNativeQuery("delete from manager").executeUpdate();
+        session.createNativeQuery("delete from department").executeUpdate();
+        Department department = new Department("Sales");
+        Manager employee = new Manager("John Smith", "001", department);
+        session.persist(department);
+        session.persist(employee);
         transaction.commit();
         transaction = session.beginTransaction();
     }
     
     @Test
-    public void whenAllEmployeesSelected_ThenObjectGraphReturned() {
-        @SuppressWarnings("unchecked")
-        Query<Object> query = session.createQuery("from Employee");
-        List employees = query.list();
+    public void whenAllManagersAreSelected_ThenObjectGraphIsReturned() {
+        Query<Manager> query = session.createQuery("from com.baeldung.hibernate.entities.Manager");
+        List<Manager> managers = query.list();
+        Manager manager = managers.get(0);
+        assertEquals("John Smith", manager.getName());
+        assertEquals("Sales", manager.getDepartment().getName());
     }
-
     
     @Test
-    public void whenResultConstructorInSelect_ThenListOfResultReturned() {
-        Query query = session.createQuery("select new Result(e.name, e.department.name) from Employee e");
-        List<Result> employees = query.list();
+    public void whenIndividualPropertiesAreSelected_ThenObjectArrayIsReturned() {
+        Query query = session.createQuery("select m.name, m.department.name from com.baeldung.hibernate.entities.Manager m");
+        List managers = query.list();
+        Object[] manager = (Object[]) managers.get(0);
+        assertEquals("John Smith", manager[0]);
+        assertEquals("Sales", manager[1]);
+    }
+    
+    @Test
+    public void whenResultConstructorInSelect_ThenListOfResultIsReturned() {
+        Query<Result> query = session.createQuery("select new com.baeldung.hibernate.pojo.Result(m.name, m.department.name) from Manager m");
+        List<Result> results = query.list();
+        Result result = results.get(0);
+        assertEquals("John Smith", result.getEmployeeName());
+        assertEquals("Sales", result.getDepartmentName());
+    }
+    
+    @Test
+    public void whenResultTransformerOnQuery_ThenListOfResultIsReturned() {
+        Query query = session.createQuery("select m.name as employeeName, m.department.name as departmentName from com.baeldung.hibernate.entities.Manager m");
+        query.setResultTransformer(Transformers.aliasToBean(Result.class));
+        List<Result> results = query.list();
+        Result result = results.get(0);
+        assertEquals("John Smith", result.getEmployeeName());
+        assertEquals("Sales", result.getDepartmentName());   
     }
 }

From 443df74d09f4a1971753996a6a395458dc57c2a8 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Thu, 6 Sep 2018 23:19:26 +0530
Subject: [PATCH 012/114] BAEL1426 - Kafka Transactional API. Updating the
 kafka-clients version to 2.0.0

---
 libraries/pom.xml                             |  41 ++++++-
 .../com/baeldung/kafka/TransactionalApp.java  | 102 ++++++++++++++++++
 2 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 libraries/src/main/java/com/baeldung/kafka/TransactionalApp.java

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 7402d88ef3..83d78af84f 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -795,8 +795,8 @@
             <url>http://dl.bintray.com/cuba-platform/main</url>
         </repository>
         <repository>
-            <id>Apache Staging</id>
-            <url>https://repository.apache.org/content/groups/staging</url>
+            <id>Maven Central</id>
+            <url>https://repo.maven.apache.org/maven2/</url>
         </repository>
     </repositories>
 
@@ -912,6 +912,41 @@
                 </executions>
             </plugin>
         </plugins>
+        <pluginManagement>
+        	<plugins>
+        		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        		<plugin>
+        			<groupId>org.eclipse.m2e</groupId>
+        			<artifactId>lifecycle-mapping</artifactId>
+        			<version>1.0.0</version>
+        			<configuration>
+        				<lifecycleMappingMetadata>
+        					<pluginExecutions>
+        						<pluginExecution>
+        							<pluginExecutionFilter>
+        								<groupId>
+        									org.apache.maven.plugins
+        								</groupId>
+        								<artifactId>
+        									maven-pmd-plugin
+        								</artifactId>
+        								<versionRange>
+        									[3.8,)
+        								</versionRange>
+        								<goals>
+        									<goal>check</goal>
+        								</goals>
+        							</pluginExecutionFilter>
+        							<action>
+        								<ignore></ignore>
+        							</action>
+        						</pluginExecution>
+        					</pluginExecutions>
+        				</lifecycleMappingMetadata>
+        			</configuration>
+        		</plugin>
+        	</plugins>
+        </pluginManagement>
     </build>
 
     <properties>
@@ -974,7 +1009,7 @@
         <caffeine.version>2.5.5</caffeine.version>
         <google-api.version>1.23.0</google-api.version>
         <google-sheets.version>v4-rev493-1.21.0</google-sheets.version>
-        <kafka.version>1.0.0</kafka.version>
+        <kafka.version>2.0.0</kafka.version>
         <smooks.version>1.7.0</smooks.version>
         <docker.version>3.0.14</docker.version>
         <tomcat.version>8.5.24</tomcat.version>
diff --git a/libraries/src/main/java/com/baeldung/kafka/TransactionalApp.java b/libraries/src/main/java/com/baeldung/kafka/TransactionalApp.java
new file mode 100644
index 0000000000..1e95041a0d
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/kafka/TransactionalApp.java
@@ -0,0 +1,102 @@
+package com.baeldung.kafka;
+
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.consumer.OffsetAndMetadata;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.KafkaException;
+import org.apache.kafka.common.TopicPartition;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import static java.time.Duration.ofSeconds;
+import static java.util.Collections.singleton;
+import static org.apache.kafka.clients.consumer.ConsumerConfig.*;
+import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.*;
+
+public class TransactionalApp {
+
+    private static final String CONSUMER_GROUP_ID = "test";
+    private static final String OUTPUT_TOPIC = "output";
+    private static final String INPUT_TOPIC = "input";
+
+    public static void main(String[] args) {
+
+        KafkaConsumer<String, String> consumer = initConsumer();
+        KafkaProducer<String, String> producer = initProducer();
+
+        producer.initTransactions();
+
+        try {
+
+            while (true) {
+
+                ConsumerRecords<String, String> records = consumer.poll(ofSeconds(20));
+
+                producer.beginTransaction();
+
+                for (ConsumerRecord record : records)
+                    producer.send(new ProducerRecord(OUTPUT_TOPIC, record));
+
+                Map<TopicPartition, OffsetAndMetadata> offsetsToCommit = new HashMap<>();
+
+                for (TopicPartition partition : records.partitions()) {
+                    List<ConsumerRecord<String, String>> partitionedRecords = records.records(partition);
+                    long offset = partitionedRecords.get(partitionedRecords.size() - 1).offset();
+
+                    offsetsToCommit.put(partition, new OffsetAndMetadata(offset));
+                }
+
+                producer.sendOffsetsToTransaction(offsetsToCommit, CONSUMER_GROUP_ID);
+                producer.commitTransaction();
+
+            }
+
+        } catch (KafkaException e) {
+
+            producer.abortTransaction();
+
+        }
+
+
+    }
+
+    private static KafkaConsumer<String, String> initConsumer() {
+        Properties props = new Properties();
+        props.put(BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+        props.put(GROUP_ID_CONFIG, CONSUMER_GROUP_ID);
+        props.put(ENABLE_AUTO_COMMIT_CONFIG, "false");
+        props.put(KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+        props.put(VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+
+        KafkaConsumer<String, String> consumer = new KafkaConsumer<>(props);
+        consumer.subscribe(singleton(INPUT_TOPIC));
+        return consumer;
+    }
+
+    private static KafkaProducer<String, String> initProducer() {
+
+        Properties props = new Properties();
+        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+        props.put(ACKS_CONFIG, "all");
+        props.put(RETRIES_CONFIG, 3);
+        props.put(BATCH_SIZE_CONFIG, 16384);
+        props.put(LINGER_MS_CONFIG, 1);
+        props.put(BUFFER_MEMORY_CONFIG, 33554432);
+        props.put(ENABLE_IDEMPOTENCE_CONFIG, "true");
+        props.put(TRANSACTIONAL_ID_CONFIG, "prod-1");
+        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+
+        return new KafkaProducer(props);
+
+    }
+
+}

From cc0749ce8a21ab16f0bb8111ee59188e30ffb051 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Thu, 6 Sep 2018 20:15:23 +0200
Subject: [PATCH 013/114] [BAEL-2170] Differences between ArrayList clear and
 removeAll

---
 .../list/arraylist/ClearVsRemoveAllTest.java  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllTest.java

diff --git a/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllTest.java b/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllTest.java
new file mode 100644
index 0000000000..5b9fbc3415
--- /dev/null
+++ b/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.list.arraylist;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Unit tests demonstrating differences between ArrayList#clear() and ArrayList#removeAll()
+ */
+class ClearVsRemoveAllTest {
+
+    /*
+     * Tests
+     */
+    @Test
+    void givenArrayListWithElements_whenClear_thenListBecomesEmpty() {
+        ArrayList<Integer> list = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
+
+        list.clear();
+
+        assertTrue(list.isEmpty());
+    }
+
+    @Test
+    void givenTwoArrayListsWithCommonElements_whenRemoveAll_thenFirstListMissElementsFromSecondList() {
+        ArrayList<Integer> firstList = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
+        ArrayList<Integer> secondList = new ArrayList<>(Arrays.asList(3, 4, 5, 6, 7));
+
+        firstList.removeAll(secondList);
+
+        assertEquals(Arrays.asList(1, 2), firstList);
+    }
+
+}

From a76e5fba254aacc37c291014a46fb9921f5df058 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Fri, 7 Sep 2018 21:44:49 +0530
Subject: [PATCH 014/114] BAEL1426 - Kafka Transactional API. Updating the
 kafka-clients version to 2.0.0

---
 libraries/pom.xml                             | 39 +------------------
 .../com/baeldung/jetty/HelloWorldServlet.java | 28 -------------
 libraries/src/main/webapp/WEB-INF/web.xml     | 10 -----
 libraries/src/main/webapp/helloworld.html     |  9 -----
 4 files changed, 2 insertions(+), 84 deletions(-)
 delete mode 100644 libraries/src/main/java/com/baeldung/jetty/HelloWorldServlet.java
 delete mode 100644 libraries/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 libraries/src/main/webapp/helloworld.html

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 83d78af84f..cff67791cd 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -795,8 +795,8 @@
             <url>http://dl.bintray.com/cuba-platform/main</url>
         </repository>
         <repository>
-            <id>Maven Central</id>
-            <url>https://repo.maven.apache.org/maven2/</url>
+            <id>Apache Staging</id>
+            <url>https://repository.apache.org/content/groups/staging</url>
         </repository>
     </repositories>
 
@@ -912,41 +912,6 @@
                 </executions>
             </plugin>
         </plugins>
-        <pluginManagement>
-        	<plugins>
-        		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        		<plugin>
-        			<groupId>org.eclipse.m2e</groupId>
-        			<artifactId>lifecycle-mapping</artifactId>
-        			<version>1.0.0</version>
-        			<configuration>
-        				<lifecycleMappingMetadata>
-        					<pluginExecutions>
-        						<pluginExecution>
-        							<pluginExecutionFilter>
-        								<groupId>
-        									org.apache.maven.plugins
-        								</groupId>
-        								<artifactId>
-        									maven-pmd-plugin
-        								</artifactId>
-        								<versionRange>
-        									[3.8,)
-        								</versionRange>
-        								<goals>
-        									<goal>check</goal>
-        								</goals>
-        							</pluginExecutionFilter>
-        							<action>
-        								<ignore></ignore>
-        							</action>
-        						</pluginExecution>
-        					</pluginExecutions>
-        				</lifecycleMappingMetadata>
-        			</configuration>
-        		</plugin>
-        	</plugins>
-        </pluginManagement>
     </build>
 
     <properties>
diff --git a/libraries/src/main/java/com/baeldung/jetty/HelloWorldServlet.java b/libraries/src/main/java/com/baeldung/jetty/HelloWorldServlet.java
deleted file mode 100644
index d730e70ad2..0000000000
--- a/libraries/src/main/java/com/baeldung/jetty/HelloWorldServlet.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.baeldung.jetty;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@WebServlet("/helloworld")
-public class HelloWorldServlet extends HttpServlet {
-
-    private static final long serialVersionUID = 2851388791344172542L;
-
-    @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        
-        PrintWriter writer = resp.getWriter();
-        writer.println("<!DOCTYPE html>");
-        writer.println("<html>");
-        writer.println("<body>");
-        writer.println("<p>Hello World!</p>");
-        writer.println("</body>");
-        writer.println("</html>");
-    }
-}
diff --git a/libraries/src/main/webapp/WEB-INF/web.xml b/libraries/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 364bcd9587..0000000000
--- a/libraries/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-	      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	version="3.0">
-
-	<welcome-file-list>
-		<welcome-file>helloworld.html</welcome-file>
-	</welcome-file-list>
-</web-app>
\ No newline at end of file
diff --git a/libraries/src/main/webapp/helloworld.html b/libraries/src/main/webapp/helloworld.html
deleted file mode 100644
index bfc75f2592..0000000000
--- a/libraries/src/main/webapp/helloworld.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="ISO-8859-1">
-<title>Hello World</title>
-</head>
-<body>Hello World!
-</body>
-</html>
\ No newline at end of file

From 801108b0e1180d2bbd89f2cdeb5028c912aa10c7 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Sat, 8 Sep 2018 00:03:05 +0530
Subject: [PATCH 015/114] BAEL-8899 Let's upgrade the Gatling versions

-Updated gatling and scala versions to latest
---
 testing-modules/gatling/pom.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/testing-modules/gatling/pom.xml b/testing-modules/gatling/pom.xml
index 1afaefd47e..f0906da0bc 100644
--- a/testing-modules/gatling/pom.xml
+++ b/testing-modules/gatling/pom.xml
@@ -110,13 +110,10 @@
 	</dependencyManagement>
 
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<encoding>UTF-8</encoding>
-		<scala.version>2.11.12</scala.version> <!--2.11.12 --> <!--2.12.6 -->
-		<gatling.version>2.2.5</gatling.version> <!--2.2.5 --> <!--2.3.1 -->
-		<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version> <!--3.2.2 --> <!--3.3.2 -->
-		<gatling-maven-plugin.version>2.2.1</gatling-maven-plugin.version> <!--2.2.1 --> <!--2.2.4 -->
+		<scala.version>2.13.0-M5</scala.version>
+		<gatling.version>2.3.1</gatling.version>
+		<scala-maven-plugin.version>3.4.2</scala-maven-plugin.version>
+		<gatling-maven-plugin.version>3.0.0-M5</gatling-maven-plugin.version>
 	</properties>
 
 </project>

From a0caa18ca2b2a70bd7dbe51159dbf501699c45df Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Sat, 8 Sep 2018 00:10:50 +0530
Subject: [PATCH 016/114] Update pom.xml

---
 testing-modules/gatling/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing-modules/gatling/pom.xml b/testing-modules/gatling/pom.xml
index f0906da0bc..a78a4e369c 100644
--- a/testing-modules/gatling/pom.xml
+++ b/testing-modules/gatling/pom.xml
@@ -112,7 +112,7 @@
 	<properties>
 		<scala.version>2.13.0-M5</scala.version>
 		<gatling.version>2.3.1</gatling.version>
-		<scala-maven-plugin.version>3.4.2</scala-maven-plugin.version>
+		<scala-maven-plugin.version>3.3.1</scala-maven-plugin.version>
 		<gatling-maven-plugin.version>3.0.0-M5</gatling-maven-plugin.version>
 	</properties>
 

From f7a797352926a75b9b2377ffacd2b9fddd54f578 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 9 Sep 2018 10:22:08 +0300
Subject: [PATCH 017/114] fix reactor test

---
 .../com/baeldung/reactor/ReactorIntegrationTest.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java b/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java
index 56650ba306..e3060b8e02 100644
--- a/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java
+++ b/reactor-core/src/test/java/com/baeldung/reactor/ReactorIntegrationTest.java
@@ -37,14 +37,14 @@ public class ReactorIntegrationTest {
         Flux.just(1, 2, 3, 4)
                 .log()
                 .map(i -> i * 2)
-                .zipWith(Flux.range(0, Integer.MAX_VALUE).log(), (two, one) -> String.format("First Flux: %d, Second Flux: %d", one, two))
+                .zipWith(Flux.range(0, Integer.MAX_VALUE).log(), (one, two) -> String.format("First Flux: %d, Second Flux: %d", one, two))
                 .subscribe(elements::add);
 
         assertThat(elements).containsExactly(
-                "First Flux: 0, Second Flux: 2",
-                "First Flux: 1, Second Flux: 4",
-                "First Flux: 2, Second Flux: 6",
-                "First Flux: 3, Second Flux: 8");
+                "First Flux: 2, Second Flux: 0",
+                "First Flux: 4, Second Flux: 1",
+                "First Flux: 6, Second Flux: 2",
+                "First Flux: 8, Second Flux: 3");
     }
 
     @Test

From 3960410436711e1172c9df3a163dc21350f2cac8 Mon Sep 17 00:00:00 2001
From: Jon Cook <jonathan.cook@erars.plus.com>
Date: Sun, 9 Sep 2018 11:53:18 +0200
Subject: [PATCH 018/114] BAEL-2060 - Bean Validation in Jersey

---
 jersey/pom.xml                                |  5 +
 .../server/config/ViewApplicationConfig.java  |  2 +
 .../server/constraints/SerialNumber.java      | 35 +++++++
 .../baeldung/jersey/server/model/Fruit.java   | 43 ++++++++-
 .../providers/FruitExceptionMapper.java       | 26 ++++++
 .../jersey/server/rest/FruitResource.java     | 53 +++++++++++
 .../jersey/service/SimpleStorageService.java  | 25 +++++
 .../rest/FruitResourceIntegrationTest.java    | 91 +++++++++++++++++--
 8 files changed, 269 insertions(+), 11 deletions(-)
 create mode 100644 jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java
 create mode 100644 jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java
 create mode 100644 jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java

diff --git a/jersey/pom.xml b/jersey/pom.xml
index e248f9cf90..b55bdc5330 100644
--- a/jersey/pom.xml
+++ b/jersey/pom.xml
@@ -39,6 +39,11 @@
             <artifactId>jersey-mvc-freemarker</artifactId>
             <version>${jersey.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.ext</groupId>
+            <artifactId>jersey-bean-validation</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.test-framework</groupId>
             <artifactId>jersey-test-framework-core</artifactId>
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java b/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java
index d4744066c4..b6b9853aae 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/config/ViewApplicationConfig.java
@@ -1,12 +1,14 @@
 package com.baeldung.jersey.server.config;
 
 import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.server.ServerProperties;
 import org.glassfish.jersey.server.mvc.freemarker.FreemarkerMvcFeature;
 
 public class ViewApplicationConfig extends ResourceConfig {
     
     public ViewApplicationConfig() {
         packages("com.baeldung.jersey.server");
+        property(ServerProperties.BV_SEND_ERROR_IN_RESPONSE, true);
         property(FreemarkerMvcFeature.TEMPLATE_BASE_PATH, "templates/freemarker");
         register(FreemarkerMvcFeature.class);;
     }
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java b/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java
new file mode 100644
index 0000000000..ca49797e31
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java
@@ -0,0 +1,35 @@
+package com.baeldung.jersey.server.constraints;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.regex.Pattern;
+
+import javax.validation.Constraint;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.Payload;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = { SerialNumber.Validator.class })
+public @interface SerialNumber {
+
+    String message()
+
+    default "Fruit serial number is not valid";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+    public class Validator implements ConstraintValidator<SerialNumber, String> {
+        @Override
+        public void initialize(final SerialNumber serial) {
+        }
+
+        @Override
+        public boolean isValid(final String serial, final ConstraintValidatorContext constraintValidatorContext) {
+            final String serialNumRegex = "^\\d{3}-\\d{3}-\\d{4}$";
+            return Pattern.matches(serialNumRegex, serial);
+        }
+    }
+}
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
index 30620e331d..c55362487b 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
@@ -1,20 +1,57 @@
 package com.baeldung.jersey.server.model;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
 public class Fruit {
 
-    private final String name;
-    private final String colour;
+    @Min(value = 10, message = "Fruit weight must be 10 or greater")
+    private Integer weight;
+    @Size(min = 5, max = 200)
+    private String name;
+    @Size(min = 5, max = 200)
+    private String colour;
+    private String serial;
+
+    public Fruit() {
+    }
 
     public Fruit(String name, String colour) {
         this.name = name;
         this.colour = colour;
     }
-    
+
     public String getName() {
         return name;
     }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setColour(String colour) {
+        this.colour = colour;
+    }
 
     public String getColour() {
         return colour;
     }
+
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Integer weight) {
+        this.weight = weight;
+    }
+    
+    public String getSerial() {
+        return serial;
+    }
+
+    public void setSerial(String serial) {
+        this.serial = serial;
+    }
 }
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java b/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java
new file mode 100644
index 0000000000..cea61c897b
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java
@@ -0,0 +1,26 @@
+package com.baeldung.jersey.server.providers;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+public class FruitExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
+
+    @Override
+    public Response toResponse(final ConstraintViolationException exception) {
+        return Response.status(Response.Status.BAD_REQUEST)
+            .entity(prepareMessage(exception))
+            .type("text/plain")
+            .build();
+    }
+
+    private String prepareMessage(ConstraintViolationException exception) {
+        final StringBuilder message = new StringBuilder();
+        for (ConstraintViolation<?> cv : exception.getConstraintViolations()) {
+            message.append(cv.getPropertyPath() + " " + cv.getMessage() + "\n");
+        }
+        return message.toString();
+    }
+
+}
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java b/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
index 4e1fa4aa11..ee34cdd3ca 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
@@ -5,7 +5,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -15,7 +21,9 @@ import org.glassfish.jersey.server.mvc.ErrorTemplate;
 import org.glassfish.jersey.server.mvc.Template;
 import org.glassfish.jersey.server.mvc.Viewable;
 
+import com.baeldung.jersey.server.constraints.SerialNumber;
 import com.baeldung.jersey.server.model.Fruit;
+import com.baeldung.jersey.service.SimpleStorageService;
 
 @Path("/fruit")
 public class FruitResource {
@@ -52,4 +60,49 @@ public class FruitResource {
         return name;
     }
 
+    @POST
+    @Path("/create")
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    public void createFruit(
+        @NotNull(message = "Fruit name must not be null") @FormParam("name") String name, 
+        @NotNull(message = "Fruit colour must not be null") @FormParam("colour") String colour) {
+
+        Fruit fruit = new Fruit(name, colour);
+        SimpleStorageService.storeFruit(fruit);
+    }
+    
+    @PUT
+    @Path("/update")
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    public void updateFruit(@SerialNumber @FormParam("serial") String serial) {
+        Fruit fruit = new Fruit();
+        fruit.setSerial(serial);
+        SimpleStorageService.storeFruit(fruit);
+    }
+
+    @POST
+    @Path("/create")
+    @Consumes(MediaType.APPLICATION_JSON)
+    public void createFruit(@Valid Fruit fruit) {
+        SimpleStorageService.storeFruit(fruit);
+    }
+
+    @GET
+    @Valid
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("/search/{name}")
+    public Fruit findFruitByName(@PathParam("name") String name) {
+        return SimpleStorageService.findByName(name);
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    @Path("/exception")
+    @Valid
+    public Fruit exception() {
+        Fruit fruit = new Fruit();
+        fruit.setName("a");
+        fruit.setColour("b");
+        return fruit;
+    }
 }
diff --git a/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java b/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java
new file mode 100644
index 0000000000..e21dd584a1
--- /dev/null
+++ b/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java
@@ -0,0 +1,25 @@
+package com.baeldung.jersey.service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.baeldung.jersey.server.model.Fruit;
+
+public class SimpleStorageService {
+
+    private static final Map<String, Fruit> fruits = new HashMap<String, Fruit>();
+
+    public static void storeFruit(final Fruit fruit) {
+        fruits.put(fruit.getName(), fruit);
+    }
+    
+    public static Fruit findByName(final String name) {
+        return fruits.entrySet()
+            .stream()
+            .filter(map -> name.equals(map.getKey()))
+            .map(map -> map.getValue())
+            .findFirst()
+            .get();
+    }
+
+}
diff --git a/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java b/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
index a0b6daed51..2eeb5710cb 100644
--- a/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
+++ b/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
@@ -2,41 +2,116 @@ package com.baeldung.jersey.server.rest;
 
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
+import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Assert;
+import org.glassfish.jersey.test.TestProperties;
 import org.junit.Test;
 
 import com.baeldung.jersey.server.config.ViewApplicationConfig;
+import com.baeldung.jersey.server.model.Fruit;
+import com.baeldung.jersey.server.providers.FruitExceptionMapper;
 
 public class FruitResourceIntegrationTest extends JerseyTest {
 
     @Override
     protected Application configure() {
-        return new ViewApplicationConfig();
+        enable(TestProperties.LOG_TRAFFIC);
+        enable(TestProperties.DUMP_ENTITY);
+
+        ViewApplicationConfig config = new ViewApplicationConfig();
+        config.register(FruitExceptionMapper.class);
+        return config;
     }
 
     @Test
-    public void testAllFruit() {
+    public void givenGetAllFruit_whenCorrectRequest_thenAllTemplateInvoked() {
         final String response = target("/fruit/all").request()
             .get(String.class);
-        Assert.assertThat(response, allOf(containsString("banana"), containsString("apple"), containsString("kiwi")));
+        assertThat(response, allOf(containsString("banana"), containsString("apple"), containsString("kiwi")));
     }
 
     @Test
-    public void testIndex() {
+    public void givenGetFruit_whenCorrectRequest_thenIndexTemplateInvoked() {
         final String response = target("/fruit").request()
             .get(String.class);
-        Assert.assertThat(response, containsString("Welcome Fruit Index Page!"));
+        assertThat(response, containsString("Welcome Fruit Index Page!"));
     }
 
     @Test
-    public void testErrorTemplate() {
+    public void givenGetFruitByName_whenFruitUnknown_thenErrorTemplateInvoked() {
         final String response = target("/fruit/orange").request()
             .get(String.class);
-        Assert.assertThat(response, containsString("Error -  Fruit not found: orange!"));
+        assertThat(response, containsString("Error -  Fruit not found: orange!"));
+    }
+
+    @Test
+    public void givenCreateFruit_whenFormContainsNullParam_thenResponseCodeIsBadRequest() {
+        Form form = new Form();
+        form.param("name", "apple");
+        form.param("colour", null);
+        Response response = target("fruit/create").request(MediaType.APPLICATION_FORM_URLENCODED)
+            .post(Entity.form(form));
+
+        assertEquals("Http Response should be 400 ", 400, response.getStatus());
+        assertThat(response.readEntity(String.class), containsString("Fruit colour must not be null"));
+    }
+
+    @Test
+    public void givenUpdateFruit_whenFormContainsBadSerialParam_thenResponseCodeIsBadRequest() {
+        Form form = new Form();
+        form.param("serial", "2345-2345");
+
+        Response response = target("fruit/update").request(MediaType.APPLICATION_FORM_URLENCODED)
+            .put(Entity.form(form));
+
+        assertEquals("Http Response should be 400 ", 400, response.getStatus());
+        assertThat(response.readEntity(String.class), containsString("Fruit serial number is not valid"));
+    }
+
+    @Test
+    public void givenCreateFruit_whenFruitIsInvalid_thenResponseCodeIsBadRequest() {
+        Fruit fruit = new Fruit("Blueberry", "purple");
+        fruit.setWeight(1);
+
+        Response response = target("fruit/create").request(MediaType.APPLICATION_JSON_TYPE)
+            .post(Entity.entity(fruit, MediaType.APPLICATION_JSON_TYPE));
+
+        assertEquals("Http Response should be 400 ", 400, response.getStatus());
+        assertThat(response.readEntity(String.class), containsString("Fruit weight must be 10 or greater"));
+    }
+
+    @Test
+    public void givenFruitExists_whenSearching_thenResponseContainsFruit() {
+        Fruit fruit = new Fruit();
+        fruit.setName("strawberry");
+        fruit.setWeight(20);
+        Response response = target("fruit/create").request(MediaType.APPLICATION_JSON_TYPE)
+            .post(Entity.entity(fruit, MediaType.APPLICATION_JSON_TYPE));
+
+        assertEquals("Http Response should be 204 ", 204, response.getStatus());
+
+        final String json = target("fruit/search/strawberry").request()
+            .get(String.class);
+        assertThat(json, containsString("{\"name\":\"strawberry\",\"weight\":20}"));
+    }
+
+    @Test
+    public void givenFruit_whenFruitIsInvalid_thenReponseContainsCustomExceptions() {
+        final Response response = target("fruit/exception").request()
+            .get();
+
+        assertEquals("Http Response should be 400 ", 400, response.getStatus());
+        String responseString = response.readEntity(String.class);
+        assertThat(responseString, containsString("exception.<return value>.colour size must be between 5 and 200"));
+        assertThat(responseString, containsString("exception.<return value>.name size must be between 5 and 200"));
     }
 
 }

From 6f2d31b26a2f45eaeea2521752574b7a82dfebf6 Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Sun, 9 Sep 2018 17:26:53 +0530
Subject: [PATCH 019/114] BAEL-1426 Updating an existing test case due to
 migration to Kafka2.0

---
 .../kafkastreams/KafkaStreamsLiveTest.java         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java b/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java
index 4406494d30..e61f4158a7 100644
--- a/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java
+++ b/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java
@@ -4,10 +4,12 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.serialization.Serde;
 import org.apache.kafka.common.serialization.Serdes;
 import org.apache.kafka.streams.KafkaStreams;
+import org.apache.kafka.streams.StreamsBuilder;
 import org.apache.kafka.streams.StreamsConfig;
+import org.apache.kafka.streams.Topology;
 import org.apache.kafka.streams.kstream.KStream;
-import org.apache.kafka.streams.kstream.KStreamBuilder;
 import org.apache.kafka.streams.kstream.KTable;
+import org.apache.kafka.streams.kstream.Produced;
 import org.apache.kafka.test.TestUtils;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -36,20 +38,20 @@ public class KafkaStreamsLiveTest {
         streamsConfiguration.put(StreamsConfig.STATE_DIR_CONFIG, TestUtils.tempDirectory().getAbsolutePath());
 
         // when
-        KStreamBuilder builder = new KStreamBuilder();
+        StreamsBuilder builder = new StreamsBuilder();
         KStream<String, String> textLines = builder.stream(inputTopic);
         Pattern pattern = Pattern.compile("\\W+", Pattern.UNICODE_CHARACTER_CLASS);
 
         KTable<String, Long> wordCounts = textLines.flatMapValues(value -> Arrays.asList(pattern.split(value.toLowerCase()))).groupBy((key, word) -> word).count();
 
-        wordCounts.foreach((word, count) -> System.out.println("word: " + word + " -> " + count));
+        textLines.foreach((word, count) -> System.out.println("word: " + word + " -> " + count));
 
         String outputTopic = "outputTopic";
         final Serde<String> stringSerde = Serdes.String();
-        final Serde<Long> longSerde = Serdes.Long();
-        wordCounts.to(stringSerde, longSerde, outputTopic);
+        final Serde<String> longSerde = Serdes.String();
+        textLines.to(outputTopic, Produced.with(stringSerde,longSerde));
 
-        KafkaStreams streams = new KafkaStreams(builder, streamsConfiguration);
+        KafkaStreams streams = new KafkaStreams(new Topology(), streamsConfiguration);
         streams.start();
 
         // then

From e3226c650152db55e5530cb7da03ee56edfe220b Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 9 Sep 2018 15:05:57 +0300
Subject: [PATCH 020/114] Update README.md

---
 kotlin-libraries/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kotlin-libraries/README.md b/kotlin-libraries/README.md
index ce30c71792..30c4d03ded 100644
--- a/kotlin-libraries/README.md
+++ b/kotlin-libraries/README.md
@@ -6,5 +6,4 @@
 - [Writing Specifications with Kotlin and Spek](http://www.baeldung.com/kotlin-spek)
 - [Processing JSON with Kotlin and Klaxson](http://www.baeldung.com/kotlin-json-klaxson)
 - [Kotlin with Ktor](http://www.baeldung.com/kotlin-ktor)
-- [Idiomatic Logging in Kotlin](http://www.baeldung.com/kotlin-logging)
-- [Guide to the Kotlin Exposed Framework](https://www.baeldung.com/kotlin-exposed-persistence)
\ No newline at end of file
+- [Guide to the Kotlin Exposed Framework](https://www.baeldung.com/kotlin-exposed-persistence)

From e57bd766456f6954bfd614d0da5a9f04dc47c7c4 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Mon, 10 Sep 2018 16:09:45 +0400
Subject: [PATCH 021/114] HashMap sort TreeMap

---
 .../com/baeldung/performance/Employee.java    |  8 ++++
 .../java/com/baeldung/sort/SortHashMap.java   | 42 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java

diff --git a/core-java-collections/src/main/java/com/baeldung/performance/Employee.java b/core-java-collections/src/main/java/com/baeldung/performance/Employee.java
index d811cfbb7d..1ed4410371 100644
--- a/core-java-collections/src/main/java/com/baeldung/performance/Employee.java
+++ b/core-java-collections/src/main/java/com/baeldung/performance/Employee.java
@@ -44,4 +44,12 @@ public class Employee {
         result = 31 * result + name.hashCode();
         return result;
     }
+
+    @Override
+    public String toString() {
+        return "Employee{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                '}';
+    }
 }
diff --git a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
new file mode 100644
index 0000000000..fe0aab9218
--- /dev/null
+++ b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
@@ -0,0 +1,42 @@
+package com.baeldung.sort;
+
+import com.baeldung.performance.Employee;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class SortHashMap {
+
+    private static Map<String, Employee> map = new HashMap<>();
+
+    public static void main(String[] args) {
+
+        initialize();
+
+        treeMapSortByKey();
+    }
+
+    public static void treeMapSortByKey()
+    {
+        TreeMap<String, Employee> sorted = new TreeMap<>(map);
+        sorted.putAll(map);
+
+        for (Map.Entry<String, Employee> entry : sorted.entrySet()) {
+            System.out.println("Key = " + entry.getKey() +
+                    ", Value = " + entry.getValue());
+        }
+
+    }
+
+    private static void initialize() {
+        Employee employee1 = new Employee(1L, "Mher");
+        map.put(employee1.getName(), employee1);
+        Employee employee2 = new Employee(22L, "Annie");
+        map.put(employee2.getName(), employee2);
+        Employee employee3 = new Employee(8L, "John");
+        map.put(employee3.getName(), employee3);
+        Employee employee4 = new Employee(2L, "George");
+        map.put(employee4.getName(), employee4);
+    }
+}

From 23fc41db24562e22d1a88ffa6606b1d7d9e3f5e1 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Mon, 10 Sep 2018 17:22:21 +0400
Subject: [PATCH 022/114] ArrayList and TreeSet

---
 .../java/com/baeldung/sort/SortHashMap.java   | 46 ++++++++++++++++---
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
index fe0aab9218..6bf56274ac 100644
--- a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
+++ b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
@@ -2,9 +2,7 @@ package com.baeldung.sort;
 
 import com.baeldung.performance.Employee;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
 public class SortHashMap {
 
@@ -14,11 +12,28 @@ public class SortHashMap {
 
         initialize();
 
-        treeMapSortByKey();
+        //treeMapSortByKey();
+
+        //arrayListSortByValue();
+        //arrayListSortByKey();
+
+        treeSetByKey();
+        treeSetByValue();
     }
 
-    public static void treeMapSortByKey()
-    {
+    private static void treeSetByValue() {
+        Comparator<Employee> comp = (Employee o1, Employee o2) -> (o1.getId().compareTo(o2.getId()));
+        SortedSet<Employee> values = new TreeSet<>(comp);
+        values.addAll(map.values());
+        System.out.println(values);
+    }
+
+    private static void treeSetByKey() {
+        SortedSet<String> keys = new TreeSet<>(map.keySet());
+        System.out.println(keys);
+    }
+
+    private static void treeMapSortByKey() {
         TreeMap<String, Employee> sorted = new TreeMap<>(map);
         sorted.putAll(map);
 
@@ -29,6 +44,25 @@ public class SortHashMap {
 
     }
 
+    private static void arrayListSortByValue() {
+        List<Employee> employeeById = new ArrayList<>(map.values());
+
+        Collections.sort(employeeById, new Comparator<Employee>() {
+
+            public int compare(Employee o1, Employee o2) {
+                return (int)(o1.getId() - o2.getId());
+            }
+        });
+
+        System.out.println(employeeById);
+    }
+
+    private static void arrayListSortByKey() {
+        List<String> employeeByKey = new ArrayList<>(map.keySet());
+        Collections.sort(employeeByKey);
+        System.out.println(employeeByKey);
+    }
+
     private static void initialize() {
         Employee employee1 = new Employee(1L, "Mher");
         map.put(employee1.getName(), employee1);

From 3d7a4170218909750f2fce0e201e24db7f43f52e Mon Sep 17 00:00:00 2001
From: codehunter34 <31874661+codehunter34@users.noreply.github.com>
Date: Mon, 10 Sep 2018 19:02:07 +0300
Subject: [PATCH 023/114] Bael 2075 (#5189)

* BAEL-2075: Lombok @Getter for boolean field
---
 .../baeldung/lombok/getter/GetterBoolean.java | 15 ++++++++
 .../lombok/getter/GetterBooleanPrimitive.java | 16 +++++++++
 .../GetterBooleanPrimitiveSameAccessor.java   | 18 ++++++++++
 .../getter/GetterBooleanSameAccessor.java     | 13 +++++++
 .../lombok/getter/GetterBooleanType.java      | 15 ++++++++
 .../lombok/getter/GetterBooleanUnitTest.java  | 34 +++++++++++++++++++
 6 files changed, 111 insertions(+)
 create mode 100644 lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java
 create mode 100644 lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java
 create mode 100644 lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java
 create mode 100644 lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java
 create mode 100644 lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java
 create mode 100644 lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java

diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java
new file mode 100644
index 0000000000..2191396e5d
--- /dev/null
+++ b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBoolean.java
@@ -0,0 +1,15 @@
+package com.baeldung.lombok.getter;
+
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 4. Using @Getter on a Boolean Field
+ *
+ */
+public class GetterBoolean {
+
+    @Getter
+    private Boolean running = true;
+}
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java
new file mode 100644
index 0000000000..5601f85b8b
--- /dev/null
+++ b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitive.java
@@ -0,0 +1,16 @@
+package com.baeldung.lombok.getter;
+
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 3. Using @Getter on a boolean Field
+ *
+ */
+public class GetterBooleanPrimitive {
+
+    @Getter
+    private boolean running;
+
+}
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java
new file mode 100644
index 0000000000..af29a33c20
--- /dev/null
+++ b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanPrimitiveSameAccessor.java
@@ -0,0 +1,18 @@
+package com.baeldung.lombok.getter;
+
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 3.2. Two boolean Fields With the Same Accessor Name
+ *
+ */
+public class GetterBooleanPrimitiveSameAccessor {
+
+    @Getter
+    boolean running = true;
+
+    @Getter
+    boolean isRunning = false;
+}
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java
new file mode 100644
index 0000000000..d972273b71
--- /dev/null
+++ b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanSameAccessor.java
@@ -0,0 +1,13 @@
+package com.baeldung.lombok.getter;
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 3.1. A boolean Field Having the Same Name With Its Accessor
+ *
+ */
+public class GetterBooleanSameAccessor {
+    @Getter
+    private boolean isRunning = true;
+}
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java
new file mode 100644
index 0000000000..0d3b9a928a
--- /dev/null
+++ b/lombok/src/main/java/com/baeldung/lombok/getter/GetterBooleanType.java
@@ -0,0 +1,15 @@
+package com.baeldung.lombok.getter;
+
+
+import lombok.Getter;
+
+/**
+ * Related Article Sections:
+ * 4. Using @Getter on a Boolean Field
+ *
+ */
+public class GetterBooleanType {
+
+    @Getter
+    private Boolean running = true;
+}
diff --git a/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java b/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java
new file mode 100644
index 0000000000..632594d575
--- /dev/null
+++ b/lombok/src/test/java/com/baeldung/lombok/getter/GetterBooleanUnitTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.lombok.getter;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class GetterBooleanUnitTest {
+
+    @Test
+    public void whenBasicBooleanField_thenMethodNamePrefixedWithIsFollowedByFieldName() {
+        GetterBooleanPrimitive lombokExamples = new GetterBooleanPrimitive();
+        assertFalse(lombokExamples.isRunning());
+    }
+
+    @Test
+    public void whenBooleanFieldPrefixedWithIs_thenMethodNameIsSameAsFieldName() {
+        GetterBooleanSameAccessor lombokExamples = new GetterBooleanSameAccessor();
+        assertTrue(lombokExamples.isRunning());
+    }
+
+    @Test
+    public void whenTwoBooleanFieldsCauseNamingConflict_thenLombokMapsToFirstDeclaredField() {
+        GetterBooleanPrimitiveSameAccessor  lombokExamples = new GetterBooleanPrimitiveSameAccessor();
+        assertTrue(lombokExamples.isRunning() == lombokExamples.running);
+        assertFalse(lombokExamples.isRunning() == lombokExamples.isRunning);
+    }
+
+    @Test
+    public void whenFieldOfBooleanType_thenLombokPrefixesMethodWithGetInsteadOfIs() {
+        GetterBooleanType lombokExamples = new GetterBooleanType();
+        assertTrue(lombokExamples.getRunning());
+    }
+}

From 9d70db511801e4366989a6765817d45c0eec5155 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Mon, 10 Sep 2018 22:08:34 +0530
Subject: [PATCH 024/114] BAEL-8899 Let's upgrade the Gatling versions

-Fixed dependency versions
---
 testing-modules/gatling/pom.xml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/testing-modules/gatling/pom.xml b/testing-modules/gatling/pom.xml
index a78a4e369c..08b8545d06 100644
--- a/testing-modules/gatling/pom.xml
+++ b/testing-modules/gatling/pom.xml
@@ -7,13 +7,13 @@
 	<artifactId>gatling</artifactId>
 	<version>1.0-SNAPSHOT</version>
 
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-modules</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
-
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+    
 	<dependencies>
 		<dependency>
 			<groupId>io.gatling.highcharts</groupId>
@@ -78,6 +78,9 @@
 						<goals>
 							<goal>execute</goal>
 						</goals>
+						<configuration>
+  							<disableCompiler>true</disableCompiler>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -110,10 +113,13 @@
 	</dependencyManagement>
 
 	<properties>
-		<scala.version>2.13.0-M5</scala.version>
-		<gatling.version>2.3.1</gatling.version>
-		<scala-maven-plugin.version>3.3.1</scala-maven-plugin.version>
-		<gatling-maven-plugin.version>3.0.0-M5</gatling-maven-plugin.version>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<encoding>UTF-8</encoding>
+		<scala.version>2.12.6</scala.version> <!--2.11.12 --> <!--2.12.6 -->
+		<gatling.version>2.3.1</gatling.version> <!--2.2.5 --> <!--2.3.1 -->
+		<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version> <!--3.2.2 --> <!--3.3.2 -->
+		<gatling-maven-plugin.version>2.2.4</gatling-maven-plugin.version> <!--2.2.1 --> <!--2.2.4 -->
 	</properties>
 
 </project>

From 04d56b7ab32257192271059007eab5e26af3ec8c Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Mon, 10 Sep 2018 20:21:34 +0300
Subject: [PATCH 025/114] whitelist ip range

---
 .../java/org/baeldung/ip/IpApplication.java   | 12 +++++
 .../CustomIpAuthenticationProvider.java       | 53 +++++++++++++++++++
 .../baeldung/ip/config/SecurityConfig.java    | 36 +++++++++++++
 .../baeldung/ip/config/SecurityXmlConfig.java |  9 ++++
 .../org/baeldung/ip/web/MainController.java   | 21 ++++++++
 .../src/main/resources/spring-security-ip.xml | 21 ++++++++
 .../java/org/baeldung/web/IpLiveTest.java     | 27 ++++++++++
 7 files changed, 179 insertions(+)
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
 create mode 100644 spring-security-mvc-boot/src/main/resources/spring-security-ip.xml
 create mode 100644 spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java

diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java
new file mode 100644
index 0000000000..fd270686a2
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java
@@ -0,0 +1,12 @@
+package org.baeldung.ip;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+public class IpApplication extends SpringBootServletInitializer {
+    public static void main(String[] args) {
+        SpringApplication.run(IpApplication.class, args);
+    }
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java
new file mode 100644
index 0000000000..078dd81259
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java
@@ -0,0 +1,53 @@
+package org.baeldung.ip.config;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.web.authentication.WebAuthenticationDetails;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CustomIpAuthenticationProvider implements AuthenticationProvider {
+    
+   Set<String> whitelist = new HashSet<String>();
+
+    public CustomIpAuthenticationProvider() {
+        super();
+        whitelist.add("11.11.11.11");
+        whitelist.add("127.0.0.1");
+    }
+
+    @Override
+    public Authentication authenticate(Authentication auth) throws AuthenticationException {
+        WebAuthenticationDetails details = (WebAuthenticationDetails) auth.getDetails();
+        String userIp = details.getRemoteAddress();
+        if(! whitelist.contains(userIp)){
+            throw new BadCredentialsException("Invalid IP Address");
+        }
+        final String name = auth.getName();
+        final String password = auth.getCredentials().toString();
+        
+        if (name.equals("john") && password.equals("123")) {
+        List<GrantedAuthority> authorities =new ArrayList<GrantedAuthority>();
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
+        return new UsernamePasswordAuthenticationToken(name, password, authorities);
+        }
+        else{
+            throw new BadCredentialsException("Invalid username or password");
+        }
+    }
+
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return authentication.equals(UsernamePasswordAuthenticationToken.class);
+    }
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
new file mode 100644
index 0000000000..b4ed8277d6
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
@@ -0,0 +1,36 @@
+package org.baeldung.ip.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+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;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Autowired
+    private CustomIpAuthenticationProvider authenticationProvider;
+
+    @Override
+    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
+       auth.inMemoryAuthentication().withUser("john").password("{noop}123").authorities("ROLE_USER");
+     //   auth.authenticationProvider(authenticationProvider);
+    }
+
+    @Override
+    protected void configure(final HttpSecurity http) throws Exception {
+        // @formatter:off
+        http.authorizeRequests()
+            .antMatchers("/login").permitAll()
+//            .antMatchers("/foos/**").hasIpAddress("11.11.11.11")
+            .antMatchers("/foos/**").access("isAuthenticated() and hasIpAddress('11.11.11.11')")
+            .anyRequest().authenticated()
+            .and().formLogin().permitAll()
+            .and().csrf().disable();
+        // @formatter:on
+    }
+
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java
new file mode 100644
index 0000000000..1d22ca4c67
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java
@@ -0,0 +1,9 @@
+package org.baeldung.ip.config;
+
+
+//@Configuration
+//@EnableWebSecurity
+//@ImportResource({ "classpath:spring-security-ip.xml" })
+public class SecurityXmlConfig {
+   
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
new file mode 100644
index 0000000000..da5db5e825
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
@@ -0,0 +1,21 @@
+package org.baeldung.ip.web;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.baeldung.custom.persistence.model.Foo;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class MainController {
+
+    @RequestMapping(method = RequestMethod.GET, value = "/foos/{id}")
+    @ResponseBody
+    public Foo findById(@PathVariable final long id, HttpServletRequest request) {
+        return new Foo("Sample");
+    }
+
+}
diff --git a/spring-security-mvc-boot/src/main/resources/spring-security-ip.xml b/spring-security-mvc-boot/src/main/resources/spring-security-ip.xml
new file mode 100644
index 0000000000..31796ad134
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/resources/spring-security-ip.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security"
+  xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <security:authentication-manager>
+        <security:authentication-provider>
+            <security:user-service>
+                <security:user name="john" password="{noop}123" authorities="ROLE_USER" />
+            </security:user-service>
+        </security:authentication-provider>
+    </security:authentication-manager>
+
+    <security:http>
+        <security:form-login/>
+        <security:intercept-url pattern="/login" access="permitAll()" />
+        <security:intercept-url pattern="/foos/**" access="hasIpAddress('11.11.11.11')" />
+        <security:intercept-url pattern="/**" access="isAuthenticated()" />
+    </security:http>
+</beans>
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java
new file mode 100644
index 0000000000..e12e2f87b0
--- /dev/null
+++ b/spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java
@@ -0,0 +1,27 @@
+package org.baeldung.web;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+
+import org.junit.Test;
+
+
+public class IpLiveTest {
+
+    @Test
+    public void givenUser_whenGetHomePage_thenOK() {
+        final Response response = RestAssured.given().auth().form("john", "123").get("http://localhost:8082/");
+        assertEquals(200, response.getStatusCode());
+        assertTrue(response.asString().contains("Welcome"));
+    }
+    
+    @Test
+    public void givenUserWithWrongIP_whenGetFooById_thenForbidden() {
+        final Response response = RestAssured.given().auth().form("john", "123").get("http://localhost:8082/foos/1");
+        assertEquals(403, response.getStatusCode());
+        assertTrue(response.asString().contains("Forbidden"));
+    }
+   
+}
\ No newline at end of file

From a1194fdfbcda651da3ec8099edd21c6e1f1548eb Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Mon, 10 Sep 2018 20:27:21 +0200
Subject: [PATCH 026/114] [BAEL-2170] Renamed test and used Collection instead
 of ArrayList

---
 .../list/arraylist/ClearVsRemoveAllTest.java  | 38 ------------------
 .../arraylist/ClearVsRemoveAllUnitTest.java   | 40 +++++++++++++++++++
 2 files changed, 40 insertions(+), 38 deletions(-)
 delete mode 100644 core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllTest.java
 create mode 100644 core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllUnitTest.java

diff --git a/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllTest.java b/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllTest.java
deleted file mode 100644
index 5b9fbc3415..0000000000
--- a/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.baeldung.list.arraylist;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Unit tests demonstrating differences between ArrayList#clear() and ArrayList#removeAll()
- */
-class ClearVsRemoveAllTest {
-
-    /*
-     * Tests
-     */
-    @Test
-    void givenArrayListWithElements_whenClear_thenListBecomesEmpty() {
-        ArrayList<Integer> list = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
-
-        list.clear();
-
-        assertTrue(list.isEmpty());
-    }
-
-    @Test
-    void givenTwoArrayListsWithCommonElements_whenRemoveAll_thenFirstListMissElementsFromSecondList() {
-        ArrayList<Integer> firstList = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
-        ArrayList<Integer> secondList = new ArrayList<>(Arrays.asList(3, 4, 5, 6, 7));
-
-        firstList.removeAll(secondList);
-
-        assertEquals(Arrays.asList(1, 2), firstList);
-    }
-
-}
diff --git a/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllUnitTest.java b/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllUnitTest.java
new file mode 100644
index 0000000000..5e31a326b8
--- /dev/null
+++ b/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllUnitTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.list.arraylist;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Unit tests demonstrating differences between ArrayList#clear() and ArrayList#removeAll()
+ */
+class ClearVsRemoveAllUnitTest {
+
+    /*
+     * Tests
+     */
+    @Test
+    void givenArrayListWithElements_whenClear_thenListBecomesEmpty() {
+        Collection<Integer> collection = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
+
+        collection.clear();
+
+        assertTrue(collection.isEmpty());
+    }
+
+    @Test
+    void givenTwoArrayListsWithCommonElements_whenRemoveAll_thenFirstListMissElementsFromSecondList() {
+        Collection<Integer> firstCollection = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
+        Collection<Integer> secondCollection = new ArrayList<>(Arrays.asList(3, 4, 5, 6, 7));
+
+        firstCollection.removeAll(secondCollection);
+
+        assertEquals(Arrays.asList(1, 2), firstCollection);
+        assertEquals(Arrays.asList(3, 4, 5, 6, 7), secondCollection);
+    }
+
+}

From 69c6c30d8d88da267c6f44ef2207743bcc7a9be4 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Mon, 10 Sep 2018 20:28:27 +0200
Subject: [PATCH 027/114] [BAEL-2170] Moved code to Collection-dedicated
 package

---
 .../arraylist => collection}/ClearVsRemoveAllUnitTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename core-java-collections/src/test/java/com/baeldung/{list/arraylist => collection}/ClearVsRemoveAllUnitTest.java (96%)

diff --git a/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllUnitTest.java b/core-java-collections/src/test/java/com/baeldung/collection/ClearVsRemoveAllUnitTest.java
similarity index 96%
rename from core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllUnitTest.java
rename to core-java-collections/src/test/java/com/baeldung/collection/ClearVsRemoveAllUnitTest.java
index 5e31a326b8..8b0a7ef0db 100644
--- a/core-java-collections/src/test/java/com/baeldung/list/arraylist/ClearVsRemoveAllUnitTest.java
+++ b/core-java-collections/src/test/java/com/baeldung/collection/ClearVsRemoveAllUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.list.arraylist;
+package com.baeldung.collection;
 
 import org.junit.jupiter.api.Test;
 

From 50f0d571824e9a788b676229e93a4f7d76784aca Mon Sep 17 00:00:00 2001
From: Felipe Santiago Corro <santiago.corro@gmail.com>
Date: Mon, 10 Sep 2018 18:01:47 -0300
Subject: [PATCH 028/114] Proxy in Hibernate load() method (#5222)

---
 .../hibernate/proxy/BatchEmployee.java        | 56 ++++++++++++++
 .../com/baeldung/hibernate/proxy/Boss.java    | 49 ++++++++++++
 .../baeldung/hibernate/proxy/Employee.java    | 53 +++++++++++++
 .../hibernate/proxy/HibernateUtil.java        | 57 ++++++++++++++
 .../proxy/HibernateProxyUnitTest.java         | 75 +++++++++++++++++++
 5 files changed, 290 insertions(+)
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/proxy/BatchEmployee.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/proxy/Boss.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/proxy/Employee.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/proxy/HibernateUtil.java
 create mode 100644 hibernate5/src/test/java/com/baeldung/hibernate/proxy/HibernateProxyUnitTest.java

diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/proxy/BatchEmployee.java b/hibernate5/src/main/java/com/baeldung/hibernate/proxy/BatchEmployee.java
new file mode 100644
index 0000000000..00643ab3dd
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/proxy/BatchEmployee.java
@@ -0,0 +1,56 @@
+package com.baeldung.hibernate.proxy;
+
+import org.hibernate.annotations.BatchSize;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@BatchSize(size = 5)
+public class BatchEmployee implements Serializable {
+
+    @Id
+    @GeneratedValue (strategy = GenerationType.SEQUENCE)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Boss boss;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "surname")
+    private String surname;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Boss getBoss() {
+        return boss;
+    }
+
+    public void setBoss(Boss boss) {
+        this.boss = boss;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSurname() {
+        return surname;
+    }
+
+    public void setSurname(String surname) {
+        this.surname = surname;
+    }
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/proxy/Boss.java b/hibernate5/src/main/java/com/baeldung/hibernate/proxy/Boss.java
new file mode 100644
index 0000000000..b6e01814d0
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/proxy/Boss.java
@@ -0,0 +1,49 @@
+package com.baeldung.hibernate.proxy;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+public class Boss implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "surname")
+    private String surname;
+
+    public Boss() { }
+
+    public Boss(String name, String surname) {
+        this.name = name;
+        this.surname = surname;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSurname() {
+        return surname;
+    }
+
+    public void setSurname(String surname) {
+        this.surname = surname;
+    }
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/proxy/Employee.java b/hibernate5/src/main/java/com/baeldung/hibernate/proxy/Employee.java
new file mode 100644
index 0000000000..6bc64c35ef
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/proxy/Employee.java
@@ -0,0 +1,53 @@
+package com.baeldung.hibernate.proxy;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+public class Employee implements Serializable {
+
+    @Id
+    @GeneratedValue (strategy = GenerationType.SEQUENCE)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Boss boss;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "surname")
+    private String surname;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Boss getBoss() {
+        return boss;
+    }
+
+    public void setBoss(Boss boss) {
+        this.boss = boss;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSurname() {
+        return surname;
+    }
+
+    public void setSurname(String surname) {
+        this.surname = surname;
+    }
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/proxy/HibernateUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/proxy/HibernateUtil.java
new file mode 100644
index 0000000000..e6ad0432bd
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/proxy/HibernateUtil.java
@@ -0,0 +1,57 @@
+package com.baeldung.hibernate.proxy;
+
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.SessionFactoryBuilder;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.service.ServiceRegistry;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+public class HibernateUtil {
+
+    private static SessionFactory sessionFactory;
+    private static String PROPERTY_FILE_NAME;
+
+    public static SessionFactory getSessionFactory(String propertyFileName) throws IOException {
+        PROPERTY_FILE_NAME = propertyFileName;
+        if (sessionFactory == null) {
+            ServiceRegistry serviceRegistry = configureServiceRegistry();
+            sessionFactory = getSessionFactoryBuilder(serviceRegistry).build();
+        }
+        return sessionFactory;
+    }
+
+    private static SessionFactoryBuilder getSessionFactoryBuilder(ServiceRegistry serviceRegistry) {
+        MetadataSources metadataSources = new MetadataSources(serviceRegistry);
+        metadataSources.addPackage("com.baeldung.hibernate.proxy");
+        metadataSources.addAnnotatedClass(Boss.class);
+        metadataSources.addAnnotatedClass(Employee.class);
+
+        Metadata metadata = metadataSources.buildMetadata();
+        return metadata.getSessionFactoryBuilder();
+
+    }
+
+    private static ServiceRegistry configureServiceRegistry() throws IOException {
+        Properties properties = getProperties();
+        return new StandardServiceRegistryBuilder().applySettings(properties)
+            .build();
+    }
+
+    private static Properties getProperties() throws IOException {
+        Properties properties = new Properties();
+        URL propertiesURL = Thread.currentThread()
+            .getContextClassLoader()
+            .getResource(StringUtils.defaultString(PROPERTY_FILE_NAME, "hibernate.properties"));
+        try (FileInputStream inputStream = new FileInputStream(propertiesURL.getFile())) {
+            properties.load(inputStream);
+        }
+        return properties;
+    }
+}
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/proxy/HibernateProxyUnitTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/proxy/HibernateProxyUnitTest.java
new file mode 100644
index 0000000000..fa41797dd2
--- /dev/null
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/proxy/HibernateProxyUnitTest.java
@@ -0,0 +1,75 @@
+package com.baeldung.hibernate.proxy;
+
+import org.hibernate.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.fail;
+
+public class HibernateProxyUnitTest {
+
+    private Session session;
+
+    @Before
+    public void init(){
+        try {
+            session = HibernateUtil.getSessionFactory("hibernate.properties")
+                    .openSession();
+        } catch (HibernateException | IOException e) {
+            fail("Failed to initiate Hibernate Session [Exception:" + e.toString() + "]");
+        }
+
+        Boss boss = new Boss("Eduard", "Freud");
+        session.save(boss);
+    }
+
+    @After
+    public void close(){
+        if(session != null) {
+            session.close();
+        }
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void givenAnInexistentEmployeeId_whenUseGetMethod_thenReturnNull() {
+        Employee employee = session.get(Employee.class, new Long(14));
+        assertNull(employee);
+        employee.getId();
+    }
+
+    @Test
+    public void givenAnInexistentEmployeeId_whenUseLoadMethod_thenReturnAProxy() {
+        Employee employee = session.load(Employee.class, new Long(14));
+        assertNotNull(employee);
+    }
+
+    @Test
+    public void givenABatchEmployeeList_whenSaveOne_thenSaveTheWholeBatch() {
+        Transaction transaction = session.beginTransaction();
+
+        for (long i = 1; i <= 5; i++) {
+            Employee employee = new Employee();
+            employee.setName("Employee " + i);
+            session.save(employee);
+        }
+
+        //After this line is possible to see all the insertions in the logs
+        session.flush();
+        session.clear();
+        transaction.commit();
+
+        transaction = session.beginTransaction();
+
+        List<Employee> employeeList = session.createQuery("from Employee")
+                                        .setCacheMode(CacheMode.IGNORE).getResultList();
+
+        assertEquals(employeeList.size(), 5);
+        transaction.commit();
+    }
+}

From ba32ee32c6b00773b2122a33c6dfa17350f07c3b Mon Sep 17 00:00:00 2001
From: xamcross <xamcross@gmail.com>
Date: Tue, 11 Sep 2018 06:43:06 +0300
Subject: [PATCH 029/114] BAEL-2070 Qualifier used instead of Primary  (#5205)

* BAEL-2070 Qualifier used instead of Primary to distinguish between different repository beans

* BAEL-2095 CrudRepository save() method

* (REVERT) BAEL-2095 CrudRepository save() method
---
 .../baeldung/dependency/exception/app/PurchaseDeptService.java | 3 ++-
 .../dependency/exception/repository/DressRepository.java       | 3 ++-
 .../dependency/exception/repository/ShoeRepository.java        | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/com/baeldung/dependency/exception/app/PurchaseDeptService.java b/spring-core/src/main/java/com/baeldung/dependency/exception/app/PurchaseDeptService.java
index 1e6fad63aa..e0fe01acdd 100644
--- a/spring-core/src/main/java/com/baeldung/dependency/exception/app/PurchaseDeptService.java
+++ b/spring-core/src/main/java/com/baeldung/dependency/exception/app/PurchaseDeptService.java
@@ -1,13 +1,14 @@
 package com.baeldung.dependency.exception.app;
 
 import com.baeldung.dependency.exception.repository.InventoryRepository;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 @Service
 public class PurchaseDeptService {
     private InventoryRepository repository;
 
-    public PurchaseDeptService(InventoryRepository repository) {
+    public PurchaseDeptService(@Qualifier("dresses") InventoryRepository repository) {
         this.repository = repository;
     }
 }
\ No newline at end of file
diff --git a/spring-core/src/main/java/com/baeldung/dependency/exception/repository/DressRepository.java b/spring-core/src/main/java/com/baeldung/dependency/exception/repository/DressRepository.java
index 4a6c836143..5a1371ce04 100644
--- a/spring-core/src/main/java/com/baeldung/dependency/exception/repository/DressRepository.java
+++ b/spring-core/src/main/java/com/baeldung/dependency/exception/repository/DressRepository.java
@@ -1,9 +1,10 @@
 package com.baeldung.dependency.exception.repository;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Repository;
 
-@Primary
+@Qualifier("dresses")
 @Repository
 public class DressRepository implements InventoryRepository {
 }
diff --git a/spring-core/src/main/java/com/baeldung/dependency/exception/repository/ShoeRepository.java b/spring-core/src/main/java/com/baeldung/dependency/exception/repository/ShoeRepository.java
index 60495914cd..227d8934b6 100644
--- a/spring-core/src/main/java/com/baeldung/dependency/exception/repository/ShoeRepository.java
+++ b/spring-core/src/main/java/com/baeldung/dependency/exception/repository/ShoeRepository.java
@@ -1,7 +1,9 @@
 package com.baeldung.dependency.exception.repository;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
 
+@Qualifier("shoes")
 @Repository
 public class ShoeRepository implements InventoryRepository {
 }

From 57b6480e73e526a6cc2f6095947a2358c9f1ed32 Mon Sep 17 00:00:00 2001
From: Graham Cox <graham@grahamcox.co.uk>
Date: Mon, 10 Sep 2018 23:43:35 -0400
Subject: [PATCH 030/114] Examples for article on Kovenant (#5011)

* Examples of Reflection in Kotlin

* Some article updates to make better use of Assert

* Replaced printlines with log statements

* Added @Ignore to so tests with no assertions

* Examples for Kovenant

* Fixed an issue where tests fail depending on the order they are run

* Test for timeouts on promises
---
 core-kotlin/pom.xml                           |   6 +
 .../com/baeldung/kotlin/KovenantTest.kt       | 191 ++++++++++++++++++
 .../baeldung/kotlin/KovenantTimeoutTest.kt    |  38 ++++
 3 files changed, 235 insertions(+)
 create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTest.kt
 create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTimeoutTest.kt

diff --git a/core-kotlin/pom.xml b/core-kotlin/pom.xml
index 70cbd67645..0894a57320 100644
--- a/core-kotlin/pom.xml
+++ b/core-kotlin/pom.xml
@@ -55,6 +55,12 @@
             <artifactId>fuel-coroutines</artifactId>
             <version>${fuel.version}</version>
         </dependency>
+        <dependency>
+            <groupId>nl.komponents.kovenant</groupId>
+            <artifactId>kovenant</artifactId>
+            <version>3.3.0</version>
+            <type>pom</type>
+        </dependency>
     </dependencies>
 
     <properties>
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTest.kt
new file mode 100644
index 0000000000..469118f0f6
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTest.kt
@@ -0,0 +1,191 @@
+package com.baeldung.kotlin
+
+import nl.komponents.kovenant.*
+import nl.komponents.kovenant.Kovenant.deferred
+import nl.komponents.kovenant.combine.and
+import nl.komponents.kovenant.combine.combine
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import java.io.IOException
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+class KovenantTest {
+    @Before
+    fun setupTestMode() {
+        Kovenant.testMode { error ->
+            println("An unexpected error occurred")
+            Assert.fail(error.message)
+        }
+    }
+
+    @Test
+    fun testSuccessfulDeferred() {
+        val def = deferred<Long, Exception>()
+        Assert.assertFalse(def.promise.isDone())
+
+        def.resolve(1L)
+        Assert.assertTrue(def.promise.isDone())
+        Assert.assertTrue(def.promise.isSuccess())
+        Assert.assertFalse(def.promise.isFailure())
+    }
+
+    @Test
+    fun testFailedDeferred() {
+        val def = deferred<Long, Exception>()
+        Assert.assertFalse(def.promise.isDone())
+
+        def.reject(RuntimeException())
+        Assert.assertTrue(def.promise.isDone())
+        Assert.assertFalse(def.promise.isSuccess())
+        Assert.assertTrue(def.promise.isFailure())
+    }
+
+    @Test
+    fun testResolveDeferredTwice() {
+        val def = deferred<Long, Exception>()
+        def.resolve(1L)
+        try {
+            def.resolve(1L)
+        } catch (e: AssertionError) {
+            // Expected.
+            // This is slightly unusual. The AssertionError comes from Assert.fail() from setupTestMode()
+        }
+    }
+
+    @Test
+    fun testSuccessfulTask() {
+        val promise = task { 1L }
+        Assert.assertTrue(promise.isDone())
+        Assert.assertTrue(promise.isSuccess())
+        Assert.assertFalse(promise.isFailure())
+    }
+
+    @Test
+    fun testFailedTask() {
+        val promise = task { throw RuntimeException() }
+        Assert.assertTrue(promise.isDone())
+        Assert.assertFalse(promise.isSuccess())
+        Assert.assertTrue(promise.isFailure())
+    }
+
+    @Test
+    fun testCallbacks() {
+        val promise = task { 1L }
+
+        promise.success {
+            println("This was a success")
+            Assert.assertEquals(1L, it)
+        }
+
+        promise.fail {
+            println(it)
+            Assert.fail("This shouldn't happen")
+        }
+
+        promise.always {
+            println("This always happens")
+        }
+    }
+
+    @Test
+    fun testGetValues() {
+        val promise = task { 1L }
+        Assert.assertEquals(1L, promise.get())
+    }
+
+    @Test
+    fun testAllSucceed() {
+        val numbers = all(
+                task { 1L },
+                task { 2L },
+                task { 3L }
+        )
+
+        Assert.assertEquals(listOf(1L, 2L, 3L), numbers.get())
+    }
+
+    @Test
+    fun testOneFails() {
+        val runtimeException = RuntimeException()
+
+        val numbers = all(
+                task { 1L },
+                task { 2L },
+                task { throw runtimeException }
+        )
+
+        Assert.assertEquals(runtimeException, numbers.getError())
+    }
+
+    @Test
+    fun testAnySucceeds() {
+        val promise = any(
+                task {
+                    TimeUnit.SECONDS.sleep(3)
+                    1L
+                },
+                task {
+                    TimeUnit.SECONDS.sleep(2)
+                    2L
+                },
+                task {
+                    TimeUnit.SECONDS.sleep(1)
+                    3L
+                }
+        )
+
+        Assert.assertTrue(promise.isDone())
+        Assert.assertTrue(promise.isSuccess())
+        Assert.assertFalse(promise.isFailure())
+    }
+
+    @Test
+    fun testAllFails() {
+        val runtimeException = RuntimeException()
+        val ioException = IOException()
+        val illegalStateException = IllegalStateException()
+        val promise = any(
+                task {
+                    TimeUnit.SECONDS.sleep(3)
+                    throw runtimeException
+                },
+                task {
+                    TimeUnit.SECONDS.sleep(2)
+                    throw ioException
+                },
+                task {
+                    TimeUnit.SECONDS.sleep(1)
+                    throw illegalStateException
+                }
+        )
+
+        Assert.assertTrue(promise.isDone())
+        Assert.assertFalse(promise.isSuccess())
+        Assert.assertTrue(promise.isFailure())
+    }
+
+    @Test
+    fun testSimpleCombine() {
+        val promise = task { 1L } and task { "Hello" }
+        val result = promise.get()
+
+        Assert.assertEquals(1L, result.first)
+        Assert.assertEquals("Hello", result.second)
+    }
+
+    @Test
+    fun testLongerCombine() {
+        val promise = combine(
+                task { 1L },
+                task { "Hello" },
+                task { Currency.getInstance("USD") }
+        )
+        val result = promise.get()
+
+        Assert.assertEquals(1L, result.first)
+        Assert.assertEquals("Hello", result.second)
+        Assert.assertEquals(Currency.getInstance("USD"), result.third)
+    }
+}
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTimeoutTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTimeoutTest.kt
new file mode 100644
index 0000000000..e37d2cc2fa
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KovenantTimeoutTest.kt
@@ -0,0 +1,38 @@
+package com.baeldung.kotlin
+
+import nl.komponents.kovenant.Promise
+import nl.komponents.kovenant.any
+import nl.komponents.kovenant.task
+import org.junit.Assert
+import org.junit.Ignore
+import org.junit.Test
+
+@Ignore
+// Note that this can not run in the same test run if KovenantTest has already been executed
+class KovenantTimeoutTest {
+    @Test
+    fun testTimeout() {
+        val promise = timedTask(1000) { "Hello" }
+        val result = promise.get()
+        Assert.assertEquals("Hello", result)
+    }
+
+    @Test
+    fun testTimeoutExpired() {
+        val promise = timedTask(1000) {
+            Thread.sleep(3000)
+            "Hello"
+        }
+        val result = promise.get()
+        Assert.assertNull(result)
+    }
+
+    fun <T> timedTask(millis: Long, body: () -> T) : Promise<T?, List<Exception>> {
+        val timeoutTask = task {
+            Thread.sleep(millis)
+            null
+        }
+        val activeTask = task(body = body)
+        return any(activeTask, timeoutTask)
+    }
+}

From fe96e112a57d74223008b0dc73aff10d64f3056f Mon Sep 17 00:00:00 2001
From: Swapan Pramanick <swapanpramanick2004@gmail.com>
Date: Tue, 11 Sep 2018 09:26:33 +0530
Subject: [PATCH 031/114] BAEL-2178 (#5194)

* BAEL-2178

* revert previous commit, adding classes to collections project
---
 .../java/com/baeldung/java/map/MapUtil.java   |  44 ++++++++
 .../baeldung/java/map/MapUtilUnitTest.java    | 104 ++++++++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 core-java-collections/src/main/java/com/baeldung/java/map/MapUtil.java
 create mode 100644 core-java-collections/src/test/java/com/baeldung/java/map/MapUtilUnitTest.java

diff --git a/core-java-collections/src/main/java/com/baeldung/java/map/MapUtil.java b/core-java-collections/src/main/java/com/baeldung/java/map/MapUtil.java
new file mode 100644
index 0000000000..688c7592f3
--- /dev/null
+++ b/core-java-collections/src/main/java/com/baeldung/java/map/MapUtil.java
@@ -0,0 +1,44 @@
+/**
+ * 
+ */
+package com.baeldung.java.map;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+import java.util.stream.Stream;
+
+/**
+ * @author swpraman
+ *
+ */
+public class MapUtil {
+    
+    public static <K, V> Stream<K> keys(Map<K, V> map, V value) {
+        return map.entrySet()
+                .stream()
+                .filter(entry -> value.equals(entry.getValue()))
+                .map(Map.Entry::getKey);
+    }
+    
+    public static <K, V> Set<K> getKeys(Map<K, V> map, V value) {
+        Set<K> keys = new HashSet<>();
+        for (Entry<K, V> entry : map.entrySet()) {
+            if (entry.getValue().equals(value)) {
+                keys.add(entry.getKey());
+            }
+        }
+        return keys;
+    }
+    
+    public static <K, V> K getKey(Map<K, V> map, V value) {
+        for (Entry<K, V> entry : map.entrySet()) {
+            if (entry.getValue().equals(value)) {
+                return entry.getKey();
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/core-java-collections/src/test/java/com/baeldung/java/map/MapUtilUnitTest.java b/core-java-collections/src/test/java/com/baeldung/java/map/MapUtilUnitTest.java
new file mode 100644
index 0000000000..e31385e972
--- /dev/null
+++ b/core-java-collections/src/test/java/com/baeldung/java/map/MapUtilUnitTest.java
@@ -0,0 +1,104 @@
+/**
+ * 
+ */
+package com.baeldung.java.map;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.bidimap.DualHashBidiMap;
+import org.junit.Test;
+
+import com.google.common.collect.HashBiMap;
+
+/**
+ * @author swpraman
+ *
+ */
+public class MapUtilUnitTest {
+    
+    
+    @Test
+    public void whenUsingImperativeWayForSingleKey_shouldReturnSingleKey() {
+        Map<String, String> capitalCountryMap = new HashMap<>();
+        capitalCountryMap.put("Tokyo", "Japan");
+        capitalCountryMap.put("New Delhi", "India");
+        assertEquals("New Delhi", MapUtil.getKey(capitalCountryMap, "India"));
+    }
+    
+    @Test
+    public void whenUsingImperativeWayForAllKeys_shouldReturnAllKeys() {
+        Map<String, String> capitalCountryMap = new HashMap<>();
+        capitalCountryMap.put("Tokyo", "Japan");
+        capitalCountryMap.put("Berlin", "Germany");
+        capitalCountryMap.put("Cape Town", "South Africa");
+        capitalCountryMap.put("Pretoria", "South Africa");
+        capitalCountryMap.put("Bloemfontein", "South Africa");
+
+        assertEquals(new HashSet<String>(Arrays.asList(
+                new String[] {"Cape Town", "Pretoria", "Bloemfontein"})), 
+                MapUtil.getKeys(capitalCountryMap, "South Africa"));
+    }
+    
+    @Test
+    public void whenUsingFunctionalWayForSingleKey_shouldReturnSingleKey() {
+        Map<String, String> capitalCountryMap = new HashMap<>();
+        capitalCountryMap.put("Tokyo", "Japan");
+        capitalCountryMap.put("Berlin", "Germany");
+        assertEquals("Berlin", MapUtil.keys(capitalCountryMap, "Germany").findFirst().get());
+    }
+    
+    @Test
+    public void whenUsingFunctionalWayForAllKeys_shouldReturnAllKeys() {
+        Map<String, String> capitalCountryMap = new HashMap<>();
+        capitalCountryMap.put("Tokyo", "Japan");
+        capitalCountryMap.put("Berlin", "Germany");
+        capitalCountryMap.put("Cape Town", "South Africa");
+        capitalCountryMap.put("Pretoria", "South Africa");
+        capitalCountryMap.put("Bloemfontein", "South Africa");
+        assertEquals(new HashSet<String>(Arrays.asList(
+                new String[] {"Cape Town", "Pretoria", "Bloemfontein"})), 
+                MapUtil.keys(capitalCountryMap, "South Africa").collect(Collectors.toSet()));
+    }
+    
+    @Test
+    public void whenUsingBidiMap_shouldReturnKey() {
+        BidiMap<String, String> capitalCountryMap = new DualHashBidiMap<String, String>();
+        capitalCountryMap.put("Berlin", "Germany");
+        capitalCountryMap.put("Cape Town", "South Africa");
+        assertEquals("Berlin", capitalCountryMap.getKey("Germany"));
+    }
+    
+    @Test
+    public void whenUsingBidiMapAddDuplicateValue_shouldRemoveOldEntry() {
+        BidiMap<String, String> capitalCountryMap = new DualHashBidiMap<String, String>();
+        capitalCountryMap.put("Berlin", "Germany");
+        capitalCountryMap.put("Cape Town", "South Africa");
+        capitalCountryMap.put("Pretoria", "South Africa");
+        assertEquals("Pretoria", capitalCountryMap.getKey("South Africa"));
+    }
+    
+    @Test
+    public void whenUsingBiMap_shouldReturnKey() {
+        HashBiMap<String, String> capitalCountryMap = HashBiMap.create();
+        capitalCountryMap.put("Berlin", "Germany");
+        capitalCountryMap.put("Cape Town", "South Africa");
+        assertEquals("Berlin", capitalCountryMap.inverse().get("Germany"));
+    }
+    
+    @Test(expected=IllegalArgumentException.class)
+    public void whenUsingBiMapAddDuplicateValue_shouldThrowException() {
+        HashBiMap<String, String> capitalCountryMap = HashBiMap.create();
+        capitalCountryMap.put("Berlin", "Germany");
+        capitalCountryMap.put("Cape Town", "South Africa");
+        capitalCountryMap.put("Pretoria", "South Africa");
+        assertEquals("Berlin", capitalCountryMap.inverse().get("Germany"));
+    }
+
+}

From a05fc4f82a925b5d9ae6636e788f071d7b5bdce9 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Tue, 11 Sep 2018 12:48:31 +0530
Subject: [PATCH 032/114] BAEL-8902 Metrics Project Test Fails

- Fixed tests
---
 metrics/pom.xml                               |  7 ++++
 .../MicrometerAtlasIntegrationTest.java       | 11 +++++--
 .../metrics/servo/AtlasObserverLiveTest.java  |  3 ++
 .../metrics/servo/MetricTypeManualTest.java   | 33 +++++++++----------
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/metrics/pom.xml b/metrics/pom.xml
index 86f197240b..9cf1ec588f 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -84,6 +84,13 @@
             <artifactId>spectator-api</artifactId>
             <version>${spectator-api.version}</version>
         </dependency>
+        
+		<dependency>
+		    <groupId>org.assertj</groupId>
+		    <artifactId>assertj-core</artifactId>
+		    <scope>test</scope>
+		</dependency>
+        
     </dependencies>
 
     <dependencyManagement>
diff --git a/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasIntegrationTest.java b/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasIntegrationTest.java
index e7f3d7ec72..689e23ad6d 100644
--- a/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasIntegrationTest.java
+++ b/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasIntegrationTest.java
@@ -1,8 +1,12 @@
 package com.baeldung.metrics.micrometer;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.within;
+import static org.assertj.core.api.Assertions.withinPercentage;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.collection.IsMapContaining.hasEntry;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import io.micrometer.atlas.AtlasMeterRegistry;
@@ -31,8 +35,10 @@ import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import org.assertj.core.data.Percentage;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 
 import com.netflix.spectator.atlas.AtlasConfig;
 
@@ -156,7 +162,8 @@ public class MicrometerAtlasIntegrationTest {
         timer.record(30, TimeUnit.MILLISECONDS);
 
         assertTrue(2 == timer.count());
-        assertTrue(50 > timer.totalTime(TimeUnit.MILLISECONDS) && 45 <= timer.totalTime(TimeUnit.MILLISECONDS));
+        
+        assertThat(timer.totalTime(TimeUnit.MILLISECONDS)).isBetween(40.0, 55.0);
     }
 
     @Test
@@ -173,7 +180,7 @@ public class MicrometerAtlasIntegrationTest {
         }
         long timeElapsed = longTaskTimer.stop(currentTaskId);
 
-        assertTrue(timeElapsed / (int) 1e6 == 2);
+        assertEquals(2L, timeElapsed/((int) 1e6),1L);
     }
 
     @Test
diff --git a/metrics/src/test/java/com/baeldung/metrics/servo/AtlasObserverLiveTest.java b/metrics/src/test/java/com/baeldung/metrics/servo/AtlasObserverLiveTest.java
index 134c3c91cf..b8a5b93e49 100644
--- a/metrics/src/test/java/com/baeldung/metrics/servo/AtlasObserverLiveTest.java
+++ b/metrics/src/test/java/com/baeldung/metrics/servo/AtlasObserverLiveTest.java
@@ -27,6 +27,9 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertThat;
 
+/**
+ * Atlas server needs to be up and running for this live test to work.
+ */
 public class AtlasObserverLiveTest {
 
     private final String atlasUri = "http://localhost:7101/api/v1";
diff --git a/metrics/src/test/java/com/baeldung/metrics/servo/MetricTypeManualTest.java b/metrics/src/test/java/com/baeldung/metrics/servo/MetricTypeManualTest.java
index d810de155a..92bbd615b9 100644
--- a/metrics/src/test/java/com/baeldung/metrics/servo/MetricTypeManualTest.java
+++ b/metrics/src/test/java/com/baeldung/metrics/servo/MetricTypeManualTest.java
@@ -109,20 +109,20 @@ public class MetricTypeManualTest {
             .build(), MILLISECONDS);
 
         Stopwatch stopwatch = timer.start();
-        MILLISECONDS.sleep(1);
-        timer.record(2, MILLISECONDS);
+        SECONDS.sleep(1);
+        timer.record(2, SECONDS);
         stopwatch.stop();
 
-        assertEquals("timer should count 1 millisecond", 1, timer
+        assertEquals("timer should count 1 second", 1000, timer
           .getValue()
-          .intValue());
-        assertEquals("timer should count 3 millisecond in total", 3, timer.getTotalTime()
-            .intValue());
+          .intValue(),1000);        
+        assertEquals("timer should count 3 second in total", 3000, timer.getTotalTime()
+            .intValue(),1000);
         assertEquals("timer should record 2 updates", 2, timer
           .getCount()
           .intValue());
 
-        assertEquals("timer should have max 2", 2, timer.getMax(), 0.01);
+        assertEquals("timer should have max 2", 2000, timer.getMax(), 0.01);
     }
 
     @Test
@@ -161,7 +161,6 @@ public class MetricTypeManualTest {
     }
 
     @Test
-    //==
     public void givenStatsTimer_whenExecuteTask_thenStatsCalculated() throws Exception {
         System.setProperty("netflix.servo", "1000");
         StatsTimer timer = new StatsTimer(MonitorConfig
@@ -178,21 +177,21 @@ public class MetricTypeManualTest {
             .build(), MILLISECONDS);
 
         Stopwatch stopwatch = timer.start();
-        MILLISECONDS.sleep(1);
-        timer.record(3, MILLISECONDS);
+        SECONDS.sleep(1);
+        timer.record(3, SECONDS);
         stopwatch.stop();
 
         stopwatch = timer.start();
-        timer.record(6, MILLISECONDS);
-        MILLISECONDS.sleep(2);
+        timer.record(6, SECONDS);
+        SECONDS.sleep(2);
         stopwatch.stop();
 
-        assertEquals("timer should count 12 milliseconds in total", 12, timer.getTotalTime());
-        assertEquals("timer should count 12 milliseconds in total", 12, timer.getTotalMeasurement());
+        assertEquals("timer should count 12 seconds in total", 12000, timer.getTotalTime(),500);
+        assertEquals("timer should count 12 seconds in total", 12000, timer.getTotalMeasurement(),500);
         assertEquals("timer should record 4 updates", 4, timer.getCount());
-        assertEquals("stats timer value time-cost/update should be 2", 3, timer
+        assertEquals("stats timer value time-cost/update should be 2", 3000, timer
           .getValue()
-          .intValue());
+          .intValue(),500);
 
         final Map<String, Number> metricMap = timer
           .getMonitors()
@@ -235,4 +234,4 @@ public class MetricTypeManualTest {
         assertEquals("information collected", informational.getValue());
     }
 
-}
+}
\ No newline at end of file

From dbdbe79910104271a0ac0457b67735837cd99cb1 Mon Sep 17 00:00:00 2001
From: priyeshmashelkar <mashelkar.priyesh@gmail.com>
Date: Tue, 11 Sep 2018 10:46:05 +0100
Subject: [PATCH 033/114] Renamed Manager to DeptEmployee

---
 .../com/baeldung/hibernate/HibernateUtil.java |  3 +-
 .../hibernate/entities/Department.java        | 22 +++++++----
 .../{Manager.java => DeptEmployee.java}       | 39 ++++++++++++++-----
 .../com/baeldung/hibernate/pojo/Result.java   |  5 ++-
 .../hibernate/CustomClassIntegrationTest.java | 24 ++++++------
 5 files changed, 61 insertions(+), 32 deletions(-)
 rename hibernate5/src/main/java/com/baeldung/hibernate/entities/{Manager.java => DeptEmployee.java} (59%)

diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
index c75f8e358f..849d271cd4 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.Properties;
 
+import com.baeldung.hibernate.entities.DeptEmployee;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.Metadata;
@@ -92,7 +93,7 @@ public class HibernateUtil {
         metadataSources.addAnnotatedClass(PessimisticLockingCourse.class);
         metadataSources.addAnnotatedClass(com.baeldung.hibernate.pessimisticlocking.Customer.class);
         metadataSources.addAnnotatedClass(com.baeldung.hibernate.pessimisticlocking.Address.class);
-        metadataSources.addAnnotatedClass(com.baeldung.hibernate.entities.Manager.class);
+        metadataSources.addAnnotatedClass(DeptEmployee.class);
         metadataSources.addAnnotatedClass(com.baeldung.hibernate.entities.Department.class);
 
         Metadata metadata = metadataSources.buildMetadata();
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
index ceabfc742e..ff94f4f849 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java
@@ -2,17 +2,18 @@ package com.baeldung.hibernate.entities;
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
 
 @Entity
 public class Department {
     @Id
-    long id;
-    String name;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private long id;
+
+    private String name;
+
     @OneToMany(mappedBy="department")
-    List<Manager> employees;
+    private List<DeptEmployee> employees;
 
     public Department(String name) {
         this.name = name;
@@ -21,19 +22,24 @@ public class Department {
     public long getId() {
         return id;
     }
+
     public void setId(long id) {
         this.id = id;
     }
+
     public String getName() {
         return name;
     }
+
     public void setName(String name) {
         this.name = name;
     }
-    public List<Manager> getEmployees() {
+
+    public List<DeptEmployee> getEmployees() {
         return employees;
     }
-    public void setEmployees(List<Manager> employees) {
+
+    public void setEmployees(List<DeptEmployee> employees) {
         this.employees = employees;
     }
 }
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Manager.java b/hibernate5/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
similarity index 59%
rename from hibernate5/src/main/java/com/baeldung/hibernate/entities/Manager.java
rename to hibernate5/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
index d9d8e8d40f..7a51009b62 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/entities/Manager.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
@@ -1,19 +1,23 @@
 package com.baeldung.hibernate.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 
 @Entity
-public class Manager {
+public class DeptEmployee {
     @Id
-    long id;
-    String employeeNumber;
-    String name;
-    @ManyToOne    
-    Department department;
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private long id;
+
+    private String employeeNumber;
+
+    private String designation;
+
+    private String name;
+
+    @ManyToOne
+    private Department department;
     
-    public Manager(String name, String employeeNumber, Department department) {
+    public DeptEmployee(String name, String employeeNumber, Department department) {
         this.name = name;
         this.employeeNumber = employeeNumber;
         this.department = department;
@@ -22,25 +26,40 @@ public class Manager {
     public long getId() {
         return id;
     }
+
     public void setId(long id) {
         this.id = id;
     }
+
     public String getEmployeeNumber() {
         return employeeNumber;
     }
+
     public void setEmployeeNumber(String employeeNumber) {
         this.employeeNumber = employeeNumber;
     }
+
     public String getName() {
         return name;
     }
+
     public void setName(String name) {
         this.name = name;
     }
+
     public Department getDepartment() {
         return department;
     }
+
     public void setDepartment(Department department) {
         this.department = department;
     }
+
+    public String getDesignation() {
+        return designation;
+    }
+
+    public void setDesignation(String designation) {
+        this.designation = designation;
+    }
 }
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
index 588a895c14..607269a267 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java
@@ -1,8 +1,9 @@
 package com.baeldung.hibernate.pojo;
 
 public class Result {
-    String employeeName;
-    String departmentName;
+    private String employeeName;
+
+    private String departmentName;
     
     public Result(String employeeName, String departmentName) {
         this.employeeName = employeeName;
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
index 622063b828..29ae55b773 100644
--- a/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java
@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.io.IOException;
 import java.util.List;
 
+import com.baeldung.hibernate.entities.DeptEmployee;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.query.Query;
@@ -13,10 +14,9 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import com.baeldung.hibernate.entities.Department;
-import com.baeldung.hibernate.entities.Manager;
 import com.baeldung.hibernate.pojo.Result;
 
-class CustomClassIntegrationTest {
+public class CustomClassIntegrationTest {
 
     private Session session;
 
@@ -29,7 +29,7 @@ class CustomClassIntegrationTest {
         session.createNativeQuery("delete from manager").executeUpdate();
         session.createNativeQuery("delete from department").executeUpdate();
         Department department = new Department("Sales");
-        Manager employee = new Manager("John Smith", "001", department);
+        DeptEmployee employee = new DeptEmployee("John Smith", "001", department);
         session.persist(department);
         session.persist(employee);
         transaction.commit();
@@ -38,16 +38,16 @@ class CustomClassIntegrationTest {
     
     @Test
     public void whenAllManagersAreSelected_ThenObjectGraphIsReturned() {
-        Query<Manager> query = session.createQuery("from com.baeldung.hibernate.entities.Manager");
-        List<Manager> managers = query.list();
-        Manager manager = managers.get(0);
-        assertEquals("John Smith", manager.getName());
-        assertEquals("Sales", manager.getDepartment().getName());
+        Query<DeptEmployee> query = session.createQuery("from com.baeldung.hibernate.entities.DeptEmployee");
+        List<DeptEmployee> deptEmployees = query.list();
+        DeptEmployee deptEmployee = deptEmployees.get(0);
+        assertEquals("John Smith", deptEmployee.getName());
+        assertEquals("Sales", deptEmployee.getDepartment().getName());
     }
     
     @Test
     public void whenIndividualPropertiesAreSelected_ThenObjectArrayIsReturned() {
-        Query query = session.createQuery("select m.name, m.department.name from com.baeldung.hibernate.entities.Manager m");
+        Query query = session.createQuery("select m.name, m.department.name from com.baeldung.hibernate.entities.DeptEmployee m");
         List managers = query.list();
         Object[] manager = (Object[]) managers.get(0);
         assertEquals("John Smith", manager[0]);
@@ -56,7 +56,8 @@ class CustomClassIntegrationTest {
     
     @Test
     public void whenResultConstructorInSelect_ThenListOfResultIsReturned() {
-        Query<Result> query = session.createQuery("select new com.baeldung.hibernate.pojo.Result(m.name, m.department.name) from Manager m");
+        Query<Result> query = session.createQuery("select new com.baeldung.hibernate.pojo.Result(m.name, m.department.name) "
+                + "from DeptEmployee m");
         List<Result> results = query.list();
         Result result = results.get(0);
         assertEquals("John Smith", result.getEmployeeName());
@@ -65,7 +66,8 @@ class CustomClassIntegrationTest {
     
     @Test
     public void whenResultTransformerOnQuery_ThenListOfResultIsReturned() {
-        Query query = session.createQuery("select m.name as employeeName, m.department.name as departmentName from com.baeldung.hibernate.entities.Manager m");
+        Query query = session.createQuery("select m.name as employeeName, m.department.name as departmentName "
+                + "from com.baeldung.hibernate.entities.DeptEmployee m");
         query.setResultTransformer(Transformers.aliasToBean(Result.class));
         List<Result> results = query.list();
         Result result = results.get(0);

From 2d15cb3b49bd2ae1ad1f39bc2d87b864538bce4b Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Tue, 11 Sep 2018 15:58:47 +0400
Subject: [PATCH 034/114] set benchmark tests

---
 .../src/main/java/com/baeldung/sort/SortHashMap.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
index 6bf56274ac..6adb2ee120 100644
--- a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
+++ b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
@@ -17,8 +17,16 @@ public class SortHashMap {
         //arrayListSortByValue();
         //arrayListSortByKey();
 
-        treeSetByKey();
-        treeSetByValue();
+        //treeSetByKey();
+        //treeSetByValue();
+
+        sortStream();
+    }
+
+    private static void sortStream() {
+        map.entrySet().stream()
+                .sorted(Map.Entry.<String, Employee>comparingByKey().reversed())
+                .forEach(System.out::println);
     }
 
     private static void treeSetByValue() {

From 0553cb63506fe3b570dfd022df666013b6c9240b Mon Sep 17 00:00:00 2001
From: Sam Millington <s.j.millington@hotmail.co.uk>
Date: Tue, 11 Sep 2018 13:24:11 +0100
Subject: [PATCH 035/114] Update and rename BenchmarkUnitTest.java to
 BenchmarkManualTest.java (#5225)

---
 .../{BenchmarkUnitTest.java => BenchmarkManualTest.java}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename java-streams/src/test/java/com/baeldung/streamordering/{BenchmarkUnitTest.java => BenchmarkManualTest.java} (98%)

diff --git a/java-streams/src/test/java/com/baeldung/streamordering/BenchmarkUnitTest.java b/java-streams/src/test/java/com/baeldung/streamordering/BenchmarkManualTest.java
similarity index 98%
rename from java-streams/src/test/java/com/baeldung/streamordering/BenchmarkUnitTest.java
rename to java-streams/src/test/java/com/baeldung/streamordering/BenchmarkManualTest.java
index ba1cb1f726..656a6d95f9 100644
--- a/java-streams/src/test/java/com/baeldung/streamordering/BenchmarkUnitTest.java
+++ b/java-streams/src/test/java/com/baeldung/streamordering/BenchmarkManualTest.java
@@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
 
 
-public class BenchmarkUnitTest
+public class BenchmarkManualTest
 {
 
   public void

From 7b256aa060c7fb0be7ecd4458b20793d946316ef Mon Sep 17 00:00:00 2001
From: Doha2012 <dohae243@gmail.com>
Date: Tue, 11 Sep 2018 21:41:30 +0200
Subject: [PATCH 036/114] whitelist ip range (#5221)

---
 .../java/org/baeldung/ip/IpApplication.java   | 12 +++++
 .../CustomIpAuthenticationProvider.java       | 53 +++++++++++++++++++
 .../baeldung/ip/config/SecurityConfig.java    | 36 +++++++++++++
 .../baeldung/ip/config/SecurityXmlConfig.java |  9 ++++
 .../org/baeldung/ip/web/MainController.java   | 21 ++++++++
 .../src/main/resources/spring-security-ip.xml | 21 ++++++++
 .../java/org/baeldung/web/IpLiveTest.java     | 27 ++++++++++
 7 files changed, 179 insertions(+)
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
 create mode 100644 spring-security-mvc-boot/src/main/resources/spring-security-ip.xml
 create mode 100644 spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java

diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java
new file mode 100644
index 0000000000..fd270686a2
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java
@@ -0,0 +1,12 @@
+package org.baeldung.ip;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+public class IpApplication extends SpringBootServletInitializer {
+    public static void main(String[] args) {
+        SpringApplication.run(IpApplication.class, args);
+    }
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java
new file mode 100644
index 0000000000..078dd81259
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java
@@ -0,0 +1,53 @@
+package org.baeldung.ip.config;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.web.authentication.WebAuthenticationDetails;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CustomIpAuthenticationProvider implements AuthenticationProvider {
+    
+   Set<String> whitelist = new HashSet<String>();
+
+    public CustomIpAuthenticationProvider() {
+        super();
+        whitelist.add("11.11.11.11");
+        whitelist.add("127.0.0.1");
+    }
+
+    @Override
+    public Authentication authenticate(Authentication auth) throws AuthenticationException {
+        WebAuthenticationDetails details = (WebAuthenticationDetails) auth.getDetails();
+        String userIp = details.getRemoteAddress();
+        if(! whitelist.contains(userIp)){
+            throw new BadCredentialsException("Invalid IP Address");
+        }
+        final String name = auth.getName();
+        final String password = auth.getCredentials().toString();
+        
+        if (name.equals("john") && password.equals("123")) {
+        List<GrantedAuthority> authorities =new ArrayList<GrantedAuthority>();
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
+        return new UsernamePasswordAuthenticationToken(name, password, authorities);
+        }
+        else{
+            throw new BadCredentialsException("Invalid username or password");
+        }
+    }
+
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return authentication.equals(UsernamePasswordAuthenticationToken.class);
+    }
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
new file mode 100644
index 0000000000..b4ed8277d6
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
@@ -0,0 +1,36 @@
+package org.baeldung.ip.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+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;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Autowired
+    private CustomIpAuthenticationProvider authenticationProvider;
+
+    @Override
+    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
+       auth.inMemoryAuthentication().withUser("john").password("{noop}123").authorities("ROLE_USER");
+     //   auth.authenticationProvider(authenticationProvider);
+    }
+
+    @Override
+    protected void configure(final HttpSecurity http) throws Exception {
+        // @formatter:off
+        http.authorizeRequests()
+            .antMatchers("/login").permitAll()
+//            .antMatchers("/foos/**").hasIpAddress("11.11.11.11")
+            .antMatchers("/foos/**").access("isAuthenticated() and hasIpAddress('11.11.11.11')")
+            .anyRequest().authenticated()
+            .and().formLogin().permitAll()
+            .and().csrf().disable();
+        // @formatter:on
+    }
+
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java
new file mode 100644
index 0000000000..1d22ca4c67
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java
@@ -0,0 +1,9 @@
+package org.baeldung.ip.config;
+
+
+//@Configuration
+//@EnableWebSecurity
+//@ImportResource({ "classpath:spring-security-ip.xml" })
+public class SecurityXmlConfig {
+   
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
new file mode 100644
index 0000000000..da5db5e825
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
@@ -0,0 +1,21 @@
+package org.baeldung.ip.web;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.baeldung.custom.persistence.model.Foo;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class MainController {
+
+    @RequestMapping(method = RequestMethod.GET, value = "/foos/{id}")
+    @ResponseBody
+    public Foo findById(@PathVariable final long id, HttpServletRequest request) {
+        return new Foo("Sample");
+    }
+
+}
diff --git a/spring-security-mvc-boot/src/main/resources/spring-security-ip.xml b/spring-security-mvc-boot/src/main/resources/spring-security-ip.xml
new file mode 100644
index 0000000000..31796ad134
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/resources/spring-security-ip.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security"
+  xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <security:authentication-manager>
+        <security:authentication-provider>
+            <security:user-service>
+                <security:user name="john" password="{noop}123" authorities="ROLE_USER" />
+            </security:user-service>
+        </security:authentication-provider>
+    </security:authentication-manager>
+
+    <security:http>
+        <security:form-login/>
+        <security:intercept-url pattern="/login" access="permitAll()" />
+        <security:intercept-url pattern="/foos/**" access="hasIpAddress('11.11.11.11')" />
+        <security:intercept-url pattern="/**" access="isAuthenticated()" />
+    </security:http>
+</beans>
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java
new file mode 100644
index 0000000000..e12e2f87b0
--- /dev/null
+++ b/spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java
@@ -0,0 +1,27 @@
+package org.baeldung.web;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+
+import org.junit.Test;
+
+
+public class IpLiveTest {
+
+    @Test
+    public void givenUser_whenGetHomePage_thenOK() {
+        final Response response = RestAssured.given().auth().form("john", "123").get("http://localhost:8082/");
+        assertEquals(200, response.getStatusCode());
+        assertTrue(response.asString().contains("Welcome"));
+    }
+    
+    @Test
+    public void givenUserWithWrongIP_whenGetFooById_thenForbidden() {
+        final Response response = RestAssured.given().auth().form("john", "123").get("http://localhost:8082/foos/1");
+        assertEquals(403, response.getStatusCode());
+        assertTrue(response.asString().contains("Forbidden"));
+    }
+   
+}
\ No newline at end of file

From 708d64c18341c9f8b3886d6a39d6abecfa196e58 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Wed, 12 Sep 2018 12:13:51 +0530
Subject: [PATCH 037/114] BAEL-8901 Add section in "Stream operations on
 Strings" article

- Added string array to map example.
---
 .../com/baeldung/string/JoinerSplitter.java     |  8 ++++++++
 .../baeldung/string/JoinerSplitterUnitTest.java | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java b/java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java
index 085be66801..cdbba1ef53 100644
--- a/java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java
+++ b/java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java
@@ -2,6 +2,7 @@ package com.baeldung.string;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -32,5 +33,12 @@ public class JoinerSplitter {
 				.mapToObj(item -> (char) item)
 				.collect(Collectors.toList());
 	}
+	
+	public static Map<String, String> arrayToMap(String[] arrayOfString) {
+		return Arrays.asList(arrayOfString)
+				.stream()
+				.map(str -> str.split(":"))
+				.collect(Collectors.<String[], String, String>toMap(str -> str[0], str -> str[1]));
+	}
 		
 }
diff --git a/java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java b/java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java
index 8901bcf9db..a9488e27a4 100644
--- a/java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java
@@ -3,7 +3,9 @@ package com.baeldung.string;
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
@@ -62,5 +64,20 @@ public class JoinerSplitterUnitTest {
         assertEquals(result, expectation);
 
     }
+    
+    @Test
+    public void givenStringArray_transformedToStream_convertToMap() {
+
+        String[] programming_languages = new String[] {"language:java","os:linux","editor:emacs"};
+        
+        Map<String,String> expectation=new HashMap<>();
+        expectation.put("language", "java");
+        expectation.put("os", "linux");
+        expectation.put("editor", "emacs");
+        
+        Map<String, String> result = JoinerSplitter.arrayToMap(programming_languages);
+        assertEquals(result, expectation);
+        
+    }
 
 }

From 33e7ce89ce7593664f14023f38e1e48bbc2c968d Mon Sep 17 00:00:00 2001
From: RanjeetKaur17 <ranjeet@algorythma.com>
Date: Wed, 12 Sep 2018 20:09:27 +0400
Subject: [PATCH 038/114] Adding Examples for ZonedDateTime, OffsetDateTime and
 OffsetTime

---
 .../java/com/baeldung/manifest/MANIFEST.MF    |  1 +
 .../zoneddatetime/OffsetDateTimeExample.java  | 17 +++++++++++
 .../zoneddatetime/OffsetTimeExample.java      | 18 +++++++++++
 .../zoneddatetime/ZoneDateTimeExample.java    | 21 +++++++++++++
 .../OffsetDateTimeExampleUnitTest.java        | 25 ++++++++++++++++
 .../OffsetTimeExampleUnitTest.java            | 25 ++++++++++++++++
 .../ZoneDateTimeExampleUnitTest.java          | 30 +++++++++++++++++++
 7 files changed, 137 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
 create mode 100644 core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
 create mode 100644 core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
 create mode 100644 core-java/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java
 create mode 100644 core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java

diff --git a/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF b/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
new file mode 100644
index 0000000000..a363171952
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
@@ -0,0 +1 @@
+Main-Class: com.baeldung.manifest.AppExample
diff --git a/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
new file mode 100644
index 0000000000..a22de0db18
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
@@ -0,0 +1,17 @@
+package com.baeldung.zoneddatetime;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+
+public class OffsetDateTimeExample {
+
+    public OffsetDateTime getCurrentTimeByZoneOffset(String region) {
+        LocalDateTime now = LocalDateTime.now();
+        ZoneId zone = ZoneId.of(region);
+        ZoneOffset zoneOffSet= zone.getRules().getOffset(now);
+        OffsetDateTime date = OffsetDateTime.now(zoneOffSet);
+        return date;
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
new file mode 100644
index 0000000000..7d926c0562
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
@@ -0,0 +1,18 @@
+package com.baeldung.zoneddatetime;
+
+import java.time.LocalDateTime;
+import java.time.OffsetTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+
+public class OffsetTimeExample {
+
+    public OffsetTime getCurrentTimeByZoneOffset(String region) {
+        LocalDateTime now = LocalDateTime.now();
+        ZoneId zone = ZoneId.of(region);
+        ZoneOffset zoneOffSet = zone.getRules()
+            .getOffset(now);
+        OffsetTime time = OffsetTime.now(zoneOffSet);
+        return time;
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java b/core-java/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java
new file mode 100644
index 0000000000..b54b8c5225
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java
@@ -0,0 +1,21 @@
+package com.baeldung.zoneddatetime;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+public class ZoneDateTimeExample {
+
+    public ZonedDateTime getCurrentTimeByZoneId(String region) {
+        ZoneId zone = ZoneId.of(region);
+        ZonedDateTime date = ZonedDateTime.now(zone);
+        return date;
+    }
+
+    public ZonedDateTime convertZonedDateTime(ZonedDateTime sourceDate, String destZone) {
+
+        ZoneId destZoneId = ZoneId.of(destZone);
+        ZonedDateTime destDate = sourceDate.withZoneSameInstant(destZoneId);
+
+        return destDate;
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
new file mode 100644
index 0000000000..c60f6967f9
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.zoneddatetime;
+
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+
+import org.junit.Test;
+
+public class OffsetDateTimeExampleUnitTest {
+
+    OffsetDateTimeExample offsetDateTimeExample = new OffsetDateTimeExample();
+
+    @Test
+    public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
+        String zone = "Europe/Berlin";
+        OffsetDateTime time = offsetDateTimeExample.getCurrentTimeByZoneOffset(zone);   
+
+        assertTrue(time.getOffset()
+            .equals(ZoneId.of(zone)
+                .getRules()
+                .getOffset(LocalDateTime.now())));
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
new file mode 100644
index 0000000000..0e1206dc5b
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.zoneddatetime;
+
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDateTime;
+import java.time.OffsetTime;
+import java.time.ZoneId;
+
+import org.junit.Test;
+
+public class OffsetTimeExampleUnitTest {
+
+    OffsetTimeExample offsetTimeExample = new OffsetTimeExample();
+
+    @Test
+    public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
+        String zone = "Europe/Berlin";
+        OffsetTime time = offsetTimeExample.getCurrentTimeByZoneOffset(zone);   
+
+        assertTrue(time.getOffset()
+            .equals(ZoneId.of(zone)
+                .getRules()
+                .getOffset(LocalDateTime.now())));
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java b/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java
new file mode 100644
index 0000000000..7f4f9cd17c
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.zoneddatetime;
+
+import static org.junit.Assert.assertTrue;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+import org.junit.Test;
+
+public class ZoneDateTimeExampleUnitTest {
+
+    ZoneDateTimeExample zoneDateTimeExample = new ZoneDateTimeExample();
+
+    @Test
+    public void givenZone_whenGetCurrentTime_thenResultHasZone() {
+        String zone = "Europe/Berlin";
+        ZonedDateTime time = zoneDateTimeExample.getCurrentTimeByZoneId(zone);
+        assertTrue(time.getZone()
+            .equals(ZoneId.of(zone)));
+    }
+    
+    @Test
+    public void givenZones_whenConvertDateByZone_thenGetConstantDiff() {
+        String sourceZone = "Europe/Berlin";
+        String destZone = "Asia/Tokyo";
+        ZonedDateTime sourceDate = zoneDateTimeExample.getCurrentTimeByZoneId(sourceZone);
+        ZonedDateTime destDate = zoneDateTimeExample.convertZonedDateTime(sourceDate, destZone);
+        assertTrue(sourceDate.toInstant().compareTo(destDate.toInstant()) == 0);
+    }
+}

From e8a48fbad29d4daa41a18805db88a2651b400060 Mon Sep 17 00:00:00 2001
From: RanjeetKaur17 <ranjeet@algorythma.com>
Date: Wed, 12 Sep 2018 20:11:40 +0400
Subject: [PATCH 039/114] Removing unused file.

---
 core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF

diff --git a/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF b/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
deleted file mode 100644
index a363171952..0000000000
--- a/core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: com.baeldung.manifest.AppExample

From 6009c4f9100078b2fb347d665e08a964c0572a8f Mon Sep 17 00:00:00 2001
From: daoire <darragh@acornsoftware.ie>
Date: Wed, 12 Sep 2018 20:35:59 +0100
Subject: [PATCH 040/114] Updates to Double to string

---
 .../decimalformat/DoubletoString.java         | 45 ++++++++-----------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/decimalformat/DoubletoString.java b/core-java/src/main/java/com/baeldung/decimalformat/DoubletoString.java
index 87d10a3548..e605c5e200 100644
--- a/core-java/src/main/java/com/baeldung/decimalformat/DoubletoString.java
+++ b/core-java/src/main/java/com/baeldung/decimalformat/DoubletoString.java
@@ -1,38 +1,29 @@
 package com.baeldung.decimalformat;
 
- import java.math.RoundingMode;
- import java.text.DecimalFormat;
- import java.text.NumberFormat;
- import java.util.Locale;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 
- public class DoubletoString {
+public class DoubletoString {
 
-     public static void main(String[] args) {
+    public static void main(String[] args) {
 
-         double doubleValue = 345.56;
+        double doubleValue = 345.56;
 
-         System.out.println(String.valueOf((int) doubleValue));
+        System.out.println(String.valueOf((int) doubleValue));
 
-         System.out.println(String.format("%.0f", doubleValue));
+        System.out.println(String.format("%.0f", doubleValue));
 
-         doubleValue = Math.floor(doubleValue);
-         DecimalFormat df = new DecimalFormat("#");
-         df.setRoundingMode(RoundingMode.FLOOR);
-         System.out.println(df.format(doubleValue));
-         
-         Locale enlocale = new Locale("en", "US");
-         String pattern = "###,##";
-         df = (DecimalFormat) NumberFormat.getNumberInstance(enlocale);
-         df.applyPattern(pattern);
-         String format = df.format(doubleValue);
-         System.out.println(format);
+        NumberFormat nf = NumberFormat.getInstance();
+        nf.setMaximumFractionDigits(0);
+        nf.setRoundingMode(RoundingMode.FLOOR);
+        System.out.println(nf.format(doubleValue));
 
-         Locale dalocale = new Locale("da", "DK");
-         df = (DecimalFormat) NumberFormat.getNumberInstance(dalocale);
-         df.applyPattern(pattern);
-         System.out.println(df.format(doubleValue));
+        doubleValue = Math.floor(doubleValue);
+        DecimalFormat df = new DecimalFormat("#,###");
+        df.setRoundingMode(RoundingMode.FLOOR);
+        System.out.println(df.format(doubleValue));
 
+    }
 
-     }
-
- }
+}

From 6e71cd302cfac6e259693c4d28009023bbf54a3f Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Thu, 13 Sep 2018 00:10:16 +0400
Subject: [PATCH 041/114] HashMap sort initial version

---
 .../java/com/baeldung/sort/SortHashMap.java   | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
index 6adb2ee120..938f740e9a 100644
--- a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
+++ b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
@@ -1,8 +1,11 @@
 package com.baeldung.sort;
 
 import com.baeldung.performance.Employee;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Ordering;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class SortHashMap {
 
@@ -20,13 +23,36 @@ public class SortHashMap {
         //treeSetByKey();
         //treeSetByValue();
 
-        sortStream();
+        //sortStream();
+
+        sortGuava();
+    }
+
+    private static void sortGuava() {
+        Ordering<Map.Entry<String, Employee>> orderById = new Ordering<Map.Entry<String, Employee>>() {
+            @Override
+            public int compare(Map.Entry<String, Employee> left, Map.Entry<String, Employee> right) {
+                return left.getValue().getId().compareTo(right.getValue().getId());
+            }
+        };
+
+        List<Map.Entry<String, Employee>> toList = Lists.newArrayList(map.entrySet());
+        Collections.sort(toList, orderById);
+
+        toList.forEach(System.out::println);
     }
 
     private static void sortStream() {
         map.entrySet().stream()
                 .sorted(Map.Entry.<String, Employee>comparingByKey().reversed())
                 .forEach(System.out::println);
+
+        Map<String, Employee> result = map.entrySet().stream()
+                .sorted(Comparator.comparingLong(e -> e.getValue().getId()))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
+                (oldValue, newValue) -> oldValue, LinkedHashMap::new));
+
+        result.entrySet().forEach(System.out::println);
     }
 
     private static void treeSetByValue() {

From e0172002d5c171ea2c2dc93b59bfede09b6524dc Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Thu, 13 Sep 2018 01:14:09 +0400
Subject: [PATCH 042/114] minor change

---
 .../src/main/java/com/baeldung/sort/SortHashMap.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
index 938f740e9a..c803e8f193 100644
--- a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
+++ b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
@@ -63,8 +63,8 @@ public class SortHashMap {
     }
 
     private static void treeSetByKey() {
-        SortedSet<String> keys = new TreeSet<>(map.keySet());
-        System.out.println(keys);
+        SortedSet<String> keysSet = new TreeSet<>(map.keySet());
+        System.out.println(keysSet);
     }
 
     private static void treeMapSortByKey() {

From 38a995658e124b6f3c8860a76fbd50f381605dca Mon Sep 17 00:00:00 2001
From: Philippe <phil@lighthouse.com.br>
Date: Wed, 12 Sep 2018 22:51:27 -0300
Subject: [PATCH 043/114] Code for [BAEL-455]

---
 .../twitter/twitter                           |  1 -
 spring-cloud/spring-cloud-vault/pom.xml       | 17 +++---
 .../cloud/vaultsample/domain/Account.java     | 58 -------------------
 .../repository/AccountRepository.java         | 10 ----
 .../src/main/resources/bootstrap.yml          |  4 +-
 .../VaultSampleApplicationLiveTest.java       |  4 +-
 .../src/test/resources/bootstrap.properties   |  2 +-
 7 files changed, 14 insertions(+), 82 deletions(-)
 delete mode 160000 spring-cloud/spring-cloud-stream-starters/twitter/twitter
 delete mode 100644 spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java
 delete mode 100644 spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/repository/AccountRepository.java

diff --git a/spring-cloud/spring-cloud-stream-starters/twitter/twitter b/spring-cloud/spring-cloud-stream-starters/twitter/twitter
deleted file mode 160000
index f9673ef0c1..0000000000
--- a/spring-cloud/spring-cloud-stream-starters/twitter/twitter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f9673ef0c11c51b327555aaca61ee196935f998b
diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/spring-cloud/spring-cloud-vault/pom.xml
index b5cf1b4094..68b8e44875 100644
--- a/spring-cloud/spring-cloud-vault/pom.xml
+++ b/spring-cloud/spring-cloud-vault/pom.xml
@@ -29,15 +29,7 @@
 
 	<dependencies>
 	
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-rest</artifactId>
-		</dependency>
 		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
 		
 		
 		<dependency>
@@ -45,6 +37,11 @@
 			<artifactId>spring-cloud-starter-vault-config</artifactId>
 		</dependency>
 
+		<dependency>
+		  <groupId>org.springframework.cloud</groupId>
+		  <artifactId>spring-cloud-vault-config-databases</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -59,6 +56,10 @@
 		</dependency>
 
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>
diff --git a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java
deleted file mode 100644
index 042cbbb09d..0000000000
--- a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.baeldung.spring.cloud.vaultsample.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.validation.constraints.NotNull;
-
-@Entity
-public class Account {
-    
-    @Id
-    private Long id;
-    
-    @NotNull
-    private String name;
-    
-    @NotNull
-    private Long branchId;
-    
-    @NotNull
-    private Long customerId;
-    
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getBranchId() {
-        return branchId;
-    }
-
-    public void setBranchId(Long branchId) {
-        this.branchId = branchId;
-    }
-
-    public Long getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Long customerId) {
-        this.customerId = customerId;
-    }
-
-    
-    
-
-}
diff --git a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/repository/AccountRepository.java b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/repository/AccountRepository.java
deleted file mode 100644
index e1f5583571..0000000000
--- a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/repository/AccountRepository.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.baeldung.spring.cloud.vaultsample.repository;
-
-import org.baeldung.spring.cloud.vaultsample.domain.Account;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-
-@RepositoryRestResource(collectionResourceRel="accounts", path="accounts")
-public interface AccountRepository extends PagingAndSortingRepository<Account, Long> {
-
-}
diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml b/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
index 1dcffc021a..1e837c4920 100644
--- a/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
+++ b/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
@@ -7,7 +7,6 @@ spring:
       config:
           order: -10
           
-      token: b93d1b0d-15b5-f69e-d311-352a65fa7bc8
       ssl:
         trust-store: classpath:/vault.jks
         trust-store-password: changeit
@@ -17,13 +16,14 @@ spring:
         application-name: fakebank
         
       kv:
-        enabled: true
+        enabled: false
         backend: kv
         application-name: fakebank
         
       database:
         enabled: true
         role: fakebank-accounts-rw
+#        backend: database
 #        username-property: spring.datasource.username
 #        password-property: spring.datasource.password
         
diff --git a/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java
index ea782a5a6b..7a9c5ba11a 100644
--- a/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java
+++ b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java
@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.vault.annotation.VaultPropertySource;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -26,11 +25,12 @@ public class VaultSampleApplicationLiveTest {
     @Autowired
     DataSource datasource;
 
+
     @Test
     public void whenGenericBackendEnabled_thenEnvHasAccessToVaultSecrets() {
 
         String fooValue = env.getProperty("foo");
-        assertEquals("bar", fooValue);
+        assertEquals("test-bar", fooValue);
 
     }
     
diff --git a/spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties b/spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties
index d5c8100f98..8c54227dda 100644
--- a/spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties
+++ b/spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties
@@ -1,3 +1,3 @@
-#spring.cloud.vault.token=b93d1b0d-15b5-f69e-d311-352a65fa7bc8
+spring.cloud.vault.token=b93d1b0d-15b5-f69e-d311-352a65fa7bc8
 
 logging.level.org.springframework=INFO
\ No newline at end of file

From 107e6a75bed907227c5631fff77c89abb0f60ecb Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Thu, 13 Sep 2018 10:19:41 +0530
Subject: [PATCH 044/114] Feature/bael 2118 dhawal (#5231)

* [BAEL-2118] - Add a section in String Split Article

* [BAEL-2118] - Formatting and upgraded to JUNIT 5
---
 .../java/com/baeldung/string/SplitUnitTest.java | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java b/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
index 3859a2b26b..6157640a4a 100644
--- a/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
@@ -2,10 +2,11 @@ package com.baeldung.string;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.google.common.base.Splitter;
 
@@ -54,4 +55,18 @@ public class SplitUnitTest {
         assertThat(resultList)
           .containsExactly("car", "jeep", "scooter");
     }
+    
+    @Test
+    public void givenStringContainsSpaces_whenSplitAndTrim_thenReturnsArray_using_Regex() {
+        assertThat(" car , jeep,  scooter ".trim()
+          .split("\\s*,\\s*")).containsExactly("car", "jeep", "scooter");
+
+    }
+    
+    @Test
+    public void givenStringContainsSpaces_whenSplitAndTrim_thenReturnsArray_using_java_8() {
+        assertThat(Arrays.stream(" car , jeep,  scooter ".split(","))
+          .map(String::trim)
+          .toArray(String[]::new)).containsExactly("car", "jeep", "scooter");
+    }   
 }

From 332061d8bd75edbe81f734eb9c79b91d24375bdc Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <alejandro.gervasio@gmail.com>
Date: Thu, 13 Sep 2018 02:11:30 -0300
Subject: [PATCH 045/114] BAEL-971 - An Introduction to Apache Commons Lang
 (#5165)

* Initial Commit

* Update SystemsUtilsUnitTest.java

* Update SystemsUtilsUnitTest.java

* Update ConstructorUtilsUnitTest.java

* Update FieldUtilsUnitTest.java

* Update ConstructorUtilsUnitTest.java

* Update MethodUtilsUnitTest.java

* Update BasicThreadFactoryUnitTest.java

* Update ConstructorUtilsUnitTest.java
---
 .../lang3/application/Application.java        |  8 ++
 .../baeldung/commons/lang3/beans/User.java    | 25 ++++++
 .../commons/lang3/beans/UserInitializer.java  | 11 +++
 .../lang3/test/ArrayUtilsUnitTest.java        | 84 +++++++++++++++++++
 .../test/BasicThreadFactoryUnitTest.java      | 18 ++++
 .../lang3/test/ConstructorUtilsUnitTest.java  | 28 +++++++
 .../lang3/test/FieldUtilsUnitTest.java        | 60 +++++++++++++
 .../commons/lang3/test/FractionUnitTest.java  | 34 ++++++++
 .../lang3/test/HashCodeBuilderUnitTest.java   | 17 ++++
 .../lang3/test/ImmutablePairUnitTest.java     | 36 ++++++++
 .../lang3/test/ImmutableTripleUnitTest.java   | 31 +++++++
 .../lang3/test/LazyInitializerUnitTest.java   | 16 ++++
 .../lang3/test/MethodUtilsUnitTest.java       | 15 ++++
 .../lang3/test/MutableObjectUnitTest.java     | 32 +++++++
 .../lang3/test/MutablePairUnitTest.java       | 32 +++++++
 .../lang3/test/NumberUtilsUnitTest.java       | 46 ++++++++++
 .../lang3/test/StringUtilsUnitTest.java       | 73 ++++++++++++++++
 .../lang3/test/SystemsUtilsUnitTest.java      | 25 ++++++
 .../commons/lang3/test/TripleUnitTest.java    | 31 +++++++
 19 files changed, 622 insertions(+)
 create mode 100644 libraries/src/main/java/com/baeldung/commons/lang3/application/Application.java
 create mode 100644 libraries/src/main/java/com/baeldung/commons/lang3/beans/User.java
 create mode 100644 libraries/src/main/java/com/baeldung/commons/lang3/beans/UserInitializer.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/ArrayUtilsUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/BasicThreadFactoryUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/ConstructorUtilsUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/FieldUtilsUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/FractionUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/HashCodeBuilderUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutablePairUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutableTripleUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/LazyInitializerUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/MethodUtilsUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/MutableObjectUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/MutablePairUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/NumberUtilsUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/StringUtilsUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/SystemsUtilsUnitTest.java
 create mode 100644 libraries/src/test/java/com/baeldung/commons/lang3/test/TripleUnitTest.java

diff --git a/libraries/src/main/java/com/baeldung/commons/lang3/application/Application.java b/libraries/src/main/java/com/baeldung/commons/lang3/application/Application.java
new file mode 100644
index 0000000000..7d4316e3ec
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/commons/lang3/application/Application.java
@@ -0,0 +1,8 @@
+package com.baeldung.commons.lang3.application;
+
+public class Application {
+    
+    public static void main(String[] args) {
+        
+    }
+}
diff --git a/libraries/src/main/java/com/baeldung/commons/lang3/beans/User.java b/libraries/src/main/java/com/baeldung/commons/lang3/beans/User.java
new file mode 100644
index 0000000000..68aab46c33
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/commons/lang3/beans/User.java
@@ -0,0 +1,25 @@
+package com.baeldung.commons.lang3.beans;
+
+public class User {
+
+    private final String name;
+    private final String email;
+
+    public User(String name, String email) {
+        this.name = name;
+        this.email = email;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" + "name=" + name + ", email=" + email + '}';
+    }
+}
diff --git a/libraries/src/main/java/com/baeldung/commons/lang3/beans/UserInitializer.java b/libraries/src/main/java/com/baeldung/commons/lang3/beans/UserInitializer.java
new file mode 100644
index 0000000000..ae5d80244c
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/commons/lang3/beans/UserInitializer.java
@@ -0,0 +1,11 @@
+package com.baeldung.commons.lang3.beans;
+
+import org.apache.commons.lang3.concurrent.LazyInitializer;
+
+public class UserInitializer extends LazyInitializer<User> {
+
+    @Override
+    protected User initialize() {
+        return new User("John", "john@domain.com");
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/ArrayUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/ArrayUtilsUnitTest.java
new file mode 100644
index 0000000000..5eba736b4a
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/ArrayUtilsUnitTest.java
@@ -0,0 +1,84 @@
+package com.baeldung.commons.lang3.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.lang3.ArrayUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class ArrayUtilsUnitTest {
+
+    @Test
+    public void givenArrayUtilsClass_whenCalledtoString_thenCorrect() {
+        String[] array = {"a", "b", "c"};
+        assertThat(ArrayUtils.toString(array)).isEqualTo("{a,b,c}");
+    }
+
+    @Test
+    public void givenArrayUtilsClass_whenCalledtoStringIfArrayisNull_thenCorrect() {
+        String[] array = null;
+        assertThat(ArrayUtils.toString(array, "Array is null")).isEqualTo("Array is null");
+    }
+
+    @Test
+    public void givenArrayUtilsClass_whenCalledhashCode_thenCorrect() {
+        String[] array = {"a", "b", "c"};
+        assertThat(ArrayUtils.hashCode(array)).isEqualTo(997619);
+    }
+    
+    @Test
+    public void givenArrayUtilsClass_whenCalledtoMap_thenCorrect() {
+        String[][] array = {{"1", "one", }, {"2", "two", }, {"3", "three"}};
+        Map map = new HashMap();
+        map.put("1", "one");
+        map.put("2", "two");
+        map.put("3", "three");
+        assertThat(ArrayUtils.toMap(array)).isEqualTo(map);
+    }
+    
+    @Test
+    public void givenArrayUtilsClass_whenCallednullToEmptyStringArray_thenCorrect() {
+        String[] array = null;
+        assertThat(ArrayUtils.nullToEmpty(array)).isEmpty();
+    }
+
+    @Test
+    public void givenArrayUtilsClass_whenCallednullToEmptyObjectArray_thenCorrect() {
+        Object[] array = null;
+        assertThat(ArrayUtils.nullToEmpty(array)).isEmpty();
+    }
+
+    @Test
+    public void givenArrayUtilsClass_whenCalledsubarray_thenCorrect() {
+        int[] array = {1, 2, 3};
+        int[] expected = {1};
+        assertThat(ArrayUtils.subarray(array, 0, 1)).isEqualTo(expected);
+    }
+
+    @Test
+    public void givenArrayUtilsClass_whenCalledisSameLength_thenCorrect() {
+        int[] array1 = {1, 2, 3};
+        int[] array2 = {1, 2, 3};
+        assertThat(ArrayUtils.isSameLength(array1, array2)).isTrue();
+    }
+
+    @Test
+    public void givenArrayUtilsClass_whenCalledreverse_thenCorrect() {
+        int[] array1 = {1, 2, 3};
+        int[] array2 = {3, 2, 1};
+        ArrayUtils.reverse(array1);
+        assertThat(array1).isEqualTo(array2);
+    }
+
+    @Test
+    public void givenArrayUtilsClass_whenCalledIndexOf_thenCorrect() {
+        int[] array = {1, 2, 3};
+        assertThat(ArrayUtils.indexOf(array, 1, 0)).isEqualTo(0);
+    }
+
+    @Test
+    public void givenArrayUtilsClass_whenCalledcontains_thenCorrect() {
+        int[] array = {1, 2, 3};
+        assertThat(ArrayUtils.contains(array, 1)).isTrue();
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/BasicThreadFactoryUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/BasicThreadFactoryUnitTest.java
new file mode 100644
index 0000000000..f32980269a
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/BasicThreadFactoryUnitTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class BasicThreadFactoryUnitTest {
+
+    @Test
+    public void givenBasicThreadFactoryInstance_whenCalledBuilder_thenCorrect() {
+        BasicThreadFactory factory = new BasicThreadFactory.Builder()
+            .namingPattern("workerthread-%d")
+            .daemon(true)
+            .priority(Thread.MAX_PRIORITY)
+            .build();
+        assertThat(factory).isInstanceOf(BasicThreadFactory.class);
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/ConstructorUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/ConstructorUtilsUnitTest.java
new file mode 100644
index 0000000000..f55f239d75
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/ConstructorUtilsUnitTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.commons.lang3.test;
+
+import com.baeldung.commons.lang3.beans.User;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.lang3.reflect.ConstructorUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class ConstructorUtilsUnitTest {
+
+    @Test
+    public void givenConstructorUtilsClass_whenCalledgetAccessibleConstructor_thenCorrect() {
+        assertThat(ConstructorUtils.getAccessibleConstructor(User.class, String.class, String.class)).isInstanceOf(Constructor.class);
+    }
+    
+    @Test
+    public void givenConstructorUtilsClass_whenCalledinvokeConstructor_thenCorrect() throws Exception {
+        assertThat(ConstructorUtils.invokeConstructor(User.class, "name", "email")).isInstanceOf(User.class);
+    }
+    
+    @Test
+    public void givenConstructorUtilsClass_whenCalledinvokeExactConstructor_thenCorrect() throws Exception {
+        String[] args = {"name", "email"};
+        Class[] parameterTypes= {String.class, String.class};
+        assertThat(ConstructorUtils.invokeExactConstructor(User.class, args, parameterTypes)).isInstanceOf(User.class);
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/FieldUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/FieldUtilsUnitTest.java
new file mode 100644
index 0000000000..8abb373e30
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/FieldUtilsUnitTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.commons.lang3.test;
+
+import com.baeldung.commons.lang3.beans.User;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class FieldUtilsUnitTest {
+    
+    private static User user;
+    
+    @BeforeClass
+    public static void setUpUserInstance() {
+        user  = new User("Julie", "julie@domain.com");
+    }
+
+    @Test
+    public void givenFieldUtilsClass_whenCalledgetField_thenCorrect() {
+        assertThat(FieldUtils.getField(User.class, "name", true).getName()).isEqualTo("name");
+    }
+    
+    @Test
+    public void givenFieldUtilsClass_whenCalledgetFieldForceAccess_thenCorrect() {
+        assertThat(FieldUtils.getField(User.class, "name", true).getName()).isEqualTo("name");
+    }
+    
+    @Test
+    public void givenFieldUtilsClass_whenCalledgetDeclaredFieldForceAccess_thenCorrect() {
+        assertThat(FieldUtils.getDeclaredField(User.class, "name", true).getName()).isEqualTo("name");
+    }
+    
+    @Test
+    public void givenFieldUtilsClass_whenCalledgetAllField_thenCorrect() {
+        assertThat(FieldUtils.getAllFields(User.class).length).isEqualTo(2);  
+    }
+    
+    @Test
+    public void givenFieldUtilsClass_whenCalledreadField_thenCorrect() throws IllegalAccessException {
+        assertThat(FieldUtils.readField(user, "name", true)).isEqualTo("Julie");  
+    }
+    
+    @Test
+    public void givenFieldUtilsClass_whenCalledreadDeclaredField_thenCorrect() throws IllegalAccessException {
+        assertThat(FieldUtils.readDeclaredField(user, "name", true)).isEqualTo("Julie");  
+    }
+    
+    @Test
+    public void givenFieldUtilsClass_whenCalledwriteField_thenCorrect() throws IllegalAccessException {
+        FieldUtils.writeField(user, "name", "Julie", true);
+        assertThat(FieldUtils.readField(user, "name", true)).isEqualTo("Julie");
+        
+    }
+    
+    @Test
+    public void givenFieldUtilsClass_whenCalledwriteDeclaredField_thenCorrect() throws IllegalAccessException {
+        FieldUtils.writeDeclaredField(user, "name", "Julie", true);
+        assertThat(FieldUtils.readField(user, "name", true)).isEqualTo("Julie");    
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/FractionUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/FractionUnitTest.java
new file mode 100644
index 0000000000..1a5094a16d
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/FractionUnitTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.math.Fraction;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class FractionUnitTest {
+    
+    @Test
+    public void givenFractionClass_whenCalledgetFraction_thenCorrect() {
+        assertThat(Fraction.getFraction(5, 6)).isInstanceOf(Fraction.class);
+    }
+    
+    @Test
+    public void givenTwoFractionInstances_whenCalledadd_thenCorrect() {
+        Fraction fraction1 = Fraction.getFraction(1, 4);
+        Fraction fraction2 = Fraction.getFraction(3, 4);
+        assertThat(fraction1.add(fraction2).toString()).isEqualTo("1/1");
+    }
+    
+    @Test
+    public void givenTwoFractionInstances_whenCalledsubstract_thenCorrect() {
+        Fraction fraction1 = Fraction.getFraction(3, 4);
+        Fraction fraction2 = Fraction.getFraction(1, 4);
+        assertThat(fraction1.subtract(fraction2).toString()).isEqualTo("1/2");
+    }
+    
+    @Test
+    public void givenTwoFractionInstances_whenCalledmultiply_thenCorrect() {
+        Fraction fraction1 = Fraction.getFraction(3, 4);
+        Fraction fraction2 = Fraction.getFraction(1, 4);
+        assertThat(fraction1.multiplyBy(fraction2).toString()).isEqualTo("3/16");
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/HashCodeBuilderUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/HashCodeBuilderUnitTest.java
new file mode 100644
index 0000000000..bbd24c8207
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/HashCodeBuilderUnitTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class HashCodeBuilderUnitTest {
+
+    @Test
+    public void givenHashCodeBuilderInstance_whenCalledtoHashCode_thenCorrect() {
+        int hashcode = new HashCodeBuilder(17, 37)
+            .append("John")
+            .append("john@domain.com")
+            .toHashCode();
+        assertThat(hashcode).isEqualTo(1269178828);
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutablePairUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutablePairUnitTest.java
new file mode 100644
index 0000000000..28ed8d2514
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutablePairUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class ImmutablePairUnitTest {
+    
+    private static ImmutablePair<String, String> immutablePair; 
+    
+    @BeforeClass
+    public static void setUpImmutablePairInstance() {
+        immutablePair = new ImmutablePair<>("leftElement", "rightElement");
+    }
+    
+    @Test
+    public void givenImmutablePairInstance_whenCalledgetLeft_thenCorrect() {
+        assertThat(immutablePair.getLeft()).isEqualTo("leftElement");
+    }
+    
+    @Test
+    public void givenImmutablePairInstance_whenCalledgetRight_thenCorrect() {
+        assertThat(immutablePair.getRight()).isEqualTo("rightElement");
+    }
+    
+    @Test
+    public void givenImmutablePairInstance_whenCalledof_thenCorrect() {
+        assertThat(ImmutablePair.of("leftElement", "rightElement")).isInstanceOf(ImmutablePair.class);
+    }
+    
+    @Test(expected = UnsupportedOperationException.class)
+    public void givenImmutablePairInstance_whenCalledSetValue_thenThrowUnsupportedOperationException() {
+        immutablePair.setValue("newValue");
+    } 
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutableTripleUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutableTripleUnitTest.java
new file mode 100644
index 0000000000..a9dd3fa7c0
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/ImmutableTripleUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.tuple.ImmutableTriple;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class ImmutableTripleUnitTest {
+ 
+    private static ImmutableTriple<String, String, String> immutableTriple;
+    
+    @BeforeClass
+    public static void setUpImmutableTripleInstance() {
+        immutableTriple = new ImmutableTriple<>("leftElement", "middleElement", "rightElement");
+    }
+    
+    @Test
+    public void givenImmutableTripleInstance_whenCalledgetLeft_thenCorrect() {
+        assertThat(immutableTriple.getLeft()).isEqualTo("leftElement");
+    }
+    
+    @Test
+    public void givenImmutableTripleInstance_whenCalledgetMiddle_thenCorrect() {
+        assertThat(immutableTriple.getMiddle()).isEqualTo("middleElement");
+    }
+    
+    @Test
+    public void givenImmutableInstance_whenCalledgetRight_thenCorrect() {
+        assertThat(immutableTriple.getRight()).isEqualTo("rightElement");
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/LazyInitializerUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/LazyInitializerUnitTest.java
new file mode 100644
index 0000000000..a08399f8de
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/LazyInitializerUnitTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.commons.lang3.test;
+
+import com.baeldung.commons.lang3.beans.User;
+import com.baeldung.commons.lang3.beans.UserInitializer;
+import org.apache.commons.lang3.concurrent.ConcurrentException;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class LazyInitializerUnitTest {
+    
+    @Test
+    public void givenLazyInitializerInstance_whenCalledget_thenCorrect() throws ConcurrentException {
+        UserInitializer userInitializer = new UserInitializer();
+        assertThat(userInitializer.get()).isInstanceOf(User.class);
+    } 
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/MethodUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/MethodUtilsUnitTest.java
new file mode 100644
index 0000000000..5e1d15f2f8
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/MethodUtilsUnitTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.commons.lang3.test;
+
+import com.baeldung.commons.lang3.beans.User;
+import java.lang.reflect.Method;
+import org.apache.commons.lang3.reflect.MethodUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class MethodUtilsUnitTest {
+
+    @Test
+    public void givenMethodUtilsClass_whenCalledgetAccessibleMethod_thenCorrect() {
+        assertThat(MethodUtils.getAccessibleMethod(User.class, "getName")).isInstanceOf(Method.class);
+    }   
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/MutableObjectUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/MutableObjectUnitTest.java
new file mode 100644
index 0000000000..02041f51e8
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/MutableObjectUnitTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.mutable.MutableObject;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MutableObjectUnitTest {
+    
+    private static MutableObject mutableObject;
+    
+    @BeforeClass
+    public static void setUpMutableObject() {
+        mutableObject = new MutableObject("Initial value");
+    }
+    
+    @Test
+    public void givenMutableObject_whenCalledgetValue_thenCorrect() {
+        assertThat(mutableObject.getValue()).isInstanceOf(String.class);
+    }
+    
+    @Test
+    public void givenMutableObject_whenCalledsetValue_thenCorrect() {
+        mutableObject.setValue("Another value");
+        assertThat(mutableObject.getValue()).isEqualTo("Another value");
+    }
+    
+    @Test
+    public void givenMutableObject_whenCalledtoString_thenCorrect() {
+        assertThat(mutableObject.toString()).isEqualTo("Another value");    
+    }        
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/MutablePairUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/MutablePairUnitTest.java
new file mode 100644
index 0000000000..174ec70c4d
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/MutablePairUnitTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.tuple.MutablePair;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MutablePairUnitTest {
+    
+    private static MutablePair<String, String> mutablePair;
+    
+    @BeforeClass
+    public static void setUpMutablePairInstance() {
+        mutablePair = new MutablePair<>("leftElement", "rightElement");
+    }
+    
+    @Test
+    public void givenMutablePairInstance_whenCalledgetLeft_thenCorrect() {
+        assertThat(mutablePair.getLeft()).isEqualTo("leftElement");
+    }
+    
+    @Test
+    public void givenMutablePairInstance_whenCalledgetRight_thenCorrect() {
+        assertThat(mutablePair.getRight()).isEqualTo("rightElement");
+    }
+    
+    @Test
+    public void givenMutablePairInstance_whenCalledsetLeft_thenCorrect() {
+        mutablePair.setLeft("newLeftElement");
+        assertThat(mutablePair.getLeft()).isEqualTo("newLeftElement");
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/NumberUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/NumberUtilsUnitTest.java
new file mode 100644
index 0000000000..bdf254a102
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/NumberUtilsUnitTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class NumberUtilsUnitTest {
+    
+    @Test
+    public void givenNumberUtilsClass_whenCalledcompareWithIntegers_thenCorrect() {
+        assertThat(NumberUtils.compare(1, 1)).isEqualTo(0);
+    }
+    
+    @Test
+    public void givenNumberUtilsClass_whenCalledcompareWithLongs_thenCorrect() {
+        assertThat(NumberUtils.compare(1L, 1L)).isEqualTo(0);
+    }
+    
+    @Test
+    public void givenNumberUtilsClass_whenCalledcreateNumber_thenCorrect() {
+        assertThat(NumberUtils.createNumber("123456")).isEqualTo(123456);
+    }
+    
+    @Test
+    public void givenNumberUtilsClass_whenCalledisDigits_thenCorrect() {
+        assertThat(NumberUtils.isDigits("123456")).isTrue();
+    }
+    
+    @Test
+    public void givenNumberUtilsClass_whenCallemaxwithIntegerArray_thenCorrect() {
+        int[] array = {1, 2, 3, 4, 5, 6};
+        assertThat(NumberUtils.max(array)).isEqualTo(6);
+    }
+    
+    @Test
+    public void givenNumberUtilsClass_whenCalleminwithIntegerArray_thenCorrect() {
+        int[] array = {1, 2, 3, 4, 5, 6};
+        assertThat(NumberUtils.min(array)).isEqualTo(1);
+    }
+    
+    @Test
+    public void givenNumberUtilsClass_whenCalleminwithByteArray_thenCorrect() {
+        byte[] array = {1, 2, 3, 4, 5, 6};
+        assertThat(NumberUtils.min(array)).isEqualTo((byte) 1);
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/StringUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/StringUtilsUnitTest.java
new file mode 100644
index 0000000000..ab39ba7bd9
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/StringUtilsUnitTest.java
@@ -0,0 +1,73 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.StringUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class StringUtilsUnitTest {
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledisBlank_thenCorrect() {
+        assertThat(StringUtils.isBlank(" ")).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledisEmpty_thenCorrect() {
+        assertThat(StringUtils.isEmpty("")).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledisAllLowerCase_thenCorrect() {
+        assertThat(StringUtils.isAllLowerCase("abd")).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledisAllUpperCase_thenCorrect() {
+        assertThat(StringUtils.isAllUpperCase("ABC")).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledisMixedCase_thenCorrect() {
+        assertThat(StringUtils.isMixedCase("abC")).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledisAlpha_thenCorrect() {
+        assertThat(StringUtils.isAlpha("abc")).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledisAlphanumeric_thenCorrect() {
+        assertThat(StringUtils.isAlphanumeric("abc123")).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledcontains_thenCorrect() {
+        assertThat(StringUtils.contains("abc", "ab")).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledcontainsAny_thenCorrect() {
+        assertThat(StringUtils.containsAny("abc", 'a', 'b', 'c')).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledcontainsIgnoreCase_thenCorrect() {
+        assertThat(StringUtils.containsIgnoreCase("abc", "ABC")).isTrue();
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledswapCase_thenCorrect() {
+        assertThat(StringUtils.swapCase("abc")).isEqualTo("ABC");
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalledreverse_thenCorrect() {
+        assertThat(StringUtils.reverse("abc")).isEqualTo("cba");
+    }
+    
+    @Test
+    public void givenStringUtilsClass_whenCalleddifference_thenCorrect() {
+        assertThat(StringUtils.difference("abc", "abd")).isEqualTo("d");
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/SystemsUtilsUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/SystemsUtilsUnitTest.java
new file mode 100644
index 0000000000..0efe97f912
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/SystemsUtilsUnitTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.commons.lang3.test;
+
+import java.io.File;
+import org.apache.commons.lang3.JavaVersion;
+import org.apache.commons.lang3.SystemUtils;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class SystemsUtilsUnitTest {
+
+    @Test
+    public void givenSystemUtilsClass_whenCalledgetJavaHome_thenCorrect() {
+        assertThat(SystemUtils.getJavaHome()).isEqualTo(new File("/usr/lib/jvm/java-8-oracle/jre"));
+    }
+
+    @Test
+    public void givenSystemUtilsClass_whenCalledgetUserHome_thenCorrect() {
+        assertThat(SystemUtils.getUserHome()).isEqualTo(new File("/home/travis"));
+    }
+
+    @Test
+    public void givenSystemUtilsClass_whenCalledisJavaVersionAtLeast_thenCorrect() {
+        assertThat(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_RECENT)).isTrue();
+    }
+}
diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/test/TripleUnitTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/test/TripleUnitTest.java
new file mode 100644
index 0000000000..7d506bbbab
--- /dev/null
+++ b/libraries/src/test/java/com/baeldung/commons/lang3/test/TripleUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.commons.lang3.test;
+
+import org.apache.commons.lang3.tuple.Triple;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TripleUnitTest {
+    
+    private static Triple<String, String, String> triple;
+    
+    @BeforeClass
+    public static void setUpTripleInstance() {
+        triple = Triple.of("leftElement", "middleElement", "rightElement");
+    }
+    
+    @Test
+    public void givenTripleInstance_whenCalledgetLeft_thenCorrect() {
+        assertThat(triple.getLeft()).isEqualTo("leftElement");
+    }
+    
+    @Test
+    public void givenTripleInstance_whenCalledgetMiddle_thenCorrect() {
+        assertThat(triple.getMiddle()).isEqualTo("middleElement");
+    }
+    
+    @Test
+    public void givenTripleInstance_whenCalledgetRight_thenCorrect() {
+        assertThat(triple.getRight()).isEqualTo("rightElement");
+    }
+}

From 88601730d068e42fe0a10edcdf3886e96be30ba8 Mon Sep 17 00:00:00 2001
From: Kumar Chandrakant <kchandrakant@gmail.com>
Date: Thu, 13 Sep 2018 11:04:29 +0530
Subject: [PATCH 046/114] BAEL-2187 - Adding files for the tutorial related to
 Java Yield (#5169)

---
 .../baeldung/concurrent/yield/ThreadYield.java  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 core-java-concurrency/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java

diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java b/core-java-concurrency/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java
new file mode 100644
index 0000000000..b31a04015f
--- /dev/null
+++ b/core-java-concurrency/src/main/java/com/baeldung/concurrent/yield/ThreadYield.java
@@ -0,0 +1,17 @@
+package com.baeldung.concurrent.yield;
+
+public class ThreadYield {
+    public static void main(String[] args) {
+        Runnable r = () -> {
+            int counter = 0;
+            while (counter < 2) {
+                System.out.println(Thread.currentThread()
+                    .getName());
+                counter++;
+                Thread.yield();
+            }
+        };
+        new Thread(r).start();
+        new Thread(r).start();
+    }
+}

From 72e1e9634bc88b1c8306e8598183c9afa528f831 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Thu, 13 Sep 2018 11:09:53 +0530
Subject: [PATCH 047/114] Feature/bael 2077 dhawal (#5232)

* [BAEL-2077] - Add section in Spring Profiles article

* removed irrelevent code

* [BAEL-2077] - Removing unnecessory files and adding Integration test file
---
 spring-all/pom.xml                            | 19 +++++++++++++++-
 .../profiles/SpringProfilesConfig.java        |  2 ++
 .../src/main/resources/application.properties |  1 +
 ...lesWithMavenPropertiesIntegrationTest.java | 22 +++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 spring-all/src/main/resources/application.properties
 create mode 100644 spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java

diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index c4c4cf7963..6e765d5a9e 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -190,7 +190,24 @@
             </plugin>
         </plugins>
     </build>
-
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+    
     <properties>
         <start-class>org.baeldung.sample.App</start-class>
         <!-- Spring -->
diff --git a/spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java b/spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
index eb5543e3db..2d1905ee9c 100644
--- a/spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
+++ b/spring-all/src/main/java/org/baeldung/profiles/SpringProfilesConfig.java
@@ -2,9 +2,11 @@ package org.baeldung.profiles;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 
 @Configuration
 @ComponentScan("org.baeldung.profiles")
+@PropertySource(value = "classpath:application.properties")
 public class SpringProfilesConfig {
 
 }
diff --git a/spring-all/src/main/resources/application.properties b/spring-all/src/main/resources/application.properties
new file mode 100644
index 0000000000..cbfe3f2df2
--- /dev/null
+++ b/spring-all/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.profiles.active=@spring.profiles.active@
\ No newline at end of file
diff --git a/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java b/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
new file mode 100644
index 0000000000..929d088a14
--- /dev/null
+++ b/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
@@ -0,0 +1,22 @@
+package org.baeldung.profiles;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SpringProfilesConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class SpringProfilesWithMavenPropertiesIntegrationTest {
+
+    @Autowired
+    DatasourceConfig datasourceConfig;
+
+    @Test
+    public void testSpringProfiles() {
+        Assert.assertTrue(datasourceConfig instanceof DevDatasourceConfig);
+    }
+}
\ No newline at end of file

From 1a06dfb9410b3b61f105980475ca1c5b80c365ac Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Thu, 13 Sep 2018 06:42:33 -0600
Subject: [PATCH 048/114] Floating-point Formatting (#5244)

These samples show some different approaches for formatting a
floating-point value into a String, while removing its decimal part.

Included is a benchmark to show how each approach performs.

Issue: BAEL-2152
---
 .../decimalformat/DoubletoString.java         |  29 -----
 .../RemovingDecimalsManualTest.java           | 100 ++++++++++++++++++
 .../RemovingDecimalsUnitTest.java             |  95 +++++++++++++++++
 3 files changed, 195 insertions(+), 29 deletions(-)
 delete mode 100644 core-java/src/main/java/com/baeldung/decimalformat/DoubletoString.java
 create mode 100644 core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java

diff --git a/core-java/src/main/java/com/baeldung/decimalformat/DoubletoString.java b/core-java/src/main/java/com/baeldung/decimalformat/DoubletoString.java
deleted file mode 100644
index e605c5e200..0000000000
--- a/core-java/src/main/java/com/baeldung/decimalformat/DoubletoString.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.baeldung.decimalformat;
-
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-
-public class DoubletoString {
-
-    public static void main(String[] args) {
-
-        double doubleValue = 345.56;
-
-        System.out.println(String.valueOf((int) doubleValue));
-
-        System.out.println(String.format("%.0f", doubleValue));
-
-        NumberFormat nf = NumberFormat.getInstance();
-        nf.setMaximumFractionDigits(0);
-        nf.setRoundingMode(RoundingMode.FLOOR);
-        System.out.println(nf.format(doubleValue));
-
-        doubleValue = Math.floor(doubleValue);
-        DecimalFormat df = new DecimalFormat("#,###");
-        df.setRoundingMode(RoundingMode.FLOOR);
-        System.out.println(df.format(doubleValue));
-
-    }
-
-}
diff --git a/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java b/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java
new file mode 100644
index 0000000000..8dbfcaf5e7
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java
@@ -0,0 +1,100 @@
+package com.baeldung.removingdecimals;
+
+import org.junit.Test;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This benchmark compares some of the approaches to formatting a floating-point
+ * value into a {@link String} while removing the decimal part.
+ *
+ * To run, simply run the {@link RemovingDecimalsManualTest#runBenchmarks()} test
+ * at the end of this class.
+ *
+ * The benchmark takes about 15 minutes to run. Since it is using {@link Mode#Throughput},
+ * higher numbers mean better performance.
+ */
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 20)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@State(Scope.Benchmark)
+public class RemovingDecimalsManualTest {
+    @Param(value = {"345.56", "345345345.56", "345345345345345345.56"}) double doubleValue;
+
+    NumberFormat nf;
+    DecimalFormat df;
+
+    @Setup
+    public void readyFormatters() {
+        nf = NumberFormat.getInstance();
+        nf.setMaximumFractionDigits(0);
+        df = new DecimalFormat("#,###");
+    }
+
+    @Benchmark
+    public String whenCastToInt_thenValueIsTruncated() {
+        return String.valueOf((int) doubleValue);
+    }
+
+    @Benchmark
+    public String whenUsingStringFormat_thenValueIsRounded() {
+        return String.format("%.0f", doubleValue);
+    }
+
+    @Benchmark
+    public String whenUsingNumberFormat_thenValueIsRounded() {
+        nf.setRoundingMode(RoundingMode.HALF_UP);
+        return nf.format(doubleValue);
+    }
+
+    @Benchmark
+    public String whenUsingNumberFormatWithFloor_thenValueIsTruncated() {
+        nf.setRoundingMode(RoundingMode.FLOOR);
+        return nf.format(doubleValue);
+    }
+
+    @Benchmark
+    public String whenUsingDecimalFormat_thenValueIsRounded() {
+        df.setRoundingMode(RoundingMode.HALF_UP);
+        return df.format(doubleValue);
+    }
+
+    @Benchmark
+    public String whenUsingDecimalFormatWithFloor_thenValueIsTruncated() {
+        df.setRoundingMode(RoundingMode.FLOOR);
+        return df.format(doubleValue);
+    }
+
+    @Benchmark
+    public String whenUsingBigDecimalDoubleValue_thenValueIsTruncated() {
+        BigDecimal big = new BigDecimal(doubleValue);
+        big = big.setScale(0, RoundingMode.FLOOR);
+        return big.toString();
+    }
+
+    @Benchmark
+    public String whenUsingBigDecimalDoubleValueWithHalfUp_thenValueIsRounded() {
+        BigDecimal big = new BigDecimal(doubleValue);
+        big = big.setScale(0, RoundingMode.HALF_UP);
+        return big.toString();
+    }
+
+    @Test
+    public void runBenchmarks() throws Exception {
+        Options options = new OptionsBuilder()
+                .include(this.getClass().getSimpleName()).threads(1)
+                .forks(1).shouldFailOnError(true).shouldDoGC(true)
+                .jvmArgs("-server").build();
+
+        new Runner(options).run();
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java b/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java
new file mode 100644
index 0000000000..2f634b553b
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java
@@ -0,0 +1,95 @@
+package com.baeldung.removingdecimals;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+/**
+ * Tests that demonstrate some different approaches for formatting a
+ * floating-point value into a {@link String} while removing the decimal part.
+ */
+public class RemovingDecimalsUnitTest {
+    private final double doubleValue = 345.56;
+
+    @Test
+    public void whenCastToInt_thenValueIsTruncated() {
+        String truncated = String.valueOf((int) doubleValue);
+        assertEquals("345", truncated);
+    }
+
+    @Test
+    public void givenALargeDouble_whenCastToInt_thenValueIsNotTruncated() {
+        double outOfIntRange = 6_000_000_000.56;
+        String truncationAttempt = String.valueOf((int) outOfIntRange);
+        assertNotEquals("6000000000", truncationAttempt);
+    }
+
+    @Test
+    public void whenUsingStringFormat_thenValueIsRounded() {
+        String rounded = String.format("%.0f", doubleValue);
+        assertEquals("346", rounded);
+    }
+
+    @Test
+    public void givenALargeDouble_whenUsingStringFormat_thenValueIsStillRounded() {
+        double outOfIntRange = 6_000_000_000.56;
+        String rounded = String.format("%.0f", outOfIntRange);
+        assertEquals("6000000001", rounded);
+    }
+
+    @Test
+    public void whenUsingNumberFormat_thenValueIsRounded() {
+        NumberFormat nf = NumberFormat.getInstance();
+        nf.setMaximumFractionDigits(0);
+        nf.setRoundingMode(RoundingMode.HALF_UP);
+        String rounded = nf.format(doubleValue);
+        assertEquals("346", rounded);
+    }
+
+    @Test
+    public void whenUsingNumberFormatWithFloor_thenValueIsTruncated() {
+        NumberFormat nf = NumberFormat.getInstance();
+        nf.setMaximumFractionDigits(0);
+        nf.setRoundingMode(RoundingMode.FLOOR);
+        String truncated = nf.format(doubleValue);
+        assertEquals("345", truncated);
+    }
+
+    @Test
+    public void whenUsingDecimalFormat_thenValueIsRounded() {
+        DecimalFormat df = new DecimalFormat("#,###");
+        df.setRoundingMode(RoundingMode.HALF_UP);
+        String rounded = df.format(doubleValue);
+        assertEquals("346", rounded);
+    }
+
+    @Test
+    public void whenUsingDecimalFormatWithFloor_thenValueIsTruncated() {
+        DecimalFormat df = new DecimalFormat("#,###");
+        df.setRoundingMode(RoundingMode.FLOOR);
+        String truncated = df.format(doubleValue);
+        assertEquals("345", truncated);
+    }
+
+    @Test
+    public void whenUsingBigDecimalDoubleValue_thenValueIsTruncated() {
+        BigDecimal big = new BigDecimal(doubleValue);
+        big = big.setScale(0, RoundingMode.FLOOR);
+        String truncated = big.toString();
+        assertEquals("345", truncated);
+    }
+
+    @Test
+    public void whenUsingBigDecimalDoubleValueWithHalfUp_thenValueIsRounded() {
+        BigDecimal big = new BigDecimal(doubleValue);
+        big = big.setScale(0, RoundingMode.HALF_UP);
+        String truncated = big.toString();
+        assertEquals("346", truncated);
+    }
+}

From 0ff98874f7cdbc74e29805a045a090a9ede4af0c Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Thu, 13 Sep 2018 22:16:08 +0530
Subject: [PATCH 049/114] BAEL-8964 Add a section in "NoSuchBeanDefinition"
 article

- Added example for no such bean definition example.
---
 .../nosuchbeandefinitionexception/BeanA.java         | 12 ++++++++++++
 .../nosuchbeandefinitionexception/BeanB.java         |  5 +++++
 .../NoSuchBeanDefinitionDemoApp.java                 | 12 ++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanA.java
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanB.java
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java

diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanA.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanA.java
new file mode 100644
index 0000000000..21d7007917
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanA.java
@@ -0,0 +1,12 @@
+package com.baeldung.springbootmvc.nosuchbeandefinitionexception;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BeanA {
+	
+	@Autowired
+	BeanB dependency;
+
+}
\ No newline at end of file
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanB.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanB.java
new file mode 100644
index 0000000000..3dd72aacc6
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanB.java
@@ -0,0 +1,5 @@
+package com.baeldung.springbootmvc.nosuchbeandefinitionexception;
+
+public class BeanB {
+
+}
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java
new file mode 100644
index 0000000000..01d19437c5
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java
@@ -0,0 +1,12 @@
+package com.baeldung.springbootmvc.nosuchbeandefinitionexception;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class NoSuchBeanDefinitionDemoApp {
+
+	public static void main(String[] args) {
+		SpringApplication.run(NoSuchBeanDefinitionDemoApp.class, args);
+	}
+}

From 597602a47833af962dae2c32f5acc50ad6d9f6d2 Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Thu, 13 Sep 2018 22:37:40 +0200
Subject: [PATCH 050/114] BAEL-2171 - java heap dumps

---
 .../java/com/baeldung/heapdump/HeapDump.java  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/heapdump/HeapDump.java

diff --git a/core-java/src/main/java/com/baeldung/heapdump/HeapDump.java b/core-java/src/main/java/com/baeldung/heapdump/HeapDump.java
new file mode 100644
index 0000000000..1619bc43ae
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/heapdump/HeapDump.java
@@ -0,0 +1,23 @@
+package com.baeldung.heapdump;
+
+import com.sun.management.HotSpotDiagnosticMXBean;
+
+import javax.management.MBeanServer;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+
+public class HeapDump {
+
+    public static void dumpHeap(String filePath, boolean live) throws IOException {
+        MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+        HotSpotDiagnosticMXBean mxBean = ManagementFactory.newPlatformMXBeanProxy(
+          server, "com.sun.management:type=HotSpotDiagnostic", HotSpotDiagnosticMXBean.class);
+        mxBean.dumpHeap(filePath, live);
+    }
+
+    public static void main(String[] args) throws IOException {
+        final String file = "/tmp/dump.hprof";
+
+        dumpHeap(file, true);
+    }
+}

From 521c34159592f316dba1ca555cbb78d0d56e308d Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Fri, 14 Sep 2018 08:05:43 +0300
Subject: [PATCH 051/114] add main class for boot-mvc module

---
 spring-boot-mvc/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spring-boot-mvc/pom.xml b/spring-boot-mvc/pom.xml
index e456155f36..9ca187db5d 100644
--- a/spring-boot-mvc/pom.xml
+++ b/spring-boot-mvc/pom.xml
@@ -46,6 +46,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+                    <mainClass>com.baeldung.springbootmvc.SpringBootMvcApplication</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
 			</plugin>
 		</plugins>
 	</build>
@@ -56,6 +60,7 @@
         <java.version>1.8</java.version>
           <!-- ROME for RSS -->
         <rome.version>1.10.0</rome.version>
+        <start-class>com.baeldung.springbootmvc.SpringBootMvcApplication</start-class>
     </properties>
 
 </project>

From 86d60237f42a998d3f538827508a584df9fc4818 Mon Sep 17 00:00:00 2001
From: xamcross <xamcross@gmail.com>
Date: Fri, 14 Sep 2018 08:55:03 +0300
Subject: [PATCH 052/114] BAEL-2095 CrudRepository save() method (#5223)

* BAEL-2095 CrudRepository save() method

* BAEL-2095 Enhanced the MerchandiseEntity with additional attributes; added unit-tests; removed spring boot runner

* BAEL-2095 Test renamed to end with IntegrationTest to make it past Travis's rules
---
 .../dao/repositories/InventoryRepository.java |  7 ++
 .../baeldung/domain/MerchandiseEntity.java    | 66 +++++++++++++++++++
 .../InventoryRepositoryIntegrationTest.java   | 60 +++++++++++++++++
 3 files changed, 133 insertions(+)
 create mode 100644 spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InventoryRepository.java
 create mode 100644 spring-data-jpa/src/main/java/com/baeldung/domain/MerchandiseEntity.java
 create mode 100644 spring-data-jpa/src/test/java/com/baeldung/dao/repositories/InventoryRepositoryIntegrationTest.java

diff --git a/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InventoryRepository.java b/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InventoryRepository.java
new file mode 100644
index 0000000000..a575f0b915
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InventoryRepository.java
@@ -0,0 +1,7 @@
+package com.baeldung.dao.repositories;
+
+import com.baeldung.domain.MerchandiseEntity;
+import org.springframework.data.repository.CrudRepository;
+
+public interface InventoryRepository extends CrudRepository<MerchandiseEntity, Long> {
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/domain/MerchandiseEntity.java b/spring-data-jpa/src/main/java/com/baeldung/domain/MerchandiseEntity.java
new file mode 100644
index 0000000000..bfc690e0e2
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/domain/MerchandiseEntity.java
@@ -0,0 +1,66 @@
+package com.baeldung.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.math.BigDecimal;
+
+@Entity
+public class MerchandiseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private String title;
+
+    private BigDecimal price;
+
+    private String brand;
+
+    public MerchandiseEntity() {
+    }
+
+    public MerchandiseEntity(String title, BigDecimal price) {
+        this.title = title;
+        this.price = price;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    @Override
+    public String toString() {
+        return "MerchandiseEntity{" +
+                "id=" + id +
+                ", title='" + title + '\'' +
+                ", price=" + price +
+                ", brand='" + brand + '\'' +
+                '}';
+    }
+}
diff --git a/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/InventoryRepositoryIntegrationTest.java b/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/InventoryRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..9d6334445c
--- /dev/null
+++ b/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/InventoryRepositoryIntegrationTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.dao.repositories;
+
+import com.baeldung.config.PersistenceConfiguration;
+import com.baeldung.domain.MerchandiseEntity;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.math.BigDecimal;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringRunner.class)
+@DataJpaTest(excludeAutoConfiguration = {PersistenceConfiguration.class})
+public class InventoryRepositoryIntegrationTest {
+
+    private static final String ORIGINAL_TITLE = "Pair of Pants";
+    private static final String UPDATED_TITLE = "Branded Luxury Pants";
+    private static final String UPDATED_BRAND = "Armani";
+    private static final String ORIGINAL_SHORTS_TITLE = "Pair of Shorts";
+
+    @Autowired
+    private InventoryRepository repository;
+
+    @Test
+    public void shouldCreateNewEntryInDB() {
+        MerchandiseEntity pants = new MerchandiseEntity(ORIGINAL_TITLE, BigDecimal.ONE);
+        pants = repository.save(pants);
+
+        MerchandiseEntity shorts = new MerchandiseEntity(ORIGINAL_SHORTS_TITLE, new BigDecimal(3));
+        shorts = repository.save(shorts);
+
+        assertNotNull(pants.getId());
+        assertNotNull(shorts.getId());
+        assertNotEquals(pants.getId(), shorts.getId());
+    }
+
+    @Test
+    public void shouldUpdateExistingEntryInDB() {
+        MerchandiseEntity pants = new MerchandiseEntity(ORIGINAL_TITLE, BigDecimal.ONE);
+        pants = repository.save(pants);
+
+        Long originalId = pants.getId();
+
+        pants.setTitle(UPDATED_TITLE);
+        pants.setPrice(BigDecimal.TEN);
+        pants.setBrand(UPDATED_BRAND);
+
+        MerchandiseEntity result = repository.save(pants);
+
+        assertEquals(originalId, result.getId());
+        assertEquals(UPDATED_TITLE, result.getTitle());
+        assertEquals(BigDecimal.TEN, result.getPrice());
+        assertEquals(UPDATED_BRAND, result.getBrand());
+    }
+}

From fdf873daf7c718235b75999081f1acb10585ec62 Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Fri, 14 Sep 2018 12:12:48 +0400
Subject: [PATCH 053/114] adding comparator to Employee

---
 .../main/java/com/baeldung/sort/Employee.java | 60 +++++++++++++++++++
 .../java/com/baeldung/sort/SortHashMap.java   | 41 +++++--------
 2 files changed, 74 insertions(+), 27 deletions(-)
 create mode 100644 core-java-collections/src/main/java/com/baeldung/sort/Employee.java

diff --git a/core-java-collections/src/main/java/com/baeldung/sort/Employee.java b/core-java-collections/src/main/java/com/baeldung/sort/Employee.java
new file mode 100644
index 0000000000..b5e56f6141
--- /dev/null
+++ b/core-java-collections/src/main/java/com/baeldung/sort/Employee.java
@@ -0,0 +1,60 @@
+package com.baeldung.sort;
+
+public class Employee implements Comparable<Employee> {
+
+    private Long id;
+    private String name;
+
+    public Employee(Long id, String name) {
+        this.name = name;
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Employee employee = (Employee) o;
+
+        if (!id.equals(employee.id)) return false;
+        return name.equals(employee.name);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id.hashCode();
+        result = 31 * result + name.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Employee{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                '}';
+    }
+
+    @Override
+    public int compareTo(Employee employee) {
+        return (int)(this.id - employee.getId());
+    }
+}
diff --git a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
index c803e8f193..f7ea2f655b 100644
--- a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
+++ b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
@@ -1,6 +1,7 @@
 package com.baeldung.sort;
 
-import com.baeldung.performance.Employee;
+import com.google.common.base.Functions;
+import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 
@@ -15,31 +16,24 @@ public class SortHashMap {
 
         initialize();
 
-        //treeMapSortByKey();
+        treeMapSortByKey();
 
-        //arrayListSortByValue();
-        //arrayListSortByKey();
+        arrayListSortByValue();
+        arrayListSortByKey();
 
-        //treeSetByKey();
-        //treeSetByValue();
+        treeSetByKey();
+        treeSetByValue();
 
-        //sortStream();
+        sortStream();
 
         sortGuava();
     }
 
     private static void sortGuava() {
-        Ordering<Map.Entry<String, Employee>> orderById = new Ordering<Map.Entry<String, Employee>>() {
-            @Override
-            public int compare(Map.Entry<String, Employee> left, Map.Entry<String, Employee> right) {
-                return left.getValue().getId().compareTo(right.getValue().getId());
-            }
-        };
+        final Ordering<String> naturalReverseValueOrdering =
+                Ordering.natural().reverse().nullsLast().onResultOf(Functions.forMap(map, null));
 
-        List<Map.Entry<String, Employee>> toList = Lists.newArrayList(map.entrySet());
-        Collections.sort(toList, orderById);
-
-        toList.forEach(System.out::println);
+        System.out.println(ImmutableSortedMap.copyOf(map, naturalReverseValueOrdering));
     }
 
     private static void sortStream() {
@@ -48,7 +42,7 @@ public class SortHashMap {
                 .forEach(System.out::println);
 
         Map<String, Employee> result = map.entrySet().stream()
-                .sorted(Comparator.comparingLong(e -> e.getValue().getId()))
+                .sorted(Map.Entry.comparingByValue())
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
                 (oldValue, newValue) -> oldValue, LinkedHashMap::new));
 
@@ -56,9 +50,7 @@ public class SortHashMap {
     }
 
     private static void treeSetByValue() {
-        Comparator<Employee> comp = (Employee o1, Employee o2) -> (o1.getId().compareTo(o2.getId()));
-        SortedSet<Employee> values = new TreeSet<>(comp);
-        values.addAll(map.values());
+        SortedSet<Employee> values = new TreeSet<>(map.values());
         System.out.println(values);
     }
 
@@ -81,12 +73,7 @@ public class SortHashMap {
     private static void arrayListSortByValue() {
         List<Employee> employeeById = new ArrayList<>(map.values());
 
-        Collections.sort(employeeById, new Comparator<Employee>() {
-
-            public int compare(Employee o1, Employee o2) {
-                return (int)(o1.getId() - o2.getId());
-            }
-        });
+        Collections.sort(employeeById);
 
         System.out.println(employeeById);
     }

From 8c20c665dec4412fdb05761552e7368fd43c1a66 Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Fri, 14 Sep 2018 15:54:38 +0200
Subject: [PATCH 054/114] BAEL-1767 - Java 9 Platform Logging API (#5071)

* java 9 logger

* slf4j + logback modules added

* new module for slf4j

* logback config

* cleanup

* format
---
 core-java-9/logging.sh                        | 15 +++
 core-java-9/mods/logback.xml                  | 16 +++
 .../com/baeldung/logging/app/MainApp.java     | 13 +++
 .../com.baeldung.logging.app/module-info.java |  2 +
 .../baeldung/logging/slf4j/Slf4jLogger.java   | 99 +++++++++++++++++++
 .../logging/slf4j/Slf4jLoggerFinder.java      |  8 ++
 .../module-info.java                          |  6 ++
 .../com/baeldung/logging/ConsoleLogger.java   | 27 +++++
 .../baeldung/logging/CustomLoggerFinder.java  |  9 ++
 .../com.baeldung.logging/module-info.java     |  5 +
 10 files changed, 200 insertions(+)
 create mode 100755 core-java-9/logging.sh
 create mode 100644 core-java-9/mods/logback.xml
 create mode 100644 core-java-9/src/modules/com.baeldung.logging.app/com/baeldung/logging/app/MainApp.java
 create mode 100644 core-java-9/src/modules/com.baeldung.logging.app/module-info.java
 create mode 100644 core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
 create mode 100644 core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLoggerFinder.java
 create mode 100644 core-java-9/src/modules/com.baeldung.logging.slf4j/module-info.java
 create mode 100644 core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/ConsoleLogger.java
 create mode 100644 core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/CustomLoggerFinder.java
 create mode 100644 core-java-9/src/modules/com.baeldung.logging/module-info.java

diff --git a/core-java-9/logging.sh b/core-java-9/logging.sh
new file mode 100755
index 0000000000..c9b502f300
--- /dev/null
+++ b/core-java-9/logging.sh
@@ -0,0 +1,15 @@
+# compile logging  module
+# javac --module-path mods -d mods/com.baeldung.logging src/modules/com.baeldung.logging/module-info.java src/modules/com.baeldung.logging/com/baeldung/logging/*.java
+
+# compile logging slf4j module
+javac --module-path mods -d mods/com.baeldung.logging.slf4j src/modules/com.baeldung.logging.slf4j/module-info.java src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/*.java
+
+
+# compile logging main app module
+javac --module-path mods -d mods/com.baeldung.logging.app src/modules/com.baeldung.logging.app/module-info.java src/modules/com.baeldung.logging.app/com/baeldung/logging/app/*.java
+
+# run logging main app
+# java --module-path mods -m com.baeldung.logging.app/com.baeldung.logging.app.MainApp
+
+# run looging main app using logback
+java --module-path mods -Dlogback.configurationFile=mods/logback.xml -m com.baeldung.logging.app/com.baeldung.logging.app.MainApp
diff --git a/core-java-9/mods/logback.xml b/core-java-9/mods/logback.xml
new file mode 100644
index 0000000000..c22c7a7130
--- /dev/null
+++ b/core-java-9/mods/logback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>
+                %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} -- %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root>
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/core-java-9/src/modules/com.baeldung.logging.app/com/baeldung/logging/app/MainApp.java b/core-java-9/src/modules/com.baeldung.logging.app/com/baeldung/logging/app/MainApp.java
new file mode 100644
index 0000000000..01f53d59e9
--- /dev/null
+++ b/core-java-9/src/modules/com.baeldung.logging.app/com/baeldung/logging/app/MainApp.java
@@ -0,0 +1,13 @@
+package com.baeldung.logging.app;
+
+import static java.lang.System.Logger.*;
+
+public class MainApp {
+
+    private static System.Logger LOGGER = System.getLogger("MainApp");
+
+    public static void main(String[] args) {
+        LOGGER.log(Level.ERROR, "error test");
+        LOGGER.log(Level.INFO, "info test");
+    }
+}
diff --git a/core-java-9/src/modules/com.baeldung.logging.app/module-info.java b/core-java-9/src/modules/com.baeldung.logging.app/module-info.java
new file mode 100644
index 0000000000..037c72b755
--- /dev/null
+++ b/core-java-9/src/modules/com.baeldung.logging.app/module-info.java
@@ -0,0 +1,2 @@
+module com.baeldung.logging.app {
+}
\ No newline at end of file
diff --git a/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java b/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
new file mode 100644
index 0000000000..df41e071fd
--- /dev/null
+++ b/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
@@ -0,0 +1,99 @@
+package com.baeldung.logging.slf4j;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ResourceBundle;
+
+public class Slf4jLogger implements System.Logger {
+
+    private final String name;
+    private final Logger logger;
+
+    public Slf4jLogger(String name) {
+        this.name = name;
+        logger = LoggerFactory.getLogger(name);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean isLoggable(Level level) {
+        switch (level) {
+        case OFF:
+            return false;
+        case TRACE:
+            return logger.isTraceEnabled();
+        case DEBUG:
+            return logger.isDebugEnabled();
+        case INFO:
+            return logger.isInfoEnabled();
+        case WARNING:
+            return logger.isWarnEnabled();
+        case ERROR:
+            return logger.isErrorEnabled();
+        case ALL:
+        default:
+            return true;
+        }
+    }
+
+    @Override
+    public void log(Level level, ResourceBundle bundle, String msg, Throwable thrown) {
+        if (!isLoggable(level)) {
+            return;
+        }
+
+        switch (level) {
+        case TRACE:
+            logger.trace(msg, thrown);
+            break;
+        case DEBUG:
+            logger.debug(msg, thrown);
+            break;
+        case INFO:
+            logger.info(msg, thrown);
+            break;
+        case WARNING:
+            logger.warn(msg, thrown);
+            break;
+        case ERROR:
+            logger.error(msg, thrown);
+            break;
+        case ALL:
+        default:
+            logger.info(msg, thrown);
+        }
+    }
+
+    @Override
+    public void log(Level level, ResourceBundle bundle, String format, Object... params) {
+        if (!isLoggable(level)) {
+            return;
+        }
+
+        switch (level) {
+        case TRACE:
+            logger.trace(format, params);
+            break;
+        case DEBUG:
+            logger.debug(format, params);
+            break;
+        case INFO:
+            logger.info(format, params);
+            break;
+        case WARNING:
+            logger.warn(format, params);
+            break;
+        case ERROR:
+            logger.error(format, params);
+            break;
+        case ALL:
+        default:
+            logger.info(format, params);
+        }
+    }
+}
diff --git a/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLoggerFinder.java b/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLoggerFinder.java
new file mode 100644
index 0000000000..97f7cccb92
--- /dev/null
+++ b/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLoggerFinder.java
@@ -0,0 +1,8 @@
+package com.baeldung.logging.slf4j;
+
+public class Slf4jLoggerFinder extends System.LoggerFinder {
+    @Override
+    public System.Logger getLogger(String name, Module module) {
+        return new Slf4jLogger(name);
+    }
+}
diff --git a/core-java-9/src/modules/com.baeldung.logging.slf4j/module-info.java b/core-java-9/src/modules/com.baeldung.logging.slf4j/module-info.java
new file mode 100644
index 0000000000..311ca22f5b
--- /dev/null
+++ b/core-java-9/src/modules/com.baeldung.logging.slf4j/module-info.java
@@ -0,0 +1,6 @@
+module com.baeldung.logging.slf4j {
+    requires org.slf4j;
+    provides java.lang.System.LoggerFinder
+      with com.baeldung.logging.slf4j.Slf4jLoggerFinder;
+    exports com.baeldung.logging.slf4j;
+}
\ No newline at end of file
diff --git a/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/ConsoleLogger.java b/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/ConsoleLogger.java
new file mode 100644
index 0000000000..a495e6979d
--- /dev/null
+++ b/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/ConsoleLogger.java
@@ -0,0 +1,27 @@
+package com.baeldung.logging;
+
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+
+public class ConsoleLogger implements System.Logger {
+
+    @Override
+    public String getName() {
+        return "ConsoleLogger";
+    }
+
+    @Override
+    public boolean isLoggable(Level level) {
+        return true;
+    }
+
+    @Override
+    public void log(Level level, ResourceBundle bundle, String msg, Throwable thrown) {
+        System.out.printf("ConsoleLogger [%s]: %s - %s%n", level, msg, thrown);
+    }
+
+    @Override
+    public void log(Level level, ResourceBundle bundle, String format, Object... params) {
+        System.out.printf("ConsoleLogger [%s]: %s%n", level, MessageFormat.format(format, params));
+    }
+}
diff --git a/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/CustomLoggerFinder.java b/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/CustomLoggerFinder.java
new file mode 100644
index 0000000000..b38955f199
--- /dev/null
+++ b/core-java-9/src/modules/com.baeldung.logging/com/baeldung/logging/CustomLoggerFinder.java
@@ -0,0 +1,9 @@
+package com.baeldung.logging;
+
+public class CustomLoggerFinder extends System.LoggerFinder {
+
+    @Override
+    public System.Logger getLogger(String name, Module module) {
+        return new ConsoleLogger();
+    }
+}
diff --git a/core-java-9/src/modules/com.baeldung.logging/module-info.java b/core-java-9/src/modules/com.baeldung.logging/module-info.java
new file mode 100644
index 0000000000..4ca0af0225
--- /dev/null
+++ b/core-java-9/src/modules/com.baeldung.logging/module-info.java
@@ -0,0 +1,5 @@
+module com.baeldung.logging {
+    provides java.lang.System.LoggerFinder
+      with com.baeldung.logging.CustomLoggerFinder;
+    exports com.baeldung.logging;
+}
\ No newline at end of file

From 33aa52ac94c616d2c1daf54f202bc0523b7271fa Mon Sep 17 00:00:00 2001
From: Aravind Ranganathan <aravindram87@gmail.com>
Date: Fri, 14 Sep 2018 10:15:45 -0400
Subject: [PATCH 055/114] Spring Cloud Functions with AWS

Issue: BAEL-1726
---
 spring-cloud/pom.xml                          |  1 +
 spring-cloud/spring-cloud-functions/pom.xml   | 19 ++++
 .../spring-cloud-function-aws/pom.xml         | 94 +++++++++++++++++++
 .../CloudFunctionAwsApplication.java          | 23 +++++
 .../cloudfunction/StringReverseHandler.java   |  7 ++
 .../cloudfunction/functions/Greeter.java      | 11 +++
 .../src/main/resources/application.properties |  1 +
 .../CloudFunctionApplicationTests.java        | 33 +++++++
 8 files changed, 189 insertions(+)
 create mode 100644 spring-cloud/spring-cloud-functions/pom.xml
 create mode 100644 spring-cloud/spring-cloud-functions/spring-cloud-function-aws/pom.xml
 create mode 100644 spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/CloudFunctionAwsApplication.java
 create mode 100644 spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/StringReverseHandler.java
 create mode 100644 spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/functions/Greeter.java
 create mode 100644 spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/resources/application.properties
 create mode 100644 spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/test/java/com/baeldung/spring/cloudfunction/CloudFunctionApplicationTests.java

diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 456d4e63e7..376d8099ed 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -33,6 +33,7 @@
         <module>spring-cloud-contract</module>
         <module>spring-cloud-kubernetes</module>
         <module>spring-cloud-archaius</module>
+        <module>spring-cloud-functions</module>        
         <module>spring-cloud-vault</module>
     </modules>
 
diff --git a/spring-cloud/spring-cloud-functions/pom.xml b/spring-cloud/spring-cloud-functions/pom.xml
new file mode 100644
index 0000000000..e3c17329d0
--- /dev/null
+++ b/spring-cloud/spring-cloud-functions/pom.xml
@@ -0,0 +1,19 @@
+<?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>
+    <artifactId>spring-cloud-functions</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
+
+    <modules>
+        <module>spring-cloud-function-aws</module>
+    </modules>
+    
+</project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/pom.xml b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/pom.xml
new file mode 100644
index 0000000000..8b2b0ad385
--- /dev/null
+++ b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/pom.xml
@@ -0,0 +1,94 @@
+<?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.spring</groupId>
+    <artifactId>cloudfunction-aws</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>cloudfunction-aws</name>
+    <description>Demo project for Spring Cloud Function</description>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.4.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <spring-cloud-function.version>1.0.1.RELEASE</spring-cloud-function.version>
+        <aws-lambda-events.version>2.0.2</aws-lambda-events.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-function-adapter-aws</artifactId>
+            <version>${spring-cloud-function.version}</version>
+        </dependency>
+        <!-- We don't need spring-cloud-starter-function-web when deploying to AWS-->
+        <!-- It is used only for local testing-->
+         <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-function-web</artifactId>
+            <version>1.0.1.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-events</artifactId>
+            <version>${aws-lambda-events.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>1.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.springframework.boot.experimental</groupId>
+                        <artifactId>spring-boot-thin-layout</artifactId>
+                        <version>1.0.10.RELEASE</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <shadedArtifactAttached>true</shadedArtifactAttached>
+                    <shadedClassifierName>aws</shadedClassifierName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/CloudFunctionAwsApplication.java b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/CloudFunctionAwsApplication.java
new file mode 100644
index 0000000000..cc8f11beca
--- /dev/null
+++ b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/CloudFunctionAwsApplication.java
@@ -0,0 +1,23 @@
+package com.baeldung.spring.cloudfunction;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+@SpringBootApplication
+public class CloudFunctionAwsApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(CloudFunctionAwsApplication.class, args);
+    }
+
+    @Bean
+    public Function<String, String> reverseString() {
+        return value -> new StringBuilder(value).reverse().toString();
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/StringReverseHandler.java b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/StringReverseHandler.java
new file mode 100644
index 0000000000..d103bc98d9
--- /dev/null
+++ b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/StringReverseHandler.java
@@ -0,0 +1,7 @@
+package com.baeldung.spring.cloudfunction;
+
+import org.springframework.cloud.function.adapter.aws.SpringBootRequestHandler;
+
+public class StringReverseHandler extends SpringBootRequestHandler<String, String> {
+
+}
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/functions/Greeter.java b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/functions/Greeter.java
new file mode 100644
index 0000000000..124aefe56e
--- /dev/null
+++ b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/functions/Greeter.java
@@ -0,0 +1,11 @@
+package com.baeldung.spring.cloudfunction.functions;
+
+import java.util.function.Function;
+
+public class Greeter implements Function<String, String> {
+
+    @Override
+    public String apply(String s) {
+        return "Hello " + s + ", and welcome to Spring Cloud Function!!!";
+    }
+}
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/resources/application.properties b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/resources/application.properties
new file mode 100644
index 0000000000..14426a848c
--- /dev/null
+++ b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.cloud.function.scan.packages: com.baeldung.spring.cloudfunction.functions
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/test/java/com/baeldung/spring/cloudfunction/CloudFunctionApplicationTests.java b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/test/java/com/baeldung/spring/cloudfunction/CloudFunctionApplicationTests.java
new file mode 100644
index 0000000000..01199475fb
--- /dev/null
+++ b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/test/java/com/baeldung/spring/cloudfunction/CloudFunctionApplicationTests.java
@@ -0,0 +1,33 @@
+package com.baeldung.spring.cloudfunction;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class CloudFunctionApplicationTests {
+
+    @LocalServerPort
+    private int port;
+
+    @Autowired
+    private TestRestTemplate testRestTemplate;
+
+    @Test
+    public void givenAString_whenReverseStringCloudFunctionInvoked_thenStringIsReversed() {  
+        assertThat(this.testRestTemplate.getForObject("http://localhost:" + port + "/reverseString/HelloWorld", String.class)).isEqualTo("dlroWolleH");
+    }
+
+    @Test
+    public void givenAString_whenGreeterCloudFunctionInvoked_thenPrintsGreeting() {        	  
+        assertThat(this.testRestTemplate.getForObject("http://localhost:" + port + "/greeter/BaeldungUser", String.class)).isEqualTo("Hello BaeldungUser, and welcome to Spring Cloud Function!!!");
+    }
+
+}

From 05e1700fb76cb7e4c373f8cc66269d16d05885b6 Mon Sep 17 00:00:00 2001
From: Wosin <blind.van@gmail.com>
Date: Sat, 15 Sep 2018 13:14:57 +0200
Subject: [PATCH 056/114] Moved Flink related code from libraries to
 libraries-data module. (#5253)

---
 libraries-data/pom.xml                        | 72 ++++++++++++++++++-
 .../com/baeldung/flink/FlinkDataPipeline.java |  0
 .../java/com/baeldung/flink/LineSplitter.java |  0
 .../java/com/baeldung/flink/WordCount.java    |  0
 .../baeldung/flink/connector/Consumers.java   |  0
 .../baeldung/flink/connector/Producers.java   |  0
 .../java/com/baeldung/flink/model/Backup.java |  0
 .../baeldung/flink/model/InputMessage.java    |  1 -
 .../flink/operator/BackupAggregator.java      |  0
 .../InputMessageTimestampAssigner.java        |  0
 .../flink/operator/WordsCapitalizer.java      |  0
 .../schema/BackupSerializationSchema.java     |  0
 .../InputMessageDeserializationSchema.java    |  2 -
 .../flink/BackupCreatorIntegrationTest.java   |  0
 .../flink/WordCapitalizerIntegrationTest.java |  0
 .../flink/WordCountIntegrationTest.java       |  0
 libraries/pom.xml                             | 45 +-----------
 17 files changed, 71 insertions(+), 49 deletions(-)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/FlinkDataPipeline.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/LineSplitter.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/WordCount.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/connector/Consumers.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/connector/Producers.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/model/Backup.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/model/InputMessage.java (99%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/operator/BackupAggregator.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java (100%)
 rename {libraries => libraries-data}/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java (89%)
 rename {libraries => libraries-data}/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java (100%)
 rename {libraries => libraries-data}/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java (100%)
 rename {libraries => libraries-data}/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java (100%)

diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 2b83328295..5b34a903ce 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -147,7 +147,6 @@
             <artifactId>jmapper-core</artifactId>
             <version>${jmapper.version}</version>
         </dependency>
-
         <!--  crunch project  -->
 		<dependency>
 			<groupId>org.apache.crunch</groupId>
@@ -185,7 +184,72 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-                
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-streaming-java_2.11</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-core</artifactId>
+            <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-java</artifactId>
+            <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-test-utils_2.11</artifactId>
+            <version>${flink.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility-proxy</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -336,6 +400,10 @@
         <ignite.version>2.4.0</ignite.version>
         <gson.version>2.8.2</gson.version>
         <cache.version>1.1.0</cache.version>
+        <flink.version>1.5.0</flink.version>
+        <jackson.version>2.8.5</jackson.version>
+        <awaitility.version>3.0.0</awaitility.version>
+        <assertj.version>3.6.2</assertj.version>
         <hazelcast.version>3.8.4</hazelcast.version>
         <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
diff --git a/libraries/src/main/java/com/baeldung/flink/FlinkDataPipeline.java b/libraries-data/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
rename to libraries-data/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
diff --git a/libraries/src/main/java/com/baeldung/flink/LineSplitter.java b/libraries-data/src/main/java/com/baeldung/flink/LineSplitter.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/LineSplitter.java
rename to libraries-data/src/main/java/com/baeldung/flink/LineSplitter.java
diff --git a/libraries/src/main/java/com/baeldung/flink/WordCount.java b/libraries-data/src/main/java/com/baeldung/flink/WordCount.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/WordCount.java
rename to libraries-data/src/main/java/com/baeldung/flink/WordCount.java
diff --git a/libraries/src/main/java/com/baeldung/flink/connector/Consumers.java b/libraries-data/src/main/java/com/baeldung/flink/connector/Consumers.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/connector/Consumers.java
rename to libraries-data/src/main/java/com/baeldung/flink/connector/Consumers.java
diff --git a/libraries/src/main/java/com/baeldung/flink/connector/Producers.java b/libraries-data/src/main/java/com/baeldung/flink/connector/Producers.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/connector/Producers.java
rename to libraries-data/src/main/java/com/baeldung/flink/connector/Producers.java
diff --git a/libraries/src/main/java/com/baeldung/flink/model/Backup.java b/libraries-data/src/main/java/com/baeldung/flink/model/Backup.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/model/Backup.java
rename to libraries-data/src/main/java/com/baeldung/flink/model/Backup.java
diff --git a/libraries/src/main/java/com/baeldung/flink/model/InputMessage.java b/libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
similarity index 99%
rename from libraries/src/main/java/com/baeldung/flink/model/InputMessage.java
rename to libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
index 183fa69c11..b3f75256ae 100644
--- a/libraries/src/main/java/com/baeldung/flink/model/InputMessage.java
+++ b/libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
@@ -18,7 +18,6 @@ public class InputMessage {
     public String getSender() {
         return sender;
     }
-
     public void setSender(String sender) {
         this.sender = sender;
     }
diff --git a/libraries/src/main/java/com/baeldung/flink/operator/BackupAggregator.java b/libraries-data/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
rename to libraries-data/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
diff --git a/libraries/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java b/libraries-data/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
rename to libraries-data/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
diff --git a/libraries/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java b/libraries-data/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
rename to libraries-data/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
diff --git a/libraries/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java b/libraries-data/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
rename to libraries-data/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
diff --git a/libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java b/libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
similarity index 89%
rename from libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
rename to libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
index 1df456bbe5..9aaf8b9877 100644
--- a/libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
+++ b/libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
@@ -1,8 +1,6 @@
 package com.baeldung.flink.schema;
 
 import com.baeldung.flink.model.InputMessage;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.apache.flink.api.common.serialization.DeserializationSchema;
diff --git a/libraries/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
rename to libraries-data/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
rename to libraries-data/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
rename to libraries-data/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
diff --git a/libraries/pom.xml b/libraries/pom.xml
index f7980f10f6..91c54b6113 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -154,45 +154,7 @@
             <artifactId>commons-dbutils</artifactId>
             <version>${commons.dbutils.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_2.11</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
 
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-core</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-java</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-test-utils_2.11</artifactId>
-            <version>${flink.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
@@ -239,11 +201,7 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
+
         <!-- JDO -->
         <dependency>
             <groupId>org.datanucleus</groupId>
@@ -900,7 +858,6 @@
 
         <httpclient.version>4.5.3</httpclient.version>
         <commons.io.version>2.5</commons.io.version>
-        <flink.version>1.5.0</flink.version>
         <jackson.version>2.8.5</jackson.version>
         <neuroph.version>2.92</neuroph.version>
         <serenity.version>1.9.26</serenity.version>

From 2e0edf12b120f680500dc9c5a1676be2e9cdb0ea Mon Sep 17 00:00:00 2001
From: Krzysztof Majewski <majewski.kielce@gmail.com>
Date: Sat, 15 Sep 2018 13:57:25 +0000
Subject: [PATCH 057/114] Bael 2145 concatenate strings in kotlin (#5208)

* BAEL-2145

* BAEL-2145

* BAEL-2145
---
 .../kotlin/StringConcatenationTest.kt         | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/StringConcatenationTest.kt

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StringConcatenationTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StringConcatenationTest.kt
new file mode 100644
index 0000000000..9c371614a4
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StringConcatenationTest.kt
@@ -0,0 +1,48 @@
+package com.baeldung.kotlin
+
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class StringConcatenationTest {
+
+    @Test
+    fun givenTwoStrings_concatenateWithTemplates_thenEquals() {
+        val a = "Hello"
+        val b = "Baeldung"
+        val c = "$a $b"
+
+        assertEquals("Hello Baeldung", c)
+    }
+
+    @Test
+    fun givenTwoStrings_concatenateWithPlusOperator_thenEquals() {
+        val a = "Hello"
+        val b = "Baeldung"
+        val c = a + " " + b
+
+        assertEquals("Hello Baeldung", c)
+    }
+
+    @Test
+    fun givenTwoStrings_concatenateWithStringBuilder_thenEquals() {
+        val a = "Hello"
+        val b = "Baeldung"
+
+        val builder = StringBuilder()
+        builder.append(a).append(" ").append(b)
+
+        val c = builder.toString()
+
+        assertEquals("Hello Baeldung", c)
+    }
+
+    @Test
+    fun givenTwoStrings_concatenateWithPlusMethod_thenEquals() {
+        val a = "Hello"
+        val b = "Baeldung"
+        val c = a.plus(" ").plus(b)
+
+        assertEquals("Hello Baeldung", c)
+    }
+
+}

From 8d65e267e65653d485744589cc398c78e5a565b7 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sat, 15 Sep 2018 17:15:15 +0300
Subject: [PATCH 058/114] add bidimap key test

---
 .../baeldung/commons/collections/BidiMapUnitTest.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libraries/src/test/java/com/baeldung/commons/collections/BidiMapUnitTest.java b/libraries/src/test/java/com/baeldung/commons/collections/BidiMapUnitTest.java
index e46d8654a2..64e13a277e 100644
--- a/libraries/src/test/java/com/baeldung/commons/collections/BidiMapUnitTest.java
+++ b/libraries/src/test/java/com/baeldung/commons/collections/BidiMapUnitTest.java
@@ -42,4 +42,13 @@ public class BidiMapUnitTest {
         map.put("key1", "value1");
         assertEquals(map.getKey("value1"), "key1");
     }
+    
+    @Test
+    public void givenKeyValue_whenAddValue_thenReplaceFirstKey() {
+        BidiMap<String, String> map = new DualHashBidiMap<>();
+        map.put("key1", "value1");
+        map.put("key2", "value1");
+        assertEquals(map.size(), 1);
+        assertFalse(map.containsKey("key1"));
+    }
 }

From 265c01575180d64f7075db4e0a57d96b89f273f1 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Mon, 10 Sep 2018 00:00:06 +0530
Subject: [PATCH 059/114] [BAEL-8870] - Added modules in the parent module
 build

---
 pom.xml | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7a7e2d7f64..35f5667656 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,6 +604,80 @@
 				<module>jnosql</module>
 				<module>spring-boot-angular-ecommerce</module>
 				<module>jta</module>
+				<!--<module>java-dates</module> --> <!-- Commented because we have still not upgraded to java 9 -->
+				<module>java-websocket</module>
+				<!-- <module>activejdbc</module> --><!-- PMD voilation -->
+				<!-- <module>animal-sniffer-mvn-plugin</module> --><!-- PMD voilation -->
+				<!-- <module>apache-avro</module> --><!-- Malformed POM -->
+				<module>apache-bval</module>
+				<module>apache-shiro</module>
+				<module>apache-spark</module>
+				<!-- <module>asciidoctor</module> --><!-- Malformed POM -->
+				<module>checker-plugin</module>
+				<!-- <module>core-java-10</module> --><!-- Not upgraded to java 10 -->
+				<!-- <module>core-java-11</module> --><!-- Not upgraded to java 11 -->
+				<module>core-java-sun</module>
+				<module>custom-pmd</module>
+				<module>dagger</module>
+				<module>data-structures</module>
+				<module>dubbo</module>
+				<!-- <module>flyway</module> --><!-- Malformed POM -->
+				<!-- <module>grpc</module> --><!-- protobuf-maven-plugin filecopy failure -->
+				<!-- <module>java-difference-date</module> --><!-- PMD voilation -->
+				<!-- <module>JGit</module> --><!-- Unit test failure -->
+				<module>jni</module>
+				<module>jooby</module>
+				<!-- <module>micronaut</module> --><!-- Not upgraded to java 9 -->
+				<!-- <module>microprofile</module> --><!-- Takes too much time : Downloads 93 MBs zip and .. -->
+				<!-- <module>muleesb</module> --><!-- load main class org.mule.munit.remote.RemoteRunner -->
+				<module>ratpack</module>
+				<!-- <module>rest-with-spark-java</module> --><!-- PMD voilation -->
+				<module>spring-boot-autoconfiguration</module>
+				<module>spring-boot-custom-starter</module>
+				<!-- <module>spring-boot-jasypt</module> --><!-- PMD voilation -->
+				<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
+				<module>spring-data-rest-querydsl</module>
+				<!-- <module>spring-groovy</module> --><!-- PMD voilation -->
+				<module>spring-mobile</module>
+				<!-- <module>spring-mustache</module> --><!-- PMD voilation -->
+				<module>spring-mvc-simple</module>
+				<!-- <module>spring-mybatis</module> --><!-- Compilation failure -->
+				<module>spring-rest-hal-browser</module>
+				<module>spring-rest-shell</module>
+				<module>spring-rest-template</module>
+				<module>spring-roo</module>
+				<module>spring-security-stormpath</module>
+				<module>sse-jaxrs</module>
+				<!-- <module>static-analysis</module> --><!-- PMD voilation -->
+				<module>stripe</module>
+				<!-- <module>structurizr</module> --><!-- Artiifact not found -->
+				<!-- <module>Twitter4J</module> --><!-- Test failure -->
+				<module>wicket</module>
+				<module>xstream</module>
+				<module>cas/cas-secured-app</module>
+				<!-- <module>cas/cas-server</module> --><!-- Takes too much time -->
+				<!-- <module>graphql/graphql-java</module> --><!-- Wrong parent -->
+				<module>guest/deep-jsf</module>
+				<!-- <module>guest/junit5-example</module> --><!-- Compilation failure -->
+				<!-- <module>guest/log4j2-example</module> --><!-- PMD voilation -->
+				<!-- <module>guest/logback-example</module> --><!-- PMD voilation -->
+				<module>guest/memory-leaks</module>
+				<module>guest/remote-debugging</module>
+				<module>guest/spring-boot-app</module>
+				<!-- <module>guest/spring-mvc</module> --><!-- Malformed POM -->
+				<!-- <module>guest/spring-security</module> --><!-- Malformed POM -->
+				<module>guest/thread-pools</module>
+				<module>guest/tomcat-app</module>
+				<module>jenkins/hello-world</module>
+				<!-- <module>rule-engines/easy-rules</module> --><!-- Wrong Parent -->
+				<!-- <module>rule-engines/openl-tablets</module> --><!-- Wrong Parent -->
+				<!-- <module>rule-engines/rulebook</module> --><!-- Wrong Parent -->
+				<module>spring-boot-custom-starter/greeter</module>
+				<module>spring-boot-h2/spring-boot-h2-database</module>
+				<module>spring-boot-h2/spring-boot-h2-remote-app</module>
+				<module>guest\webservices\rest-client</module>
+				<!-- <module>guest\webservices\rest-server</module> --><!-- PMD voilation -->
+				<module>guest\webservices\spring-rest-service</module>
 			</modules>
 
 		</profile>

From 3c89c8c7f309459817cd46dc5f91126b8742be65 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 15 Sep 2018 19:40:50 +0530
Subject: [PATCH 060/114] [BAEL-8870] - Commented guest modules and added in
 the intergratopm profile too

---
 pom.xml | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 83 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 35f5667656..18ff0f70de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -657,17 +657,17 @@
 				<module>cas/cas-secured-app</module>
 				<!-- <module>cas/cas-server</module> --><!-- Takes too much time -->
 				<!-- <module>graphql/graphql-java</module> --><!-- Wrong parent -->
-				<module>guest/deep-jsf</module>
-				<!-- <module>guest/junit5-example</module> --><!-- Compilation failure -->
+				<!-- <module>guest/deep-jsf</module> --><!-- guest post on different site -->
+				<!-- <module>guest/junit5-example</module> --><!-- guest post on different site - Compilation failure -->
 				<!-- <module>guest/log4j2-example</module> --><!-- PMD voilation -->
 				<!-- <module>guest/logback-example</module> --><!-- PMD voilation -->
-				<module>guest/memory-leaks</module>
-				<module>guest/remote-debugging</module>
-				<module>guest/spring-boot-app</module>
+				<!-- <module>guest/memory-leaks</module> --><!-- guest post on different site -->
+				<!-- <module>guest/remote-debugging</module> --><!-- guest post on different site -->
+				<!-- <module>guest/spring-boot-app</module> --><!-- guest post on different site -->
 				<!-- <module>guest/spring-mvc</module> --><!-- Malformed POM -->
 				<!-- <module>guest/spring-security</module> --><!-- Malformed POM -->
-				<module>guest/thread-pools</module>
-				<module>guest/tomcat-app</module>
+				<!-- <module>guest/thread-pools</module> --><!-- guest post on different site -->
+				<!-- <module>guest/tomcat-app</module> --><!-- guest post on different site -->
 				<module>jenkins/hello-world</module>
 				<!-- <module>rule-engines/easy-rules</module> --><!-- Wrong Parent -->
 				<!-- <module>rule-engines/openl-tablets</module> --><!-- Wrong Parent -->
@@ -675,9 +675,9 @@
 				<module>spring-boot-custom-starter/greeter</module>
 				<module>spring-boot-h2/spring-boot-h2-database</module>
 				<module>spring-boot-h2/spring-boot-h2-remote-app</module>
-				<module>guest\webservices\rest-client</module>
+				<!-- <module>guest\webservices\rest-client</module> --><!-- guest post on different site -->
 				<!-- <module>guest\webservices\rest-server</module> --><!-- PMD voilation -->
-				<module>guest\webservices\spring-rest-service</module>
+				<!-- <module>guest\webservices\spring-rest-service</module> --><!-- guest post on different site -->
 			</modules>
 
 		</profile>
@@ -921,7 +921,80 @@
 				<!-- group 4 - OK, 12 min, 3,961 KB log, 12 failed tests -->
 
 				<!-- <module>libraries</module> <module>jmeter</module> -->
-
+				<!--<module>java-dates</module> --> <!-- Commented because we have still not upgraded to java 9 -->
+				<module>java-websocket</module>
+				<!-- <module>activejdbc</module> --><!-- PMD voilation -->
+				<!-- <module>animal-sniffer-mvn-plugin</module> --><!-- PMD voilation -->
+				<!-- <module>apache-avro</module> --><!-- Malformed POM -->
+				<module>apache-bval</module>
+				<module>apache-shiro</module>
+				<module>apache-spark</module>
+				<!-- <module>asciidoctor</module> --><!-- Malformed POM -->
+				<module>checker-plugin</module>
+				<!-- <module>core-java-10</module> --><!-- Not upgraded to java 10 -->
+				<!-- <module>core-java-11</module> --><!-- Not upgraded to java 11 -->
+				<module>core-java-sun</module>
+				<module>custom-pmd</module>
+				<module>dagger</module>
+				<module>data-structures</module>
+				<module>dubbo</module>
+				<!-- <module>flyway</module> --><!-- Malformed POM -->
+				<!-- <module>grpc</module> --><!-- protobuf-maven-plugin filecopy failure -->
+				<!-- <module>java-difference-date</module> --><!-- PMD voilation -->
+				<!-- <module>JGit</module> --><!-- Unit test failure -->
+				<module>jni</module>
+				<module>jooby</module>
+				<!-- <module>micronaut</module> --><!-- Not upgraded to java 9 -->
+				<!-- <module>microprofile</module> --><!-- Takes too much time : Downloads 93 MBs zip and .. -->
+				<!-- <module>muleesb</module> --><!-- load main class org.mule.munit.remote.RemoteRunner -->
+				<module>ratpack</module>
+				<!-- <module>rest-with-spark-java</module> --><!-- PMD voilation -->
+				<module>spring-boot-autoconfiguration</module>
+				<module>spring-boot-custom-starter</module>
+				<!-- <module>spring-boot-jasypt</module> --><!-- PMD voilation -->
+				<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
+				<module>spring-data-rest-querydsl</module>
+				<!-- <module>spring-groovy</module> --><!-- PMD voilation -->
+				<module>spring-mobile</module>
+				<!-- <module>spring-mustache</module> --><!-- PMD voilation -->
+				<module>spring-mvc-simple</module>
+				<!-- <module>spring-mybatis</module> --><!-- Compilation failure -->
+				<module>spring-rest-hal-browser</module>
+				<module>spring-rest-shell</module>
+				<module>spring-rest-template</module>
+				<module>spring-roo</module>
+				<module>spring-security-stormpath</module>
+				<module>sse-jaxrs</module>
+				<!-- <module>static-analysis</module> --><!-- PMD voilation -->
+				<module>stripe</module>
+				<!-- <module>structurizr</module> --><!-- Artiifact not found -->
+				<!-- <module>Twitter4J</module> --><!-- Test failure -->
+				<module>wicket</module>
+				<module>xstream</module>
+				<module>cas/cas-secured-app</module>
+				<!-- <module>cas/cas-server</module> --><!-- Takes too much time -->
+				<!-- <module>graphql/graphql-java</module> --><!-- Wrong parent -->
+				<!-- <module>guest/deep-jsf</module> --><!-- guest post on different site -->
+				<!-- <module>guest/junit5-example</module> --><!-- guest post on different site - Compilation failure -->
+				<!-- <module>guest/log4j2-example</module> --><!-- PMD voilation -->
+				<!-- <module>guest/logback-example</module> --><!-- PMD voilation -->
+				<!-- <module>guest/memory-leaks</module> --><!-- guest post on different site -->
+				<!-- <module>guest/remote-debugging</module> --><!-- guest post on different site -->
+				<!-- <module>guest/spring-boot-app</module> --><!-- guest post on different site -->
+				<!-- <module>guest/spring-mvc</module> --><!-- Malformed POM -->
+				<!-- <module>guest/spring-security</module> --><!-- Malformed POM -->
+				<!-- <module>guest/thread-pools</module> --><!-- guest post on different site -->
+				<!-- <module>guest/tomcat-app</module> --><!-- guest post on different site -->
+				<module>jenkins/hello-world</module>
+				<!-- <module>rule-engines/easy-rules</module> --><!-- Wrong Parent -->
+				<!-- <module>rule-engines/openl-tablets</module> --><!-- Wrong Parent -->
+				<!-- <module>rule-engines/rulebook</module> --><!-- Wrong Parent -->
+				<module>spring-boot-custom-starter/greeter</module>
+				<module>spring-boot-h2/spring-boot-h2-database</module>
+				<module>spring-boot-h2/spring-boot-h2-remote-app</module>
+				<!-- <module>guest\webservices\rest-client</module> --><!-- guest post on different site -->
+				<!-- <module>guest\webservices\rest-server</module> --><!-- PMD voilation -->
+				<!-- <module>guest\webservices\spring-rest-service</module> --><!-- guest post on different site -->
 			</modules>
 
 		</profile>

From 2603129320a098743069f7158a9d93a1c40d6b7b Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 15 Sep 2018 20:57:55 +0530
Subject: [PATCH 061/114] [BAEL-8870] - Commented jws module for build failure

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 18ff0f70de..66293fe31b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -405,7 +405,7 @@
 				<module>json</module>
 				<module>jsoup</module>
 				<module>testing-modules/junit-5</module>
-				<module>jws</module>
+				<!-- <module>jws</module> --><!-- POM jar version repo download failure -->
 				<module>libraries</module>
 				<module>libraries-data</module>
 				<module>libraries-server</module>

From 21ed59cb25fffdc12e99ddacbca35097c06643b1 Mon Sep 17 00:00:00 2001
From: Satyam <tyagi.satyam04@gmail.com>
Date: Sat, 15 Sep 2018 22:12:47 +0530
Subject: [PATCH 062/114] Initial commit- BAEL 2158

---
 algorithms/roundUpToHundred/.gitignore        |  1 +
 .../src/com/java/src/RoundUpToHundred.java    | 22 +++++++++++++++++++
 .../com/java/src/RoundUpToHundredTest.java    | 18 +++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 algorithms/roundUpToHundred/.gitignore
 create mode 100644 algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
 create mode 100644 algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java

diff --git a/algorithms/roundUpToHundred/.gitignore b/algorithms/roundUpToHundred/.gitignore
new file mode 100644
index 0000000000..ae3c172604
--- /dev/null
+++ b/algorithms/roundUpToHundred/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
new file mode 100644
index 0000000000..fe3868570c
--- /dev/null
+++ b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
@@ -0,0 +1,22 @@
+package com.java.src;
+
+import java.util.Scanner;
+
+public class RoundUpToHundred {
+
+	public static void main(String[] args) {
+
+		Scanner scanner = new Scanner(System.in);
+		double input = scanner.nextDouble();
+		scanner.close();
+
+		RoundUpToHundred.round(input);
+	}
+
+	static int round(double input) {
+
+		int i = (int) Math.round(input);
+		return ((i + 99) / 100) * 100;
+	};
+
+}
diff --git a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java
new file mode 100644
index 0000000000..457e762e09
--- /dev/null
+++ b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java
@@ -0,0 +1,18 @@
+package com.java.src;
+
+import static org.junit.Assert.assertEquals;
+
+public class RoundUpToHundredTest {
+	public void roundupTest() {
+
+		assertEquals("Rounded up to hundred", 100, 
+				RoundUpToHundred.round(99));
+
+		assertEquals("Rounded down to two hundred ", 200,
+				RoundUpToHundred.round(200.2));
+
+		assertEquals("Returns same rounded value", 300,
+				RoundUpToHundred.round(300));
+
+	}
+}

From 31af57528e1e8a853f9b3f63e91b4e4a187c0392 Mon Sep 17 00:00:00 2001
From: rozagerardo <rozagerardo@gmail.com>
Date: Sun, 16 Sep 2018 01:46:42 -0300
Subject: [PATCH 063/114] [BAEL-1626] testing-modules | A Quick Guide to
 @TestPropertySource (#5255)

* *added tests using testpropertysource

* fix: using property for version in pom file

* fix, added dependency with compile scope to build successfully on mvn clean install
---
 .../spring-context-testing/pom.xml            | 25 ++++++++++++++++++
 .../ClassUsingProperty.java                   | 15 +++++++++++
 ...aultTestPropertySourceIntegrationTest.java | 26 +++++++++++++++++++
 ...tionTestPropertySourceIntegrationTest.java | 26 +++++++++++++++++++
 ...tiesTestPropertySourceIntegrationTest.java | 26 +++++++++++++++++++
 ...stPropertySourceIntegrationTest.properties |  1 +
 .../test/resources/other-location.properties  |  1 +
 7 files changed, 120 insertions(+)
 create mode 100644 testing-modules/spring-context-testing/pom.xml
 create mode 100644 testing-modules/spring-context-testing/src/main/java/com/baeldung/testpropertysource/ClassUsingProperty.java
 create mode 100644 testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.java
 create mode 100644 testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/LocationTestPropertySourceIntegrationTest.java
 create mode 100644 testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/PropertiesTestPropertySourceIntegrationTest.java
 create mode 100644 testing-modules/spring-context-testing/src/test/resources/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.properties
 create mode 100644 testing-modules/spring-context-testing/src/test/resources/other-location.properties

diff --git a/testing-modules/spring-context-testing/pom.xml b/testing-modules/spring-context-testing/pom.xml
new file mode 100644
index 0000000000..148192d6c5
--- /dev/null
+++ b/testing-modules/spring-context-testing/pom.xml
@@ -0,0 +1,25 @@
+<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>spring-context-testing</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>${spring.boot.starter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <version>${spring.boot.starter.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <spring.boot.starter.version>2.0.4.RELEASE</spring.boot.starter.version>
+    </properties>
+</project>
diff --git a/testing-modules/spring-context-testing/src/main/java/com/baeldung/testpropertysource/ClassUsingProperty.java b/testing-modules/spring-context-testing/src/main/java/com/baeldung/testpropertysource/ClassUsingProperty.java
new file mode 100644
index 0000000000..d545daf0df
--- /dev/null
+++ b/testing-modules/spring-context-testing/src/main/java/com/baeldung/testpropertysource/ClassUsingProperty.java
@@ -0,0 +1,15 @@
+package com.baeldung.testpropertysource;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ClassUsingProperty {
+    
+    @Value("${baeldung.testpropertysource.one}")
+    private String propertyOne;
+    
+    public String retrievePropertyOne() {
+        return propertyOne;
+    }
+}
diff --git a/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.java b/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.java
new file mode 100644
index 0000000000..f983abdd54
--- /dev/null
+++ b/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.testpropertysource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = ClassUsingProperty.class)
+@TestPropertySource
+public class DefaultTestPropertySourceIntegrationTest {
+
+    @Autowired
+    ClassUsingProperty classUsingProperty;
+
+    @Test
+    public void givenDefaultTestPropertySource_whenVariableOneRetrieved_thenValueInDefaultFileReturned() {
+        String output = classUsingProperty.retrievePropertyOne();
+
+        assertThat(output).isEqualTo("default-value");
+    }
+}
diff --git a/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/LocationTestPropertySourceIntegrationTest.java b/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/LocationTestPropertySourceIntegrationTest.java
new file mode 100644
index 0000000000..93d4cc58da
--- /dev/null
+++ b/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/LocationTestPropertySourceIntegrationTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.testpropertysource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = ClassUsingProperty.class)
+@TestPropertySource(locations = "/other-location.properties")
+public class LocationTestPropertySourceIntegrationTest {
+
+    @Autowired
+    ClassUsingProperty classUsingProperty;
+
+    @Test
+    public void givenDefaultTestPropertySource_whenVariableOneRetrieved_thenValueInDefaultFileReturned() {
+        String output = classUsingProperty.retrievePropertyOne();
+
+        assertThat(output).isEqualTo("other-location-value");
+    }
+}
diff --git a/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/PropertiesTestPropertySourceIntegrationTest.java b/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/PropertiesTestPropertySourceIntegrationTest.java
new file mode 100644
index 0000000000..d98e2b9f98
--- /dev/null
+++ b/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/PropertiesTestPropertySourceIntegrationTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.testpropertysource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = ClassUsingProperty.class)
+@TestPropertySource(locations = "/other-location.properties", properties = "baeldung.testpropertysource.one=other-properties-value")
+public class PropertiesTestPropertySourceIntegrationTest {
+
+    @Autowired
+    ClassUsingProperty classUsingProperty;
+
+    @Test
+    public void givenDefaultTestPropertySource_whenVariableOneRetrieved_thenValueInDefaultFileReturned() {
+        String output = classUsingProperty.retrievePropertyOne();
+
+        assertThat(output).isEqualTo("other-properties-value");
+    }
+}
diff --git a/testing-modules/spring-context-testing/src/test/resources/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.properties b/testing-modules/spring-context-testing/src/test/resources/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.properties
new file mode 100644
index 0000000000..a443a2b776
--- /dev/null
+++ b/testing-modules/spring-context-testing/src/test/resources/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.properties
@@ -0,0 +1 @@
+baeldung.testpropertysource.one=default-value
\ No newline at end of file
diff --git a/testing-modules/spring-context-testing/src/test/resources/other-location.properties b/testing-modules/spring-context-testing/src/test/resources/other-location.properties
new file mode 100644
index 0000000000..6ef791ec75
--- /dev/null
+++ b/testing-modules/spring-context-testing/src/test/resources/other-location.properties
@@ -0,0 +1 @@
+baeldung.testpropertysource.one=other-location-value
\ No newline at end of file

From 77137e4011d7e977f4c8ca0ed131ebf46fb0b196 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Sun, 16 Sep 2018 11:31:39 +0530
Subject: [PATCH 064/114] BAEL-8965 Update "Spring Bean Scopes" article

- Updated changes for new spring bean scopes examples
---
 spring-all/pom.xml                            |  9 +++++
 .../org/baeldung/scopes/ScopesController.java | 39 +++++++++++++------
 .../baeldung/spring/config/ScopesConfig.java  | 12 ++++--
 .../webapp/WEB-INF/view/scopesExample.jsp     |  8 ++--
 4 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index c4c4cf7963..9df14873a2 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -45,6 +45,15 @@
             <artifactId>spring-shell</artifactId>
             <version>${org.springframework.shell.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-websocket</artifactId>
+    	</dependency>
+    	<dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-messaging</artifactId>
+    	</dependency>
+ 
         <!-- aspectj -->
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
index 73df386aff..9257a3aa3a 100644
--- a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
+++ b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
@@ -13,21 +13,36 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public class ScopesController {
     public static final Logger LOG = LoggerFactory.getLogger(ScopesController.class);
 
-    @Resource(name = "requestMessage")
-    HelloMessageGenerator requestMessage;
+    @Resource(name = "requestScopedBean")
+    HelloMessageGenerator requestScopedBean;
 
-    @Resource(name = "sessionMessage")
-    HelloMessageGenerator sessionMessage;
+    @Resource(name = "sessionScopedBean")
+    HelloMessageGenerator sessionScopedBean;
 
-    @RequestMapping("/scopes")
-    public String getScopes(final Model model) {
-        LOG.info("Request Message:" + requestMessage.getMessage());
-        LOG.info("Session Message" + sessionMessage.getMessage());
-        requestMessage.setMessage("Good morning!");
-        sessionMessage.setMessage("Good afternoon!");
-        model.addAttribute("requestMessage", requestMessage.getMessage());
-        model.addAttribute("sessionMessage", sessionMessage.getMessage());
+    @Resource(name = "applicationScopedBean")
+    HelloMessageGenerator applicationScopedBean;
+
+    @RequestMapping("/scopes/request")
+    public String getRequestScopeMessage(final Model model) {
+        model.addAttribute("previousMessage", requestScopedBean.getMessage());
+        requestScopedBean.setMessage("Request Scope Message!");
+        model.addAttribute("currentMessage", requestScopedBean.getMessage());
         return "scopesExample";
     }
 
+    @RequestMapping("/scopes/session")
+    public String getSessionScopeMessage(final Model model) {
+        model.addAttribute("previousMessage", sessionScopedBean.getMessage());
+        sessionScopedBean.setMessage("Session Scope Message!");
+        model.addAttribute("currentMessage", sessionScopedBean.getMessage());
+        return "scopesExample";
+    }
+
+    @RequestMapping("/scopes/application")
+    public String getApplicationScopeMessage(final Model model) {
+        model.addAttribute("previousMessage", applicationScopedBean.getMessage());
+        applicationScopedBean.setMessage("Application Scope Message!");
+        model.addAttribute("currentMessage", applicationScopedBean.getMessage());
+        return "scopesExample";
+    }
 }
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
index fb34725508..b5fe494ee2 100644
--- a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
+++ b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
@@ -27,19 +27,25 @@ public class ScopesConfig {
 
     @Bean
     @Scope(value = WebApplicationContext.SCOPE_REQUEST, proxyMode = ScopedProxyMode.TARGET_CLASS)
-    public HelloMessageGenerator requestMessage() {
+    public HelloMessageGenerator requestScopedBean() {
         return new HelloMessageGenerator();
     }
 
     @Bean
     @Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
-    public HelloMessageGenerator sessionMessage() {
+    public HelloMessageGenerator sessionScopedBean() {
         return new HelloMessageGenerator();
     }
 
     @Bean
     @Scope(value = WebApplicationContext.SCOPE_APPLICATION, proxyMode = ScopedProxyMode.TARGET_CLASS)
-    public HelloMessageGenerator globalSessionMessage() {
+    public HelloMessageGenerator applicationScopedBean() {
+        return new HelloMessageGenerator();
+    }
+
+    @Bean
+    @Scope(scopeName = "websocket", proxyMode = ScopedProxyMode.TARGET_CLASS)
+    public HelloMessageGenerator websocketScopedBean() {
         return new HelloMessageGenerator();
     }
 
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
index 7974cf0220..0946f1b5ef 100644
--- a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
+++ b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
@@ -2,9 +2,9 @@
 <head></head>
 
 <body>
-    <h1>Bean Scopes Examples</h1>
-    <br>
- Request Message: ${requestMessage }<br>
- Session Message: ${sessionMessage }
+	<h1>Bean Scopes Examples</h1>
+	<br> Previous Message: ${previousMessage }
+	<br> Current Message: ${currentMessage }
+	<br>
 </body>
 </html>
\ No newline at end of file

From 9d9325b972c4e5e5a65283e0b7b6b8ffcbcac8b1 Mon Sep 17 00:00:00 2001
From: Mher Baghinyan <mbaghinyan@gmail.com>
Date: Sun, 16 Sep 2018 11:18:22 +0400
Subject: [PATCH 065/114] Update SortHashMap.java

---
 .../src/main/java/com/baeldung/sort/SortHashMap.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
index f7ea2f655b..ce2d0d3c3f 100644
--- a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
+++ b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
@@ -30,10 +30,10 @@ public class SortHashMap {
     }
 
     private static void sortGuava() {
-        final Ordering<String> naturalReverseValueOrdering =
-                Ordering.natural().reverse().nullsLast().onResultOf(Functions.forMap(map, null));
+        final Ordering naturalOrdering =
+        Ordering.natural().onResultOf(Functions.forMap(map, null));
 
-        System.out.println(ImmutableSortedMap.copyOf(map, naturalReverseValueOrdering));
+        System.out.println(ImmutableSortedMap.copyOf(map, naturalOrdering));
     }
 
     private static void sortStream() {

From 476c07f24475c2f03569ea9a0770bd7ac464d44f Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 16 Sep 2018 12:51:27 +0300
Subject: [PATCH 066/114] Create README.md

---
 optaplanner/README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 optaplanner/README.md

diff --git a/optaplanner/README.md b/optaplanner/README.md
new file mode 100644
index 0000000000..d793be1f2a
--- /dev/null
+++ b/optaplanner/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Guide to OptaPlanner](https://www.baeldung.com/opta-planner)

From dffd6cc87d1f27c80da5fc361ed736098c4cd9e1 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Sun, 16 Sep 2018 14:56:21 +0300
Subject: [PATCH 067/114] find registered security filters

---
 .../org/baeldung/ip/config/SecurityConfig.java   |  2 +-
 .../java/org/baeldung/ip/web/MainController.java | 16 ++++++++++++++++
 .../src/main/resources/application.properties    |  5 ++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
index b4ed8277d6..3a8032a734 100644
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
@@ -8,7 +8,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @Configuration
-@EnableWebSecurity
+@EnableWebSecurity//(debug = true)
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Autowired
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
index da5db5e825..8996a698d6 100644
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
@@ -1,8 +1,15 @@
 package org.baeldung.ip.web;
 
+import java.util.List;
+
+import javax.servlet.Filter;
 import javax.servlet.http.HttpServletRequest;
 
 import org.baeldung.custom.persistence.model.Foo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.security.web.FilterChainProxy;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,9 +19,18 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 public class MainController {
 
+    @Autowired
+    @Qualifier("springSecurityFilterChain")
+    private Filter springSecurityFilterChain;
+
     @RequestMapping(method = RequestMethod.GET, value = "/foos/{id}")
     @ResponseBody
     public Foo findById(@PathVariable final long id, HttpServletRequest request) {
+        FilterChainProxy filterChainProxy = (FilterChainProxy) springSecurityFilterChain;
+        List<SecurityFilterChain> list = filterChainProxy.getFilterChains();
+        list.forEach(chain -> chain.getFilters()
+            .forEach(filter -> System.out.println(filter.getClass())));
+
         return new Foo("Sample");
     }
 
diff --git a/spring-security-mvc-boot/src/main/resources/application.properties b/spring-security-mvc-boot/src/main/resources/application.properties
index f015086a4f..25eac743d1 100644
--- a/spring-security-mvc-boot/src/main/resources/application.properties
+++ b/spring-security-mvc-boot/src/main/resources/application.properties
@@ -6,4 +6,7 @@ spring.datasource.password=
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.database=H2
 spring.jpa.show-sql=false
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect
\ No newline at end of file
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect
+
+
+#logging.level.org.springframework.security.web.FilterChainProxy=DEBUG
\ No newline at end of file

From 9108183846362b1e2a5db3fb930f7384115ede3e Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nnhai1991@gmail.com>
Date: Mon, 17 Sep 2018 00:02:36 +0800
Subject: [PATCH 068/114] BAEL-2147 Kotlin Data Class from Json using GSON
 (#5220)

* BAEL-1846: Java Image to Base64 String

* Move from using main method to Junit test

* Update to use environment variables for testing

* reformat and add test file

* spring boot jsp security taglibs

* add more test

* add more test

* refactor spring config

* refactor spring config

* Update README.md

* fi alignment

* fix requested comments

* additional tests and content

* additional tests and content

* update examples

* Delete Readme file

* edit form example

* adding example for spring boot security tag libs

* Remove old tag libs module

* BAEL-2147 Add GsonTest

* BAEL-2147 Remove unused import
---
 .../com/baeldung/kotlin/gson/GsonUnitTest.kt  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
new file mode 100644
index 0000000000..bdf44d3b49
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
@@ -0,0 +1,30 @@
+package com.baeldung.kotlin.gson
+
+import com.google.gson.Gson
+
+import org.junit.Assert
+import org.junit.Test
+
+class GsonUnitTest {
+
+    var gson = Gson()
+
+    @Test
+    fun givenObject_thenGetJSONString() {
+        var jsonString = gson.toJson(TestModel(1,"Test"))
+        Assert.assertEquals(jsonString, "{\"id\":1,\"description\":\"Test\"}")
+    }
+
+    @Test
+    fun givenJSONString_thenGetObject() {
+        var jsonString = "{\"id\":1,\"description\":\"Test\"}";
+        var testModel = gson.fromJson(jsonString, TestModel::class.java)
+        Assert.assertEquals(testModel.id, 1)
+        Assert.assertEquals(testModel.description, "Test")
+    }
+
+    data class TestModel(
+        val id: Int,
+        val description: String
+    )
+}
\ No newline at end of file

From cd242f89d3c304bdc53443d91d59d4d1b96ed7dc Mon Sep 17 00:00:00 2001
From: Predrag Maric <pedja4@users.noreply.github.com>
Date: Sun, 16 Sep 2018 18:05:22 +0200
Subject: [PATCH 069/114] BAEL-2070 Renamed application class (#5266)

---
 ...uration.java => SpringDependenciesExampleApplication.java} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename spring-core/src/main/java/com/baeldung/dependency/exception/app/{CustomConfiguration.java => SpringDependenciesExampleApplication.java} (73%)

diff --git a/spring-core/src/main/java/com/baeldung/dependency/exception/app/CustomConfiguration.java b/spring-core/src/main/java/com/baeldung/dependency/exception/app/SpringDependenciesExampleApplication.java
similarity index 73%
rename from spring-core/src/main/java/com/baeldung/dependency/exception/app/CustomConfiguration.java
rename to spring-core/src/main/java/com/baeldung/dependency/exception/app/SpringDependenciesExampleApplication.java
index 4366cb617a..e45438a9fe 100644
--- a/spring-core/src/main/java/com/baeldung/dependency/exception/app/CustomConfiguration.java
+++ b/spring-core/src/main/java/com/baeldung/dependency/exception/app/SpringDependenciesExampleApplication.java
@@ -6,8 +6,8 @@ import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 @ComponentScan(basePackages = "com.baeldung.dependency.exception")
-public class CustomConfiguration {
+public class SpringDependenciesExampleApplication {
     public static void main(String[] args) {
-        SpringApplication.run(CustomConfiguration.class, args);
+        SpringApplication.run(SpringDependenciesExampleApplication.class, args);
     }
 }

From 237f8ef944d8ac34e71ad2eb0c6280b4c6609072 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 16 Sep 2018 19:56:05 +0300
Subject: [PATCH 070/114] fix spring-jpa start

---
 .../java/org/baeldung/config/PersistenceJPAConfig.java    | 6 +++---
 .../src/main/java/org/baeldung/config/WebInitializer.java | 2 +-
 .../{criteria/repository => dao}/BookRepository.java      | 4 ++--
 .../repository => dao}/BookRepositoryCustom.java          | 4 ++--
 .../{criteria => }/dao/BookRepositoryImpl.java            | 5 ++---
 .../{criteria/repository => dao}/BookService.java         | 8 ++++----
 .../{criteria/repository => dao}/BookSpecifications.java  | 4 ++--
 .../baeldung/persistence/{criteria => }/model/Book.java   | 2 +-
 .../spring-jpa/src/main/resources/persistence.xml         | 2 --
 9 files changed, 17 insertions(+), 20 deletions(-)
 rename persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/{criteria/repository => dao}/BookRepository.java (71%)
 rename persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/{criteria/repository => dao}/BookRepositoryCustom.java (58%)
 rename persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/{criteria => }/dao/BookRepositoryImpl.java (87%)
 rename persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/{criteria/repository => dao}/BookService.java (63%)
 rename persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/{criteria/repository => dao}/BookSpecifications.java (78%)
 rename persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/{criteria => }/model/Book.java (91%)

diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
index 78c4116c67..ec0d4bca3c 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
@@ -78,9 +78,9 @@ public class PersistenceJPAConfig {
         final Properties hibernateProperties = new Properties();
         hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
         hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
-        hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache"));
-        hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache"));
-        // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
+        hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", "false");
+        
+    
         return hibernateProperties;
     }
 
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java
index 1c8ce5400f..cf6e69eb39 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java
@@ -5,7 +5,7 @@ import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatche
 public class WebInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class[] { PersistenceJNDIConfig.class };
+        return new Class[] { PersistenceJPAConfig.class };
     }
 
     @Override
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepository.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepository.java
similarity index 71%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepository.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepository.java
index af30ae461e..114cf48c7c 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepository.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepository.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence.criteria.repository;
+package org.baeldung.persistence.dao;
 
-import org.baeldung.persistence.criteria.model.Book;
+import org.baeldung.persistence.model.Book;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepositoryCustom.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryCustom.java
similarity index 58%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepositoryCustom.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryCustom.java
index 35330cfa3c..b939907572 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookRepositoryCustom.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryCustom.java
@@ -1,8 +1,8 @@
-package org.baeldung.persistence.criteria.repository;
+package org.baeldung.persistence.dao;
 
 import java.util.List;
 
-import org.baeldung.persistence.criteria.model.Book;
+import org.baeldung.persistence.model.Book;
 
 public interface BookRepositoryCustom {
 
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/dao/BookRepositoryImpl.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryImpl.java
similarity index 87%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/dao/BookRepositoryImpl.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryImpl.java
index f782d69e1e..6e9aa998d7 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/dao/BookRepositoryImpl.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookRepositoryImpl.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.criteria.dao;
+package org.baeldung.persistence.dao;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,8 +10,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.baeldung.persistence.criteria.model.Book;
-import org.baeldung.persistence.criteria.repository.BookRepositoryCustom;
+import org.baeldung.persistence.model.Book;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookService.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookService.java
similarity index 63%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookService.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookService.java
index 7b1aff857e..88b769e9bf 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookService.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookService.java
@@ -1,12 +1,12 @@
-package org.baeldung.persistence.criteria.repository;
+package org.baeldung.persistence.dao;
 
-import static org.baeldung.persistence.criteria.repository.BookSpecifications.hasAuthor;
-import static org.baeldung.persistence.criteria.repository.BookSpecifications.titleContains;
+import static org.baeldung.persistence.dao.BookSpecifications.hasAuthor;
+import static org.baeldung.persistence.dao.BookSpecifications.titleContains;
 import static org.springframework.data.jpa.domain.Specifications.where;
 
 import java.util.List;
 
-import org.baeldung.persistence.criteria.model.Book;
+import org.baeldung.persistence.model.Book;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookSpecifications.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookSpecifications.java
similarity index 78%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookSpecifications.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookSpecifications.java
index 392b750977..ed9540060d 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/repository/BookSpecifications.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/BookSpecifications.java
@@ -1,6 +1,6 @@
-package org.baeldung.persistence.criteria.repository;
+package org.baeldung.persistence.dao;
 
-import org.baeldung.persistence.criteria.model.Book;
+import org.baeldung.persistence.model.Book;
 import org.springframework.data.jpa.domain.Specification;
 
 public class BookSpecifications {
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/model/Book.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Book.java
similarity index 91%
rename from persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/model/Book.java
rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Book.java
index beb6c0190c..754bd179d1 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/criteria/model/Book.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Book.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.criteria.model;
+package org.baeldung.persistence.model;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/persistence-modules/spring-jpa/src/main/resources/persistence.xml b/persistence-modules/spring-jpa/src/main/resources/persistence.xml
index 65bad29cdc..6304fa0a65 100644
--- a/persistence-modules/spring-jpa/src/main/resources/persistence.xml
+++ b/persistence-modules/spring-jpa/src/main/resources/persistence.xml
@@ -21,8 +21,6 @@
             <props>
                 <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
                 <prop key="hibernate.dialect">${hibernate.dialect}</prop>
-                <prop key="hibernate.cache.use_second_level_cache">${hibernate.cache.use_second_level_cache}</prop>
-                <prop key="hibernate.cache.use_query_cache">${hibernate.cache.use_query_cache}</prop>
             </props>
         </property>
     </bean>

From 4a84a83597277d5ad3476d6fcc62bb4ff757db12 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 16 Sep 2018 20:38:28 +0300
Subject: [PATCH 071/114] fix surefire parallel config

---
 spring-5/pom.xml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index 9f60b8a364..293edb5bda 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -1,5 +1,6 @@
 <?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"
+<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>
@@ -134,7 +135,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- this surefire configuration allows concurrent execution; do not remove -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <parallel>methods</parallel>
+                    <useUnlimitedThreads>true</useUnlimitedThreads>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*IntTest.java</exclude>
+                        <exclude>**/*LongRunningUnitTest.java</exclude>
+                        <exclude>**/*ManualTest.java</exclude>
+                        <exclude>**/JdbcTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
+
     </build>
 
     <properties>
@@ -142,6 +162,8 @@
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+
     </properties>
 
 </project>

From f7b41ba79c76ec704c03e611f3537c419ea8448d Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 16 Sep 2018 23:45:42 +0530
Subject: [PATCH 072/114] [BAEL-8977] - Added junit to read file into string
 through IOUtils

---
 .../com/baeldung/file/FileOperationsManualTest.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/core-java-io/src/test/java/com/baeldung/file/FileOperationsManualTest.java b/core-java-io/src/test/java/com/baeldung/file/FileOperationsManualTest.java
index 7968967679..6a020f5eae 100644
--- a/core-java-io/src/test/java/com/baeldung/file/FileOperationsManualTest.java
+++ b/core-java-io/src/test/java/com/baeldung/file/FileOperationsManualTest.java
@@ -1,6 +1,7 @@
 package com.baeldung.file;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
 import org.junit.Test;
@@ -120,4 +121,14 @@ public class FileOperationsManualTest {
 
         return resultStringBuilder.toString();
     }
+    
+    @Test
+    public void givenFileName_whenUsingIOUtils_thenFileData() throws IOException {
+        String expectedData = "This is a content of the file";
+
+        FileInputStream fis = new FileInputStream("src/test/resources/fileToRead.txt");
+        String data = IOUtils.toString(fis, "UTF-8");
+        
+        assertEquals(expectedData, data.trim());
+    }
 }
\ No newline at end of file

From c493e00819cf02c52556bdaca2ae95723b09a4a7 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 16 Sep 2018 22:03:38 +0300
Subject: [PATCH 073/114] add mappingstrategy opencsv method

---
 .../opencsv/examples/sync/BeanExamples.java   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java b/libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
index 76d044ca60..086f32677e 100644
--- a/libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
+++ b/libraries/src/main/java/com/baeldung/opencsv/examples/sync/BeanExamples.java
@@ -18,16 +18,19 @@ import java.util.List;
 public class BeanExamples {
 
     public static List<CsvBean> beanBuilderExample(Path path, Class clazz) {
+        ColumnPositionMappingStrategy ms = new ColumnPositionMappingStrategy();
+        return beanBuilderExample(path, clazz, ms);
+    }
+
+    public static List<CsvBean> beanBuilderExample(Path path, Class clazz, MappingStrategy ms) {
         CsvTransfer csvTransfer = new CsvTransfer();
         try {
-            ColumnPositionMappingStrategy ms = new ColumnPositionMappingStrategy();
             ms.setType(clazz);
 
             Reader reader = Files.newBufferedReader(path);
-            CsvToBean cb = new CsvToBeanBuilder(reader)
-                    .withType(clazz)
-                    .withMappingStrategy(ms)
-                    .build();
+            CsvToBean cb = new CsvToBeanBuilder(reader).withType(clazz)
+                .withMappingStrategy(ms)
+                .build();
 
             csvTransfer.setCsvList(cb.parse());
             reader.close();
@@ -40,11 +43,10 @@ public class BeanExamples {
 
     public static String writeCsvFromBean(Path path) {
         try {
-            Writer writer  = new FileWriter(path.toString());
+            Writer writer = new FileWriter(path.toString());
 
-            StatefulBeanToCsv sbc = new StatefulBeanToCsvBuilder(writer)
-                    .withSeparator(CSVWriter.DEFAULT_SEPARATOR)
-                    .build();
+            StatefulBeanToCsv sbc = new StatefulBeanToCsvBuilder(writer).withSeparator(CSVWriter.DEFAULT_SEPARATOR)
+                .build();
 
             List<CsvBean> list = new ArrayList<>();
             list.add(new WriteExampleBean("Test1", "sfdsf", "fdfd"));

From 05bb91ffe9faead799621217c6977bdc7ab329f2 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Sun, 16 Sep 2018 22:59:43 +0300
Subject: [PATCH 074/114] minor fix

---
 .../main/java/org/baeldung/ip/web/MainController.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
index 8996a698d6..f90c64a031 100644
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
@@ -23,14 +23,18 @@ public class MainController {
     @Qualifier("springSecurityFilterChain")
     private Filter springSecurityFilterChain;
 
-    @RequestMapping(method = RequestMethod.GET, value = "/foos/{id}")
+    @RequestMapping(method = RequestMethod.GET, value = "/filters")
     @ResponseBody
-    public Foo findById(@PathVariable final long id, HttpServletRequest request) {
+    public void getFilters() {
         FilterChainProxy filterChainProxy = (FilterChainProxy) springSecurityFilterChain;
         List<SecurityFilterChain> list = filterChainProxy.getFilterChains();
         list.forEach(chain -> chain.getFilters()
             .forEach(filter -> System.out.println(filter.getClass())));
-
+    }
+    
+    @RequestMapping(method = RequestMethod.GET, value = "/foos/{id}")
+    @ResponseBody
+    public Foo findById(@PathVariable final long id, HttpServletRequest request) {
         return new Foo("Sample");
     }
 

From 6391285dd231cde7eea20ddd156adca870841ad4 Mon Sep 17 00:00:00 2001
From: Satyam <tyagi.satyam04@gmail.com>
Date: Mon, 17 Sep 2018 02:10:06 +0530
Subject: [PATCH 075/114] Added Math.ceil method to round up.

---
 .../src/com/java/src/RoundUpToHundred.java    | 22 +++++++++----------
 .../com/java/src/RoundUpToHundredTest.java    | 20 +++++++----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
index fe3868570c..3536b6a633 100644
--- a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
+++ b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
@@ -4,19 +4,17 @@ import java.util.Scanner;
 
 public class RoundUpToHundred {
 
-	public static void main(String[] args) {
+    public static void main(String[] args) {
+        Scanner scanner = new Scanner(System.in);
+        double input = scanner.nextDouble();
+        scanner.close();
 
-		Scanner scanner = new Scanner(System.in);
-		double input = scanner.nextDouble();
-		scanner.close();
+        RoundUpToHundred.round(input);
+    }
 
-		RoundUpToHundred.round(input);
-	}
-
-	static int round(double input) {
-
-		int i = (int) Math.round(input);
-		return ((i + 99) / 100) * 100;
-	};
+    static int round(double input) {
+        int i = (int) Math.ceil(input);
+        return ((i + 99) / 100) * 100;
+    };
 
 }
diff --git a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java
index 457e762e09..a13aa1f8cc 100644
--- a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java
+++ b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java
@@ -2,17 +2,13 @@ package com.java.src;
 
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Test;
+
 public class RoundUpToHundredTest {
-	public void roundupTest() {
-
-		assertEquals("Rounded up to hundred", 100, 
-				RoundUpToHundred.round(99));
-
-		assertEquals("Rounded down to two hundred ", 200,
-				RoundUpToHundred.round(200.2));
-
-		assertEquals("Returns same rounded value", 300,
-				RoundUpToHundred.round(300));
-
-	}
+    @Test
+    public void givenInput_whenRoundedUp_thenTrue() {
+        assertEquals("Rounded up to hundred", 100, RoundUpToHundred.round(99));
+        assertEquals("Rounded up to three hundred ", 300, RoundUpToHundred.round(200.2));
+        assertEquals("Returns same rounded value", 400, RoundUpToHundred.round(400));
+    }
 }

From 14b6193fff46d3527365f8f1ca2fefe98ebdd5eb Mon Sep 17 00:00:00 2001
From: Satyam <tyagi.satyam04@gmail.com>
Date: Mon, 17 Sep 2018 19:02:35 +0530
Subject: [PATCH 076/114] Changed return type of static method to long

---
 .../roundUpToHundred/src/com/java/src/RoundUpToHundred.java   | 4 ++--
 .../src/com/java/src/RoundUpToHundredTest.java                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
index 3536b6a633..f1e8c6b653 100644
--- a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
+++ b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
@@ -12,8 +12,8 @@ public class RoundUpToHundred {
         RoundUpToHundred.round(input);
     }
 
-    static int round(double input) {
-        int i = (int) Math.ceil(input);
+    static long round(double input) {
+        long i = (int) Math.ceil(input);
         return ((i + 99) / 100) * 100;
     };
 
diff --git a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java
index a13aa1f8cc..f35a9a249f 100644
--- a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java
+++ b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 
 public class RoundUpToHundredTest {
     @Test
-    public void givenInput_whenRoundedUp_thenTrue() {
+    public void givenInput_whenRound_thenRoundUpToTheNearestHundred() {
         assertEquals("Rounded up to hundred", 100, RoundUpToHundred.round(99));
         assertEquals("Rounded up to three hundred ", 300, RoundUpToHundred.round(200.2));
         assertEquals("Returns same rounded value", 400, RoundUpToHundred.round(400));

From a48f3851763c5aef7958ecd15d66e8ce607e6720 Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Mon, 17 Sep 2018 18:13:09 +0200
Subject: [PATCH 077/114] File creation for dump changed

---
 core-java/src/main/java/com/baeldung/heapdump/HeapDump.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core-java/src/main/java/com/baeldung/heapdump/HeapDump.java b/core-java/src/main/java/com/baeldung/heapdump/HeapDump.java
index 1619bc43ae..8cce20de8d 100644
--- a/core-java/src/main/java/com/baeldung/heapdump/HeapDump.java
+++ b/core-java/src/main/java/com/baeldung/heapdump/HeapDump.java
@@ -3,8 +3,10 @@ package com.baeldung.heapdump;
 import com.sun.management.HotSpotDiagnosticMXBean;
 
 import javax.management.MBeanServer;
+
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
+import java.nio.file.Paths;
 
 public class HeapDump {
 
@@ -16,7 +18,7 @@ public class HeapDump {
     }
 
     public static void main(String[] args) throws IOException {
-        final String file = "/tmp/dump.hprof";
+        String file = Paths.get("dump.hprof").toFile().getPath();
 
         dumpHeap(file, true);
     }

From 845564612507d91fd69c04cb01115d3cbd65ffc4 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Mon, 17 Sep 2018 22:15:58 +0200
Subject: [PATCH 078/114] Rename CoroutinesTest.kt to CoroutinesUnitTest.kt
 (#5281)

---
 .../baeldung/kotlin/{CoroutinesTest.kt => CoroutinesUnitTest.kt}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core-kotlin/src/test/kotlin/com/baeldung/kotlin/{CoroutinesTest.kt => CoroutinesUnitTest.kt} (100%)

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesUnitTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesUnitTest.kt

From e9e971d38441d4f216dbf2e0747d3a680d192d75 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Mon, 17 Sep 2018 23:47:09 +0300
Subject: [PATCH 079/114] fix nested loop

---
 .../src/main/java/org/baeldung/ip/web/MainController.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
index f90c64a031..940194c421 100644
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
@@ -28,8 +28,9 @@ public class MainController {
     public void getFilters() {
         FilterChainProxy filterChainProxy = (FilterChainProxy) springSecurityFilterChain;
         List<SecurityFilterChain> list = filterChainProxy.getFilterChains();
-        list.forEach(chain -> chain.getFilters()
-            .forEach(filter -> System.out.println(filter.getClass())));
+        list.stream()
+              .flatMap(chain -> chain.getFilters().stream())
+              .forEach(filter -> System.out.println(filter.getClass()));
     }
     
     @RequestMapping(method = RequestMethod.GET, value = "/foos/{id}")

From 400f2ce8dcacfb847681c149498836b16f981244 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Tue, 18 Sep 2018 06:45:23 +0530
Subject: [PATCH 080/114] BAEL-8958 Fix surefire configs of activejdbc,
 apache-shiro, asm, cas-secured-app, cas-server and core-java-io project

- Fixed surefire configs and general pom standardization
---
 activejdbc/pom.xml                            | 47 +--------------
 .../java/com/baeldung/model/Employee.java     |  4 ++
 .../main/java/com/baeldung/model/Role.java    |  4 ++
 ...Test.java => ActiveJDBCAppManualTest.java} |  2 +-
 apache-shiro/pom.xml                          | 20 -------
 asm/pom.xml                                   |  8 ---
 cas/cas-secured-app/pom.xml                   | 10 +---
 cas/cas-server/pom.xml                        | 47 +++------------
 core-java-io/pom.xml                          | 60 -------------------
 ...est.java => SymLinkExampleManualTest.java} |  2 +-
 pom.xml                                       |  4 +-
 11 files changed, 22 insertions(+), 186 deletions(-)
 rename activejdbc/src/test/java/com/baeldung/{ActiveJDBCAppTest.java => ActiveJDBCAppManualTest.java} (97%)
 rename core-java-io/src/test/java/com/baeldung/symlink/{SymLinkExampleUnitTest.java => SymLinkExampleManualTest.java} (96%)

diff --git a/activejdbc/pom.xml b/activejdbc/pom.xml
index 0c8047f10b..542e674ff3 100644
--- a/activejdbc/pom.xml
+++ b/activejdbc/pom.xml
@@ -1,7 +1,6 @@
 <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>activejdbc</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -79,55 +78,11 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <reportFormat>brief</reportFormat>
-                    <trimStackTrace>true</trimStackTrace>
-                    <useFile>false</useFile>
-                    <includes>
-                        <include>**/*Spec*.java</include>
-                        <include>**/*Test*.java</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/helpers/*</exclude>
-                        <exclude>**/*$*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>snapshots1</id>
-            <name>JavaLite Snapshots1</name>
-            <url>http://repo.javalite.io/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>warn</checksumPolicy>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>snapshots2</id>
-            <name>JavaLite Snapshots2</name>
-            <url>http://repo.javalite.io/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>warn</checksumPolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
-        <activejdbc.version>1.4.13</activejdbc.version>
+        <activejdbc.version>2.0</activejdbc.version>
         <environments>development.test,development</environments>
         <mysql.connector.version>5.1.34</mysql.connector.version>
     </properties>
diff --git a/activejdbc/src/main/java/com/baeldung/model/Employee.java b/activejdbc/src/main/java/com/baeldung/model/Employee.java
index b7fa8aaf1f..e6e9be2aac 100644
--- a/activejdbc/src/main/java/com/baeldung/model/Employee.java
+++ b/activejdbc/src/main/java/com/baeldung/model/Employee.java
@@ -16,4 +16,8 @@ public class Employee extends Model {
         set("created_by",createdBy);
     }
 
+    public String getLastName() {
+        return getString("last_name");
+    }
+
 }
diff --git a/activejdbc/src/main/java/com/baeldung/model/Role.java b/activejdbc/src/main/java/com/baeldung/model/Role.java
index 3f425dbe6b..bbd5a7d169 100644
--- a/activejdbc/src/main/java/com/baeldung/model/Role.java
+++ b/activejdbc/src/main/java/com/baeldung/model/Role.java
@@ -15,4 +15,8 @@ public class Role extends Model {
         set("role_name",role);
         set("created_by",createdBy);
     }
+
+    public String getRoleName() {
+        return getString("role_name");
+    }
 }
diff --git a/activejdbc/src/test/java/com/baeldung/ActiveJDBCAppTest.java b/activejdbc/src/test/java/com/baeldung/ActiveJDBCAppManualTest.java
similarity index 97%
rename from activejdbc/src/test/java/com/baeldung/ActiveJDBCAppTest.java
rename to activejdbc/src/test/java/com/baeldung/ActiveJDBCAppManualTest.java
index 316dc34712..22eb87f930 100644
--- a/activejdbc/src/test/java/com/baeldung/ActiveJDBCAppTest.java
+++ b/activejdbc/src/test/java/com/baeldung/ActiveJDBCAppManualTest.java
@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import java.util.List;
 
-public class ActiveJDBCAppTest extends DBSpec
+public class ActiveJDBCAppManualTest extends DBSpec
 {
     @Test
     public void ifEmployeeCreated_thenIsValid() {
diff --git a/apache-shiro/pom.xml b/apache-shiro/pom.xml
index 3a72804ab1..98d9563284 100644
--- a/apache-shiro/pom.xml
+++ b/apache-shiro/pom.xml
@@ -3,7 +3,6 @@
          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-shiro</artifactId>
     <version>1.0-SNAPSHOT</version>
 
@@ -36,13 +35,11 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>${slf4j-version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j-version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -53,26 +50,9 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <apache-shiro-core-version>1.4.0</apache-shiro-core-version>
-        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
-        <java.version>1.8</java.version>
         <log4j-version>1.2.17</log4j-version>
-        <slf4j-version>1.7.25</slf4j-version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/asm/pom.xml b/asm/pom.xml
index 7bbaa2a8f1..5aad2a0e37 100644
--- a/asm/pom.xml
+++ b/asm/pom.xml
@@ -42,14 +42,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <argLine>-javaagent:"C:\asm-1.0.jar"</argLine>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/cas/cas-secured-app/pom.xml b/cas/cas-secured-app/pom.xml
index 22d1522fbe..2291da9084 100644
--- a/cas/cas-secured-app/pom.xml
+++ b/cas/cas-secured-app/pom.xml
@@ -2,12 +2,10 @@
 <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>cas-secured-app</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>cas-secured-app</name>
-    <description>Demo project for Spring Boot</description>
+    <description>Demo project for CAS</description>
 
     <parent>
         <artifactId>parent-boot-1</artifactId>
@@ -60,10 +58,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
 </project>
diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
index a15b4b58d5..9a8c3e47e2 100644
--- a/cas/cas-server/pom.xml
+++ b/cas/cas-server/pom.xml
@@ -2,11 +2,17 @@
 <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>cas-server</artifactId>
     <packaging>war</packaging>
     <version>1.0</version>
 
+    <parent>
+        <artifactId>parent-boot-1</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-1</relativePath>
+    </parent>
+    
     <dependencies>
         <dependency>
             <groupId>org.apereo.cas</groupId>
@@ -39,7 +45,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${springboot.version}</version>
                 <configuration>
                     <mainClass>${mainClassName}</mainClass>
                     <addResources>true</addResources>
@@ -74,42 +79,10 @@
                     </overlays>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-            </plugin>
         </plugins>
         <finalName>cas</finalName>
     </build>
 
-    <repositories>
-        <repository>
-            <id>sonatype-releases</id>
-            <url>http://oss.sonatype.org/content/repositories/releases/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>shibboleth-releases</id>
-            <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
-        </repository>
-    </repositories>
-
     <profiles>
         <profile>
             <activation>
@@ -214,8 +187,7 @@
     </profiles>
 
     <properties>
-        <cas.version>5.3.0-SNAPSHOT</cas.version>
-        <springboot.version>1.5.13.RELEASE</springboot.version>
+        <cas.version>5.3.3</cas.version>
         <!-- app.server could be -jetty, -undertow, -tomcat, or blank if you plan to provide appserver -->
         <app.server>-tomcat</app.server>
 
@@ -223,9 +195,6 @@
         <isExecutable>false</isExecutable>
         <manifestFileToUse>${project.build.directory}/war/work/org.apereo.cas/cas-server-webapp${app.server}/META-INF/MANIFEST.MF</manifestFileToUse>
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <wrapper-maven-plugin.version>0.0.4</wrapper-maven-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
diff --git a/core-java-io/pom.xml b/core-java-io/pom.xml
index bc71fb8838..cf3e950cb8 100644
--- a/core-java-io/pom.xml
+++ b/core-java-io/pom.xml
@@ -1,7 +1,6 @@
 <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>core-java-io</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -166,36 +165,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*LiveTest.java</exclude>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LongRunningUnitTest.java</exclude>
-                        <exclude>**/*ManualTest.java</exclude>
-                    </excludes>
-                    <testFailureIgnore>true</testFailureIgnore>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>spring-boot</classifier>
-                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -229,32 +198,6 @@
             <id>integration</id>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ManualTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*IntegrationTest.java</include>
-                                        <include>**/*IntTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
@@ -310,14 +253,11 @@
         <avaitility.version>1.7.0</avaitility.version>
 
         <!-- maven plugins -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <hsqldb.version>2.4.0</hsqldb.version>
         <esapi.version>2.1.0.1</esapi.version>
         <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
         <async-http-client.version>2.4.5</async-http-client.version>
-        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleUnitTest.java b/core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleManualTest.java
similarity index 96%
rename from core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleUnitTest.java
rename to core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleManualTest.java
index 803d8881b4..caa7049475 100644
--- a/core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleUnitTest.java
+++ b/core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleManualTest.java
@@ -9,7 +9,7 @@ import java.nio.file.Paths;
 
 import org.junit.Test;
 
-public class SymLinkExampleUnitTest {
+public class SymLinkExampleManualTest {
 
     @Test
     public void whenUsingFiles_thenCreateSymbolicLink() throws IOException {
diff --git a/pom.xml b/pom.xml
index 66293fe31b..c16d150b39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -606,7 +606,7 @@
 				<module>jta</module>
 				<!--<module>java-dates</module> --> <!-- Commented because we have still not upgraded to java 9 -->
 				<module>java-websocket</module>
-				<!-- <module>activejdbc</module> --><!-- PMD voilation -->
+				<module>activejdbc</module>
 				<!-- <module>animal-sniffer-mvn-plugin</module> --><!-- PMD voilation -->
 				<!-- <module>apache-avro</module> --><!-- Malformed POM -->
 				<module>apache-bval</module>
@@ -655,7 +655,7 @@
 				<module>wicket</module>
 				<module>xstream</module>
 				<module>cas/cas-secured-app</module>
-				<!-- <module>cas/cas-server</module> --><!-- Takes too much time -->
+				<module>cas/cas-server</module>
 				<!-- <module>graphql/graphql-java</module> --><!-- Wrong parent -->
 				<!-- <module>guest/deep-jsf</module> --><!-- guest post on different site -->
 				<!-- <module>guest/junit5-example</module> --><!-- guest post on different site - Compilation failure -->

From e8786d2a8545450fb7bbc567cd18e1242f83e10d Mon Sep 17 00:00:00 2001
From: eric-martin <emart.tigers@gmail.com>
Date: Mon, 17 Sep 2018 21:37:09 -0500
Subject: [PATCH 081/114] New libraries-security module

---
 libraries-security/.gitignore | 14 ++++++++++++++
 libraries-security/pom.xml    | 30 ++++++++++++++++++++++++++++++
 pom.xml                       |  1 +
 3 files changed, 45 insertions(+)
 create mode 100644 libraries-security/.gitignore
 create mode 100644 libraries-security/pom.xml

diff --git a/libraries-security/.gitignore b/libraries-security/.gitignore
new file mode 100644
index 0000000000..71881ad3ca
--- /dev/null
+++ b/libraries-security/.gitignore
@@ -0,0 +1,14 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
+/bin/
diff --git a/libraries-security/pom.xml b/libraries-security/pom.xml
new file mode 100644
index 0000000000..8f8506172f
--- /dev/null
+++ b/libraries-security/pom.xml
@@ -0,0 +1,30 @@
+<?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>
+    <artifactId>libraries-security</artifactId>
+    <name>libraries-security</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <properties>
+        <junit.version>4.12</junit.version>
+    </properties>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 66293fe31b..bd06bdfdaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -408,6 +408,7 @@
 				<!-- <module>jws</module> --><!-- POM jar version repo download failure -->
 				<module>libraries</module>
 				<module>libraries-data</module>
+				<module>libraries-security</module>
 				<module>libraries-server</module>
 				<module>linkrest</module>
 				<module>logging-modules/log-mdc</module>

From 38af85f7730315a41e204d65e7357c38395854c1 Mon Sep 17 00:00:00 2001
From: Eric Martin <emart_tigers@yahoo.com>
Date: Mon, 17 Sep 2018 21:55:14 -0500
Subject: [PATCH 082/114] Update RoundUpToHundred.java

---
 .../roundUpToHundred/src/com/java/src/RoundUpToHundred.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
index f1e8c6b653..f5024c227d 100644
--- a/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
+++ b/algorithms/roundUpToHundred/src/com/java/src/RoundUpToHundred.java
@@ -13,7 +13,7 @@ public class RoundUpToHundred {
     }
 
     static long round(double input) {
-        long i = (int) Math.ceil(input);
+        long i = (long) Math.ceil(input);
         return ((i + 99) / 100) * 100;
     };
 

From 87c568052efdf650c4bbcabde1982a60ffee0860 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Tue, 18 Sep 2018 21:16:26 +0530
Subject: [PATCH 083/114] BAEL-8961 Fix surefire configs of spring-4,
 jasyptdemo, spring-boot logging and mvc, auth projects

- Test classes renaming as per standards
- Surefire config fixes, pom standardization
- Added packaging pom at spring-cloud-security module
---
 ....java => CustomJasyptIntegrationTest.java} |  2 +-
 ....java => JasyptSimpleIntegrationTest.java} |  2 +-
 ... => JasyptWithStarterIntegrationTest.java} |  2 +-
 spring-cloud/pom.xml                          |  1 +
 spring-cloud/spring-cloud-security/README.md  | 29 -------------------
 .../spring-cloud-security/auth-client/pom.xml | 14 +++------
 ...va => Springoath2ApplicationUnitTest.java} |  2 +-
 .../auth-resource/pom.xml                     | 14 +++------
 ... => PersonserviceApplicationUnitTest.java} |  2 +-
 .../spring-cloud-security/auth-server/pom.xml | 10 +++----
 spring-cloud/spring-cloud-security/pom.xml    | 23 +++++++++++++++
 11 files changed, 41 insertions(+), 60 deletions(-)
 rename spring-boot-jasypt/src/test/java/com/baeldung/jasypt/{CustomJasyptTest.java => CustomJasyptIntegrationTest.java} (94%)
 rename spring-boot-jasypt/src/test/java/com/baeldung/jasypt/{JasyptSimpleTest.java => JasyptSimpleIntegrationTest.java} (95%)
 rename spring-boot-jasypt/src/test/java/com/baeldung/jasypt/{JasyptWithStarterTest.java => JasyptWithStarterIntegrationTest.java} (95%)
 delete mode 100644 spring-cloud/spring-cloud-security/README.md
 rename spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/{Springoath2ApplicationTests.java => Springoath2ApplicationUnitTest.java} (88%)
 rename spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/{PersonserviceApplicationTests.java => PersonserviceApplicationUnitTest.java} (87%)
 create mode 100644 spring-cloud/spring-cloud-security/pom.xml

diff --git a/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/CustomJasyptTest.java b/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/CustomJasyptIntegrationTest.java
similarity index 94%
rename from spring-boot-jasypt/src/test/java/com/baeldung/jasypt/CustomJasyptTest.java
rename to spring-boot-jasypt/src/test/java/com/baeldung/jasypt/CustomJasyptIntegrationTest.java
index 58c2dc7bb2..c24cfe6efa 100644
--- a/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/CustomJasyptTest.java
+++ b/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/CustomJasyptIntegrationTest.java
@@ -14,7 +14,7 @@ import com.baeldung.jasypt.Main;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {Main.class})
-public class CustomJasyptTest {
+public class CustomJasyptIntegrationTest {
 
     @Autowired
     ApplicationContext appCtx;
diff --git a/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptSimpleTest.java b/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptSimpleIntegrationTest.java
similarity index 95%
rename from spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptSimpleTest.java
rename to spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptSimpleIntegrationTest.java
index f9b66b5044..e8dda73b4a 100644
--- a/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptSimpleTest.java
+++ b/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptSimpleIntegrationTest.java
@@ -13,7 +13,7 @@ import com.baeldung.jasypt.simple.PropertyServiceForJasyptSimple;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class JasyptSimpleTest {
+public class JasyptSimpleIntegrationTest {
 
     @Autowired
     ApplicationContext appCtx;
diff --git a/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptWithStarterTest.java b/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptWithStarterIntegrationTest.java
similarity index 95%
rename from spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptWithStarterTest.java
rename to spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptWithStarterIntegrationTest.java
index d246c21036..5f5d409ab9 100644
--- a/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptWithStarterTest.java
+++ b/spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptWithStarterIntegrationTest.java
@@ -14,7 +14,7 @@ import com.baeldung.jasypt.starter.PropertyServiceForJasyptStarter;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class JasyptWithStarterTest {
+public class JasyptWithStarterIntegrationTest {
 
     @Autowired
     ApplicationContext appCtx;
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 376d8099ed..d0095e9a8a 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -35,6 +35,7 @@
         <module>spring-cloud-archaius</module>
         <module>spring-cloud-functions</module>        
         <module>spring-cloud-vault</module>
+		<module>spring-cloud-security</module>
     </modules>
 
     <build>
diff --git a/spring-cloud/spring-cloud-security/README.md b/spring-cloud/spring-cloud-security/README.md
deleted file mode 100644
index 39af52c077..0000000000
--- a/spring-cloud/spring-cloud-security/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# README #
-
-This README would normally document whatever steps are necessary to get your application up and running.
-
-### What is this repository for? ###
-
-* Quick summary
-* Version
-* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-
-### How do I get set up? ###
-
-* Summary of set up
-* Configuration
-* Dependencies
-* Database configuration
-* How to run tests
-* Deployment instructions
-
-### Contribution guidelines ###
-
-* Writing tests
-* Code review
-* Other guidelines
-
-### Who do I talk to? ###
-
-* Repo owner or admin
-* Other community or team contact
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-security/auth-client/pom.xml b/spring-cloud/spring-cloud-security/auth-client/pom.xml
index f2d6308374..340c276c2d 100644
--- a/spring-cloud/spring-cloud-security/auth-client/pom.xml
+++ b/spring-cloud/spring-cloud-security/auth-client/pom.xml
@@ -2,18 +2,15 @@
 <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>auth-client</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>auth-client</name>
-    <description>Demo project for Spring Boot</description>
-
+	<description>Spring Cloud Security APP Client Module</description>
+	
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>spring-cloud-security</artifactId>
         <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-1</relativePath>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -88,9 +85,6 @@
     </dependencyManagement>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <js-cookie.version>2.1.0</js-cookie.version>
         <spring-cloud.version>Dalston.SR4</spring-cloud.version>
     </properties>
diff --git a/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java b/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationUnitTest.java
similarity index 88%
rename from spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java
rename to spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationUnitTest.java
index ca89575ee0..b112146dca 100644
--- a/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java
+++ b/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationUnitTest.java
@@ -9,7 +9,7 @@ import com.baeldung.CloudSite;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = CloudSite.class)
-public class Springoath2ApplicationTests {
+public class Springoath2ApplicationUnitTest {
 
 	@Test
 	public void contextLoads() {
diff --git a/spring-cloud/spring-cloud-security/auth-resource/pom.xml b/spring-cloud/spring-cloud-security/auth-resource/pom.xml
index 0115259108..09474b2a4d 100644
--- a/spring-cloud/spring-cloud-security/auth-resource/pom.xml
+++ b/spring-cloud/spring-cloud-security/auth-resource/pom.xml
@@ -3,21 +3,18 @@
          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>auth-resource</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>auth-resource</name>
-    <description>Demo project for Spring Boot</description>
+    <description>Spring Cloud Security APP Resource Module</description>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>spring-cloud-security</artifactId>
         <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-1</relativePath>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
-
+    
     <dependencies>
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
@@ -60,9 +57,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <spring-cloud.version>Edgware.RELEASE</spring-cloud.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java b/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationUnitTest.java
similarity index 87%
rename from spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java
rename to spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationUnitTest.java
index e0fe7006d9..fb078d5c7c 100644
--- a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java
+++ b/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationUnitTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class PersonserviceApplicationTests {
+public class PersonserviceApplicationUnitTest {
 
     @Test
     public void contextLoads() {
diff --git a/spring-cloud/spring-cloud-security/auth-server/pom.xml b/spring-cloud/spring-cloud-security/auth-server/pom.xml
index b4367935e3..92f92808f6 100644
--- a/spring-cloud/spring-cloud-security/auth-server/pom.xml
+++ b/spring-cloud/spring-cloud-security/auth-server/pom.xml
@@ -2,15 +2,13 @@
 <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>auth-server</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-
+    <description>Spring Cloud Security APP Server Module</description>
+	
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>spring-cloud-security</artifactId>
         <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-1</relativePath>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/spring-cloud/spring-cloud-security/pom.xml b/spring-cloud/spring-cloud-security/pom.xml
new file mode 100644
index 0000000000..1cf8751548
--- /dev/null
+++ b/spring-cloud/spring-cloud-security/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+    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>spring-cloud-security</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>spring-cloud-security</name>
+
+   <parent>
+        <artifactId>parent-boot-1</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-1</relativePath>
+    </parent>
+    
+    <modules>
+        <module>auth-client</module>
+		<module>auth-resource</module>
+		<module>auth-server</module>
+    </modules>
+
+</project>

From f40d235afa4d9b634fac41decd9cad9d8ccedb1a Mon Sep 17 00:00:00 2001
From: Nikhil Khatwani <nkhatwani85@gmail.com>
Date: Tue, 18 Sep 2018 22:24:23 +0530
Subject: [PATCH 084/114] Changes for BAEL-2214

---
 spring-security-rest/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml
index 5bde78db7e..57ce5ddb92 100644
--- a/spring-security-rest/pom.xml
+++ b/spring-security-rest/pom.xml
@@ -300,7 +300,7 @@
         <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- swagger -->
-        <springfox-swagger.version>2.7.0</springfox-swagger.version>
+        <springfox-swagger.version>2.9.2</springfox-swagger.version>
 
         <!-- Maven plugins -->
         <maven-war-plugin.version>2.6</maven-war-plugin.version>

From 04929e41d8b1f3c2173f3885aa96105599819b79 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Wed, 19 Sep 2018 08:59:29 +0530
Subject: [PATCH 085/114] Update pom.xml

---
 cas/cas-server/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
index 9a8c3e47e2..9b61aaec3d 100644
--- a/cas/cas-server/pom.xml
+++ b/cas/cas-server/pom.xml
@@ -198,8 +198,9 @@
         <wrapper-maven-plugin.version>0.0.4</wrapper-maven-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        
         <echo-maven-plugin.version>0.3.0</echo-maven-plugin.version>
         <pgpverify-maven-plugin.version>1.1.0</pgpverify-maven-plugin.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>

From c67e8e817c74b3a03e5e7be894e346437d7b1d47 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Wed, 19 Sep 2018 09:03:00 +0530
Subject: [PATCH 086/114] BAEL-8961 Fix surefire configs of spring-4,
 jasyptdemo, spring-boot logging and mvc, auth projects

- Renamed spring-cloud-security tests to *IntegrationTest as contextLoad was tested in these tests.
---
 ...UnitTest.java => Springoath2ApplicationIntegrationTest.java} | 2 +-
 ...itTest.java => PersonserviceApplicationIntegrationTest.java} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/{Springoath2ApplicationUnitTest.java => Springoath2ApplicationIntegrationTest.java} (87%)
 rename spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/{PersonserviceApplicationUnitTest.java => PersonserviceApplicationIntegrationTest.java} (85%)

diff --git a/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationUnitTest.java b/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationIntegrationTest.java
similarity index 87%
rename from spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationUnitTest.java
rename to spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationIntegrationTest.java
index b112146dca..37cff095db 100644
--- a/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationUnitTest.java
+++ b/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationIntegrationTest.java
@@ -9,7 +9,7 @@ import com.baeldung.CloudSite;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = CloudSite.class)
-public class Springoath2ApplicationUnitTest {
+public class Springoath2ApplicationIntegrationTest {
 
 	@Test
 	public void contextLoads() {
diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationUnitTest.java b/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java
similarity index 85%
rename from spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationUnitTest.java
rename to spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java
index fb078d5c7c..3caa06ba4d 100644
--- a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationUnitTest.java
+++ b/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class PersonserviceApplicationUnitTest {
+public class PersonserviceApplicationIntegrationTest {
 
     @Test
     public void contextLoads() {

From 4be74d00d11cc976d2f58c56ff571152a516f892 Mon Sep 17 00:00:00 2001
From: RanjeetKaur17 <ranjeet@algorythma.com>
Date: Wed, 19 Sep 2018 10:38:11 +0400
Subject: [PATCH 087/114] Changes to directly create ZoneOffset using offset
 value rather using ZoneRules.

---
 .../baeldung/zoneddatetime/OffsetDateTimeExample.java |  8 ++------
 .../com/baeldung/zoneddatetime/OffsetTimeExample.java |  9 ++-------
 .../zoneddatetime/OffsetDateTimeExampleUnitTest.java  | 11 ++++-------
 .../zoneddatetime/OffsetTimeExampleUnitTest.java      | 11 ++++-------
 .../zoneddatetime/ZoneDateTimeExampleUnitTest.java    |  7 +++++--
 5 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
index a22de0db18..fb92eb8d0d 100644
--- a/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
+++ b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java
@@ -1,16 +1,12 @@
 package com.baeldung.zoneddatetime;
 
-import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 
 public class OffsetDateTimeExample {
 
-    public OffsetDateTime getCurrentTimeByZoneOffset(String region) {
-        LocalDateTime now = LocalDateTime.now();
-        ZoneId zone = ZoneId.of(region);
-        ZoneOffset zoneOffSet= zone.getRules().getOffset(now);
+    public OffsetDateTime getCurrentTimeByZoneOffset(String offset) {
+        ZoneOffset zoneOffSet= ZoneOffset.of(offset);
         OffsetDateTime date = OffsetDateTime.now(zoneOffSet);
         return date;
     }
diff --git a/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
index 7d926c0562..58e2d4d5ad 100644
--- a/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
+++ b/core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java
@@ -1,17 +1,12 @@
 package com.baeldung.zoneddatetime;
 
-import java.time.LocalDateTime;
 import java.time.OffsetTime;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 
 public class OffsetTimeExample {
 
-    public OffsetTime getCurrentTimeByZoneOffset(String region) {
-        LocalDateTime now = LocalDateTime.now();
-        ZoneId zone = ZoneId.of(region);
-        ZoneOffset zoneOffSet = zone.getRules()
-            .getOffset(now);
+    public OffsetTime getCurrentTimeByZoneOffset(String offset) {
+        ZoneOffset zoneOffSet = ZoneOffset.of(offset);
         OffsetTime time = OffsetTime.now(zoneOffSet);
         return time;
     }
diff --git a/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
index c60f6967f9..a08d3737cd 100644
--- a/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java
@@ -2,9 +2,8 @@ package com.baeldung.zoneddatetime;
 
 import static org.junit.Assert.assertTrue;
 
-import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
-import java.time.ZoneId;
+import java.time.ZoneOffset;
 
 import org.junit.Test;
 
@@ -14,12 +13,10 @@ public class OffsetDateTimeExampleUnitTest {
 
     @Test
     public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
-        String zone = "Europe/Berlin";
-        OffsetDateTime time = offsetDateTimeExample.getCurrentTimeByZoneOffset(zone);   
+        String offset = "+02:00";
+        OffsetDateTime time = offsetDateTimeExample.getCurrentTimeByZoneOffset(offset);
 
         assertTrue(time.getOffset()
-            .equals(ZoneId.of(zone)
-                .getRules()
-                .getOffset(LocalDateTime.now())));
+            .equals(ZoneOffset.of(offset)));
     }
 }
diff --git a/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
index 0e1206dc5b..488f934179 100644
--- a/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java
@@ -2,9 +2,8 @@ package com.baeldung.zoneddatetime;
 
 import static org.junit.Assert.assertTrue;
 
-import java.time.LocalDateTime;
 import java.time.OffsetTime;
-import java.time.ZoneId;
+import java.time.ZoneOffset;
 
 import org.junit.Test;
 
@@ -14,12 +13,10 @@ public class OffsetTimeExampleUnitTest {
 
     @Test
     public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
-        String zone = "Europe/Berlin";
-        OffsetTime time = offsetTimeExample.getCurrentTimeByZoneOffset(zone);   
+        String offset = "+02:00";
+        OffsetTime time = offsetTimeExample.getCurrentTimeByZoneOffset(offset);
 
         assertTrue(time.getOffset()
-            .equals(ZoneId.of(zone)
-                .getRules()
-                .getOffset(LocalDateTime.now())));
+            .equals(ZoneOffset.of(offset)));
     }
 }
diff --git a/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java b/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java
index 7f4f9cd17c..e78ff3e3fd 100644
--- a/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java
@@ -15,16 +15,19 @@ public class ZoneDateTimeExampleUnitTest {
     public void givenZone_whenGetCurrentTime_thenResultHasZone() {
         String zone = "Europe/Berlin";
         ZonedDateTime time = zoneDateTimeExample.getCurrentTimeByZoneId(zone);
+
         assertTrue(time.getZone()
             .equals(ZoneId.of(zone)));
     }
-    
+
     @Test
     public void givenZones_whenConvertDateByZone_thenGetConstantDiff() {
         String sourceZone = "Europe/Berlin";
         String destZone = "Asia/Tokyo";
         ZonedDateTime sourceDate = zoneDateTimeExample.getCurrentTimeByZoneId(sourceZone);
         ZonedDateTime destDate = zoneDateTimeExample.convertZonedDateTime(sourceDate, destZone);
-        assertTrue(sourceDate.toInstant().compareTo(destDate.toInstant()) == 0);
+        
+        assertTrue(sourceDate.toInstant()
+            .compareTo(destDate.toInstant()) == 0);
     }
 }

From a5acc10bac168e6f8ae9a7c9416b738640b8521b Mon Sep 17 00:00:00 2001
From: rozagerardo <rozagerardo@gmail.com>
Date: Wed, 19 Sep 2018 11:16:10 -0300
Subject: [PATCH 088/114] [BAEL-1626] testing-modules | A Quick Guide to
 @TestPropertySource - move to existing submodule (#5292)

* *added tests using testpropertysource

* fix: using property for version in pom file

* fix, added dependency with compile scope to build successfully on mvn clean install

* * moved testpropertysource tests from spring-context-tests to spring-tests submodule

* deleted  submodule created for this article, since it was moved
---
 .../spring-context-testing/pom.xml            | 25 -------------------
 .../ClassUsingProperty.java                   |  0
 ...aultTestPropertySourceIntegrationTest.java |  0
 ...tionTestPropertySourceIntegrationTest.java |  0
 ...tiesTestPropertySourceIntegrationTest.java |  0
 ...stPropertySourceIntegrationTest.properties |  0
 .../test/resources/other-location.properties  |  0
 7 files changed, 25 deletions(-)
 delete mode 100644 testing-modules/spring-context-testing/pom.xml
 rename testing-modules/{spring-context-testing => spring-testing}/src/main/java/com/baeldung/testpropertysource/ClassUsingProperty.java (100%)
 rename testing-modules/{spring-context-testing => spring-testing}/src/test/java/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.java (100%)
 rename testing-modules/{spring-context-testing => spring-testing}/src/test/java/com/baeldung/testpropertysource/LocationTestPropertySourceIntegrationTest.java (100%)
 rename testing-modules/{spring-context-testing => spring-testing}/src/test/java/com/baeldung/testpropertysource/PropertiesTestPropertySourceIntegrationTest.java (100%)
 rename testing-modules/{spring-context-testing => spring-testing}/src/test/resources/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.properties (100%)
 rename testing-modules/{spring-context-testing => spring-testing}/src/test/resources/other-location.properties (100%)

diff --git a/testing-modules/spring-context-testing/pom.xml b/testing-modules/spring-context-testing/pom.xml
deleted file mode 100644
index 148192d6c5..0000000000
--- a/testing-modules/spring-context-testing/pom.xml
+++ /dev/null
@@ -1,25 +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>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-context-testing</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>${spring.boot.starter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <version>${spring.boot.starter.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <spring.boot.starter.version>2.0.4.RELEASE</spring.boot.starter.version>
-    </properties>
-</project>
diff --git a/testing-modules/spring-context-testing/src/main/java/com/baeldung/testpropertysource/ClassUsingProperty.java b/testing-modules/spring-testing/src/main/java/com/baeldung/testpropertysource/ClassUsingProperty.java
similarity index 100%
rename from testing-modules/spring-context-testing/src/main/java/com/baeldung/testpropertysource/ClassUsingProperty.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/testpropertysource/ClassUsingProperty.java
diff --git a/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.java
similarity index 100%
rename from testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.java
diff --git a/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/LocationTestPropertySourceIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/testpropertysource/LocationTestPropertySourceIntegrationTest.java
similarity index 100%
rename from testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/LocationTestPropertySourceIntegrationTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/testpropertysource/LocationTestPropertySourceIntegrationTest.java
diff --git a/testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/PropertiesTestPropertySourceIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/testpropertysource/PropertiesTestPropertySourceIntegrationTest.java
similarity index 100%
rename from testing-modules/spring-context-testing/src/test/java/com/baeldung/testpropertysource/PropertiesTestPropertySourceIntegrationTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/testpropertysource/PropertiesTestPropertySourceIntegrationTest.java
diff --git a/testing-modules/spring-context-testing/src/test/resources/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.properties b/testing-modules/spring-testing/src/test/resources/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.properties
similarity index 100%
rename from testing-modules/spring-context-testing/src/test/resources/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.properties
rename to testing-modules/spring-testing/src/test/resources/com/baeldung/testpropertysource/DefaultTestPropertySourceIntegrationTest.properties
diff --git a/testing-modules/spring-context-testing/src/test/resources/other-location.properties b/testing-modules/spring-testing/src/test/resources/other-location.properties
similarity index 100%
rename from testing-modules/spring-context-testing/src/test/resources/other-location.properties
rename to testing-modules/spring-testing/src/test/resources/other-location.properties

From 4d2780379d6921f7f1a8749684872452f021b591 Mon Sep 17 00:00:00 2001
From: Sam Millington <s.j.millington@hotmail.co.uk>
Date: Wed, 19 Sep 2018 17:29:04 +0100
Subject: [PATCH 089/114] Password Hashing, PBKDF2 and SHA-512

Issue: BAEL-2164
---
 .../passwordhashing/PBKDF2Hasher.java         | 149 ++++++++++++++++++
 .../passwordhashing/SHA512Hasher.java         |  35 ++++
 .../passwordhashing/SimplePBKDF2Hasher.java   |  18 +++
 .../passwordhashing/PBKDF2HasherUnitTest.java |  41 +++++
 .../passwordhashing/SHA512HasherUnitTest.java |  70 ++++++++
 5 files changed, 313 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java
 create mode 100644 core-java/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java
 create mode 100644 core-java/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java
 create mode 100644 core-java/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java

diff --git a/core-java/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java b/core-java/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java
new file mode 100644
index 0000000000..e2259e4249
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/passwordhashing/PBKDF2Hasher.java
@@ -0,0 +1,149 @@
+package com.baeldung.passwordhashing;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+
+/**
+ * Hash passwords for storage, and test passwords against password tokens.
+ *
+ * Instances of this class can be used concurrently by multiple threads.
+ *
+ * @author erickson
+ * @see <a href="http://stackoverflow.com/a/2861125/3474">StackOverflow</a>
+ */
+public final class PBKDF2Hasher
+{
+
+  /**
+   * Each token produced by this class uses this identifier as a prefix.
+   */
+  public static final String ID = "$31$";
+
+  /**
+   * The minimum recommended cost, used by default
+   */
+  public static final int DEFAULT_COST = 16;
+
+  private static final String ALGORITHM = "PBKDF2WithHmacSHA1";
+
+  private static final int SIZE = 128;
+
+  private static final Pattern layout = Pattern.compile("\\$31\\$(\\d\\d?)\\$(.{43})");
+
+  private final SecureRandom random;
+
+  private final int cost;
+
+  public PBKDF2Hasher()
+  {
+    this(DEFAULT_COST);
+  }
+
+  /**
+   * Create a password manager with a specified cost
+   *
+   * @param cost the exponential computational cost of hashing a password, 0 to 30
+   */
+  public PBKDF2Hasher(int cost)
+  {
+    iterations(cost); /* Validate cost */
+    this.cost = cost;
+    this.random = new SecureRandom();
+  }
+
+  private static int iterations(int cost)
+  {
+    if ((cost < 0) || (cost > 30))
+      throw new IllegalArgumentException("cost: " + cost);
+    return 1 << cost;
+  }
+
+  /**
+   * Hash a password for storage.
+   *
+   * @return a secure authentication token to be stored for later authentication
+   */
+  public String hash(char[] password)
+  {
+    byte[] salt = new byte[SIZE / 8];
+    random.nextBytes(salt);
+    byte[] dk = pbkdf2(password, salt, 1 << cost);
+    byte[] hash = new byte[salt.length + dk.length];
+    System.arraycopy(salt, 0, hash, 0, salt.length);
+    System.arraycopy(dk, 0, hash, salt.length, dk.length);
+    Base64.Encoder enc = Base64.getUrlEncoder().withoutPadding();
+    return ID + cost + '$' + enc.encodeToString(hash);
+  }
+
+  /**
+   * Authenticate with a password and a stored password token.
+   *
+   * @return true if the password and token match
+   */
+  public boolean checkPassword(char[] password, String token)
+  {
+    Matcher m = layout.matcher(token);
+    if (!m.matches())
+      throw new IllegalArgumentException("Invalid token format");
+    int iterations = iterations(Integer.parseInt(m.group(1)));
+    byte[] hash = Base64.getUrlDecoder().decode(m.group(2));
+    byte[] salt = Arrays.copyOfRange(hash, 0, SIZE / 8);
+    byte[] check = pbkdf2(password, salt, iterations);
+    int zero = 0;
+    for (int idx = 0; idx < check.length; ++idx)
+      zero |= hash[salt.length + idx] ^ check[idx];
+    return zero == 0;
+  }
+
+  private static byte[] pbkdf2(char[] password, byte[] salt, int iterations)
+  {
+    KeySpec spec = new PBEKeySpec(password, salt, iterations, SIZE);
+    try {
+      SecretKeyFactory f = SecretKeyFactory.getInstance(ALGORITHM);
+      return f.generateSecret(spec).getEncoded();
+    }
+    catch (NoSuchAlgorithmException ex) {
+      throw new IllegalStateException("Missing algorithm: " + ALGORITHM, ex);
+    }
+    catch (InvalidKeySpecException ex) {
+      throw new IllegalStateException("Invalid SecretKeyFactory", ex);
+    }
+  }
+
+  /**
+   * Hash a password in an immutable {@code String}.
+   *
+   * <p>Passwords should be stored in a {@code char[]} so that it can be filled
+   * with zeros after use instead of lingering on the heap and elsewhere.
+   *
+   * @deprecated Use {@link #hash(char[])} instead
+   */
+  @Deprecated
+  public String hash(String password)
+  {
+    return hash(password.toCharArray());
+  }
+
+  /**
+   * Authenticate with a password in an immutable {@code String} and a stored
+   * password token.
+   *
+   * @deprecated Use {@link #checkPassword(char[],String)} instead.
+   * @see #hash(String)
+   */
+  @Deprecated
+  public boolean checkPassword(String password, String token)
+  {
+    return checkPassword(password.toCharArray(), token);
+  }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java b/core-java/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java
new file mode 100644
index 0000000000..4f5337f963
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/passwordhashing/SHA512Hasher.java
@@ -0,0 +1,35 @@
+package com.baeldung.passwordhashing;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+
+/** A really simple SHA_512 Encryption example.
+ *
+ */
+public class SHA512Hasher {
+
+  public String hash(String passwordToHash, byte[] salt){
+    String generatedPassword = null;
+    try {
+      MessageDigest md = MessageDigest.getInstance("SHA-512");
+      md.update(salt);
+      byte[] bytes = md.digest(passwordToHash.getBytes(StandardCharsets.UTF_8));
+      StringBuilder sb = new StringBuilder();
+      for(int i=0; i< bytes.length ;i++){
+        sb.append(Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1));
+      }
+      generatedPassword = sb.toString();
+    }
+    catch (NoSuchAlgorithmException e){
+      e.printStackTrace();
+    }
+    return generatedPassword;
+  }
+
+  public boolean checkPassword(String hash, String attempt, byte[] salt){
+    String generatedHash = hash(attempt, salt);
+    return hash.equals(generatedHash);
+  }
+}
diff --git a/core-java/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java b/core-java/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java
new file mode 100644
index 0000000000..36c9b65070
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/passwordhashing/SimplePBKDF2Hasher.java
@@ -0,0 +1,18 @@
+package com.baeldung.passwordhashing;
+
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import java.security.spec.KeySpec;
+
+/** A really simple SimplePBKDF2 Encryption example.
+ *
+ */
+public class SimplePBKDF2Hasher {
+
+  public static String hashSimple(String password, byte[] salt) throws Exception{
+    KeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 128);
+    SecretKeyFactory f = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+    byte[] hash = f.generateSecret(spec).getEncoded();
+    return String.valueOf(hash);
+  }
+}
diff --git a/core-java/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java b/core-java/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java
new file mode 100644
index 0000000000..8e90725c77
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/passwordhashing/PBKDF2HasherUnitTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.passwordhashing;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+
+public class PBKDF2HasherUnitTest {
+
+  private PBKDF2Hasher mPBKDF2Hasher;
+
+  @Before
+  public void setUp() throws Exception {
+    mPBKDF2Hasher = new PBKDF2Hasher();
+  }
+
+  @Test
+  public void givenCorrectMessageAndHash_whenAuthenticated_checkAuthenticationSucceeds() throws Exception {
+    String message1 = "password123";
+
+    String hash1 = mPBKDF2Hasher.hash(message1.toCharArray());
+
+    assertTrue(mPBKDF2Hasher.checkPassword(message1.toCharArray(), hash1));
+
+  }
+
+  @Test
+  public void givenWrongMessage_whenAuthenticated_checkAuthenticationFails() throws Exception {
+    String message1 = "password123";
+
+    String hash1 = mPBKDF2Hasher.hash(message1.toCharArray());
+
+    String wrongPasswordAttempt = "IamWrong";
+
+    assertFalse(mPBKDF2Hasher.checkPassword(wrongPasswordAttempt.toCharArray(), hash1));
+
+  }
+
+
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java b/core-java/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java
new file mode 100644
index 0000000000..3acfb0ba9d
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/passwordhashing/SHA512HasherUnitTest.java
@@ -0,0 +1,70 @@
+package com.baeldung.passwordhashing;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.security.SecureRandom;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by PhysicsSam on 06-Sep-18.
+ */
+public class SHA512HasherUnitTest {
+
+  private SHA512Hasher hasher;
+  private SecureRandom secureRandom;
+
+  @Before
+  public void setUp() throws Exception {
+    hasher = new SHA512Hasher();
+    secureRandom = new SecureRandom();
+  }
+
+  @Test
+  public void givenSamePasswordAndSalt_whenHashed_checkResultingHashesAreEqual() throws Exception {
+
+    byte[] salt = new byte[16];
+    secureRandom.nextBytes(salt);
+
+    String hash1 = hasher.hash("password", salt);
+    String hash2 = hasher.hash("password", salt);
+
+    assertEquals(hash1, hash2);
+
+  }
+
+  @Test
+  public void givenSamePasswordAndDifferentSalt_whenHashed_checkResultingHashesNotEqual() throws Exception {
+
+    byte[] salt = new byte[16];
+    secureRandom.nextBytes(salt);
+    String hash1 = hasher.hash("password", salt);
+    //generate a second salt
+    byte[] secondSalt = new byte[16];
+    String hash2 = hasher.hash("password", secondSalt);
+
+    assertNotEquals(hash1, hash2);
+
+  }
+
+  @Test
+  public void givenPredefinedHash_whenCorrectAttemptGiven_checkAuthenticationSucceeds() throws Exception {
+    byte[] salt = new byte[16];
+    secureRandom.nextBytes(salt);
+
+    String originalHash = hasher.hash("password123", salt);
+
+    assertTrue(hasher.checkPassword(originalHash, "password123", salt));
+  }
+
+  @Test
+  public void givenPredefinedHash_whenIncorrectAttemptGiven_checkAuthenticationFails() throws Exception {
+    byte[] salt = new byte[16];
+    secureRandom.nextBytes(salt);
+
+    String originalHash = hasher.hash("password123", salt);
+
+    assertFalse(hasher.checkPassword(originalHash, "password124", salt));
+  }
+}
\ No newline at end of file

From 6a09ba47e8581972a7e81eb45e4239c9b5c6b037 Mon Sep 17 00:00:00 2001
From: Saikat <41847480+psychsane@users.noreply.github.com>
Date: Wed, 19 Sep 2018 22:26:11 +0530
Subject: [PATCH 090/114] Check String is not empty

Issue: BAEL-2128
---
 java-strings/pom.xml                          |  6 +++
 .../baeldung/string/StringEmptyUnitTest.java  | 51 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 java-strings/src/test/java/com/baeldung/string/StringEmptyUnitTest.java

diff --git a/java-strings/pom.xml b/java-strings/pom.xml
index 2afe18f07a..29e992a2ce 100644
--- a/java-strings/pom.xml
+++ b/java-strings/pom.xml
@@ -52,6 +52,11 @@
             <artifactId>icu4j</artifactId>
             <version>${icu4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
         
         <dependency>
             <groupId>com.vdurmont</groupId>
@@ -92,6 +97,7 @@
         <assertj.version>3.6.1</assertj.version>
         <jmh-core.version>1.19</jmh-core.version>
         <icu4j.version>61.1</icu4j.version>
+        <guava.version>26.0-jre</guava.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/java-strings/src/test/java/com/baeldung/string/StringEmptyUnitTest.java b/java-strings/src/test/java/com/baeldung/string/StringEmptyUnitTest.java
new file mode 100644
index 0000000000..17b13f89de
--- /dev/null
+++ b/java-strings/src/test/java/com/baeldung/string/StringEmptyUnitTest.java
@@ -0,0 +1,51 @@
+package com.baeldung.string;
+
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.text.IsEmptyString.isEmptyOrNullString;
+import static org.hamcrest.text.IsEmptyString.isEmptyString;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.lang3.StringUtils;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import com.google.common.base.Strings;
+
+public class StringEmptyUnitTest {
+
+    private String text = "baeldung";
+
+    @Test
+    public void givenAString_whenCheckedForEmptyUsingJunit_shouldAssertSuccessfully() {
+        assertTrue(!text.isEmpty());
+        assertFalse(text.isEmpty());
+        assertNotEquals("", text);
+        assertNotSame("", text);
+    }
+
+    @Test
+    public void givenAString_whenCheckedForEmptyUsingHamcrest_shouldAssertSuccessfully() {
+        assertThat(text, not(isEmptyString()));
+        assertThat(text, not(isEmptyOrNullString()));
+    }
+
+    @Test
+    public void givenAString_whenCheckedForEmptyUsingCommonsLang_shouldAssertSuccessfully() {
+        assertTrue(StringUtils.isNotBlank(text));
+    }
+
+    @Test
+    public void givenAString_whenCheckedForEmptyUsingAssertJ_shouldAssertSuccessfully() {
+        Assertions.assertThat(text).isNotEmpty();
+    }
+
+    @Test
+    public void givenAString_whenCheckedForEmptyUsingGuava_shouldAssertSuccessfully() {
+        assertFalse(Strings.isNullOrEmpty(text));
+    }
+
+}

From f7b03bdd41bcf63f946841a2b4b57a58707b4d63 Mon Sep 17 00:00:00 2001
From: Aravind Ranganathan <aravindram87@gmail.com>
Date: Thu, 20 Sep 2018 10:53:49 -0400
Subject: [PATCH 091/114] Removing aws maven module for spring cloud functions
 (#5291)

---
 spring-cloud/spring-cloud-functions/README.MD |   2 +
 spring-cloud/spring-cloud-functions/pom.xml   | 101 +++++++++++++++---
 .../spring-cloud-function-aws/pom.xml         |  94 ----------------
 .../aws}/CloudFunctionAwsApplication.java     |   2 +-
 .../aws}/StringReverseHandler.java            |   2 +-
 .../cloudfunction/aws}/functions/Greeter.java |   2 +-
 .../src/main/resources/application.properties |   2 +-
 .../aws}/CloudFunctionApplicationTests.java   |   2 +-
 8 files changed, 95 insertions(+), 112 deletions(-)
 create mode 100644 spring-cloud/spring-cloud-functions/README.MD
 delete mode 100644 spring-cloud/spring-cloud-functions/spring-cloud-function-aws/pom.xml
 rename spring-cloud/spring-cloud-functions/{spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction => src/main/java/com/baeldung/spring/cloudfunction/aws}/CloudFunctionAwsApplication.java (92%)
 rename spring-cloud/spring-cloud-functions/{spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction => src/main/java/com/baeldung/spring/cloudfunction/aws}/StringReverseHandler.java (78%)
 rename spring-cloud/spring-cloud-functions/{spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction => src/main/java/com/baeldung/spring/cloudfunction/aws}/functions/Greeter.java (80%)
 rename spring-cloud/spring-cloud-functions/{spring-cloud-function-aws => }/src/main/resources/application.properties (76%)
 rename spring-cloud/spring-cloud-functions/{spring-cloud-function-aws/src/test/java/com/baeldung/spring/cloudfunction => src/test/java/com/baeldung/spring/cloudfunction/aws}/CloudFunctionApplicationTests.java (96%)

diff --git a/spring-cloud/spring-cloud-functions/README.MD b/spring-cloud/spring-cloud-functions/README.MD
new file mode 100644
index 0000000000..c766dd1dc6
--- /dev/null
+++ b/spring-cloud/spring-cloud-functions/README.MD
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Serverless Functions with Spring Cloud Function](https://www.baeldung.com/spring-cloud-function)
diff --git a/spring-cloud/spring-cloud-functions/pom.xml b/spring-cloud/spring-cloud-functions/pom.xml
index e3c17329d0..8b2b0ad385 100644
--- a/spring-cloud/spring-cloud-functions/pom.xml
+++ b/spring-cloud/spring-cloud-functions/pom.xml
@@ -1,19 +1,94 @@
 <?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">
+<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>spring-cloud-functions</artifactId>
-    <packaging>pom</packaging>
+
+    <groupId>com.baeldung.spring</groupId>
+    <artifactId>cloudfunction-aws</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>cloudfunction-aws</name>
+    <description>Demo project for Spring Cloud Function</description>
 
     <parent>
-        <artifactId>parent-boot-2</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.4.RELEASE</version>
+        <relativePath/>
     </parent>
 
-    <modules>
-        <module>spring-cloud-function-aws</module>
-    </modules>
-    
-</project>
\ No newline at end of file
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <spring-cloud-function.version>1.0.1.RELEASE</spring-cloud-function.version>
+        <aws-lambda-events.version>2.0.2</aws-lambda-events.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-function-adapter-aws</artifactId>
+            <version>${spring-cloud-function.version}</version>
+        </dependency>
+        <!-- We don't need spring-cloud-starter-function-web when deploying to AWS-->
+        <!-- It is used only for local testing-->
+         <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-function-web</artifactId>
+            <version>1.0.1.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-events</artifactId>
+            <version>${aws-lambda-events.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>1.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.springframework.boot.experimental</groupId>
+                        <artifactId>spring-boot-thin-layout</artifactId>
+                        <version>1.0.10.RELEASE</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <shadedArtifactAttached>true</shadedArtifactAttached>
+                    <shadedClassifierName>aws</shadedClassifierName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/pom.xml b/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/pom.xml
deleted file mode 100644
index 8b2b0ad385..0000000000
--- a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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.spring</groupId>
-    <artifactId>cloudfunction-aws</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>cloudfunction-aws</name>
-    <description>Demo project for Spring Cloud Function</description>
-
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.4.RELEASE</version>
-        <relativePath/>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <spring-cloud-function.version>1.0.1.RELEASE</spring-cloud-function.version>
-        <aws-lambda-events.version>2.0.2</aws-lambda-events.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-function-adapter-aws</artifactId>
-            <version>${spring-cloud-function.version}</version>
-        </dependency>
-        <!-- We don't need spring-cloud-starter-function-web when deploying to AWS-->
-        <!-- It is used only for local testing-->
-         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-function-web</artifactId>
-            <version>1.0.1.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-lambda-java-events</artifactId>
-            <version>${aws-lambda-events.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.springframework.boot.experimental</groupId>
-                        <artifactId>spring-boot-thin-layout</artifactId>
-                        <version>1.0.10.RELEASE</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <shadedArtifactAttached>true</shadedArtifactAttached>
-                    <shadedClassifierName>aws</shadedClassifierName>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/CloudFunctionAwsApplication.java b/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java
similarity index 92%
rename from spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/CloudFunctionAwsApplication.java
rename to spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java
index cc8f11beca..34e97d3b6c 100644
--- a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/CloudFunctionAwsApplication.java
+++ b/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.cloudfunction;
+package com.baeldung.spring.cloudfunction.aws;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/StringReverseHandler.java b/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java
similarity index 78%
rename from spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/StringReverseHandler.java
rename to spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java
index d103bc98d9..52514dcd12 100644
--- a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/StringReverseHandler.java
+++ b/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.cloudfunction;
+package com.baeldung.spring.cloudfunction.aws;
 
 import org.springframework.cloud.function.adapter.aws.SpringBootRequestHandler;
 
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/functions/Greeter.java b/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java
similarity index 80%
rename from spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/functions/Greeter.java
rename to spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java
index 124aefe56e..c443b98c18 100644
--- a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/java/com/baeldung/spring/cloudfunction/functions/Greeter.java
+++ b/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.cloudfunction.functions;
+package com.baeldung.spring.cloudfunction.functions.aws;
 
 import java.util.function.Function;
 
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/resources/application.properties b/spring-cloud/spring-cloud-functions/src/main/resources/application.properties
similarity index 76%
rename from spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-functions/src/main/resources/application.properties
index 14426a848c..b445bfa4ed 100644
--- a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/main/resources/application.properties
+++ b/spring-cloud/spring-cloud-functions/src/main/resources/application.properties
@@ -1 +1 @@
-spring.cloud.function.scan.packages: com.baeldung.spring.cloudfunction.functions
\ No newline at end of file
+spring.cloud.function.scan.packages: com.baeldung.spring.cloudfunction.functions.aws
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/test/java/com/baeldung/spring/cloudfunction/CloudFunctionApplicationTests.java b/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationTests.java
similarity index 96%
rename from spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/test/java/com/baeldung/spring/cloudfunction/CloudFunctionApplicationTests.java
rename to spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationTests.java
index 01199475fb..6039debe3f 100644
--- a/spring-cloud/spring-cloud-functions/spring-cloud-function-aws/src/test/java/com/baeldung/spring/cloudfunction/CloudFunctionApplicationTests.java
+++ b/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationTests.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.cloudfunction;
+package com.baeldung.spring.cloudfunction.aws;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

From 1dea2b8cbda63df1ac57083e97847c80c66f1c26 Mon Sep 17 00:00:00 2001
From: micropatel <31759369+micropatel@users.noreply.github.com>
Date: Thu, 20 Sep 2018 22:57:08 -0300
Subject: [PATCH 092/114] BAEL-1980 Access an in-memory h2 db from 2 Spring
 Boot applications (#5230)

* Added Spring-Boot-H2 project

* Optimized imports and formatted code

* Code Formatting changes

* Renamed the client applicaiton

* Removed Name from pom.xml

* formatting changes - applied formatting style

* added souts

* Update SpringBootApp.java

* Update ClientSpringBootApp.java

* Fixed Formatting issues

* Fixed formatting and spelling mistakes

* added H2 shared db example

* a

* patch

* test

* Revert "Fixed formatting and spelling mistakes"

This reverts commit ed56ededec903e85c2d9f2b55e7730682455d5f5.

* Revert "test"

This reverts commit 4a7133dbd1d181cc304348f63998924a9db5acfe.

* Revert "patch"

This reverts commit 404b9ebe74aef4faa2ad62d9867652b62a5445b8.

* Revert "a"

This reverts commit af77f841114e19b0a0eafb15530dbaaaf34b5493.

* Revert "added H2 shared db example"

This reverts commit e16918cae3813fe20172c7e90e27bbec34b5fb5f.

* Updated to have client and server in same directory

* Deleted old files

* removed unwanted directory

* formating

* removed unwanted module

* commentted removed module

* Revert "commentted removed module"

This reverts commit 211ff1441f6bde920d7af3f8cd52c2a682ba3967.

* Revert "removed unwanted module"

This reverts commit 657f9ee45e02269bcfdbf380b9a74ff2370857fc.

* fixed pom.xml issue

* typo fixed

* fixed multiple main class issue
---
 pom.xml                                       |  4 +-
 .../spring-boot-h2-database/pom.xml           |  2 +
 .../demo/client}/ClientSpringBootApp.java     |  8 ++-
 .../h2db/demo/{ => server}/SpringBootApp.java |  9 +--
 .../spring-boot-h2-remote-app/.gitignore      | 25 ---------
 .../spring-boot-h2-remote-app/pom.xml         | 55 -------------------
 .../src/main/resources/application.properties |  5 --
 7 files changed, 15 insertions(+), 93 deletions(-)
 rename spring-boot-h2/{spring-boot-h2-remote-app/src/main/java/com/baeldung/h2db/demo => spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/client}/ClientSpringBootApp.java (85%)
 rename spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/{ => server}/SpringBootApp.java (88%)
 delete mode 100644 spring-boot-h2/spring-boot-h2-remote-app/.gitignore
 delete mode 100644 spring-boot-h2/spring-boot-h2-remote-app/pom.xml
 delete mode 100644 spring-boot-h2/spring-boot-h2-remote-app/src/main/resources/application.properties

diff --git a/pom.xml b/pom.xml
index bd06bdfdaa..f4f09b427e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -675,7 +675,7 @@
 				<!-- <module>rule-engines/rulebook</module> --><!-- Wrong Parent -->
 				<module>spring-boot-custom-starter/greeter</module>
 				<module>spring-boot-h2/spring-boot-h2-database</module>
-				<module>spring-boot-h2/spring-boot-h2-remote-app</module>
+				<!--module>spring-boot-h2/spring-boot-h2-remote-app</module-->
 				<!-- <module>guest\webservices\rest-client</module> --><!-- guest post on different site -->
 				<!-- <module>guest\webservices\rest-server</module> --><!-- PMD voilation -->
 				<!-- <module>guest\webservices\spring-rest-service</module> --><!-- guest post on different site -->
@@ -992,7 +992,7 @@
 				<!-- <module>rule-engines/rulebook</module> --><!-- Wrong Parent -->
 				<module>spring-boot-custom-starter/greeter</module>
 				<module>spring-boot-h2/spring-boot-h2-database</module>
-				<module>spring-boot-h2/spring-boot-h2-remote-app</module>
+				<!--module>spring-boot-h2/spring-boot-h2-remote-app</module-->
 				<!-- <module>guest\webservices\rest-client</module> --><!-- guest post on different site -->
 				<!-- <module>guest\webservices\rest-server</module> --><!-- PMD voilation -->
 				<!-- <module>guest\webservices\spring-rest-service</module> --><!-- guest post on different site -->
diff --git a/spring-boot-h2/spring-boot-h2-database/pom.xml b/spring-boot-h2/spring-boot-h2-database/pom.xml
index 4b660334da..94f2293c34 100644
--- a/spring-boot-h2/spring-boot-h2-database/pom.xml
+++ b/spring-boot-h2/spring-boot-h2-database/pom.xml
@@ -22,6 +22,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <!-- The main class to start by executing java -jar -->
+        <start-class>com.mycorp.starter.HelloWorldApplication</start-class>
     </properties>
 
     <dependencies>
diff --git a/spring-boot-h2/spring-boot-h2-remote-app/src/main/java/com/baeldung/h2db/demo/ClientSpringBootApp.java b/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/client/ClientSpringBootApp.java
similarity index 85%
rename from spring-boot-h2/spring-boot-h2-remote-app/src/main/java/com/baeldung/h2db/demo/ClientSpringBootApp.java
rename to spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/client/ClientSpringBootApp.java
index 39e52afd2c..7402312e1c 100644
--- a/spring-boot-h2/spring-boot-h2-remote-app/src/main/java/com/baeldung/h2db/demo/ClientSpringBootApp.java
+++ b/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/client/ClientSpringBootApp.java
@@ -1,4 +1,4 @@
-package com.baeldung.h2db.demo;
+package com.baeldung.h2db.demo.client;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -7,16 +7,20 @@ import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
 @SpringBootApplication
+@ComponentScan("com.baeldung.h2db.demo.client")
 public class ClientSpringBootApp {
 
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
     public static void main(String[] args) {
+        System.setProperty("spring.datasource.url","jdbc:h2:tcp://localhost:9091/mem:mydb");
         SpringApplication.run(ClientSpringBootApp.class, args);
     }
 
@@ -46,4 +50,4 @@ public class ClientSpringBootApp {
                 }
             });
     }
-}
\ No newline at end of file
+}
diff --git a/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/SpringBootApp.java b/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/server/SpringBootApp.java
similarity index 88%
rename from spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/SpringBootApp.java
rename to spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/server/SpringBootApp.java
index 1fe080ec22..e75b42a934 100644
--- a/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/SpringBootApp.java
+++ b/spring-boot-h2/spring-boot-h2-database/src/main/java/com/baeldung/h2db/demo/server/SpringBootApp.java
@@ -1,4 +1,4 @@
-package com.baeldung.h2db.demo;
+package com.baeldung.h2db.demo.server;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -9,10 +9,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
 @SpringBootApplication
+@ComponentScan("com.baeldung.h2db.demo.server")
 public class SpringBootApp {
 
     @Autowired
@@ -24,8 +26,7 @@ public class SpringBootApp {
 
     @PostConstruct
     private void initDb() {
-        System.out.println(String.format(
-            "****** Creating table: %s, and Inserting test data ******", "Employees"));
+        System.out.println(String.format("****** Creating table: %s, and Inserting test data ******", "Employees"));
 
         String sqlStatements[] = {
             "drop table employees if exists",
@@ -57,4 +58,4 @@ public class SpringBootApp {
     public Server inMemoryH2DatabaseServer() throws SQLException {
         return Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort", "9091");
     }
-}
\ No newline at end of file
+}
diff --git a/spring-boot-h2/spring-boot-h2-remote-app/.gitignore b/spring-boot-h2/spring-boot-h2-remote-app/.gitignore
deleted file mode 100644
index 82eca336e3..0000000000
--- a/spring-boot-h2/spring-boot-h2-remote-app/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-/target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/build/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
\ No newline at end of file
diff --git a/spring-boot-h2/spring-boot-h2-remote-app/pom.xml b/spring-boot-h2/spring-boot-h2-remote-app/pom.xml
deleted file mode 100644
index 8eb59d2098..0000000000
--- a/spring-boot-h2/spring-boot-h2-remote-app/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         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.h2db</groupId>
-    <artifactId>spring-boot-h2-remote-app</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <description>Demo Spring Boot applications that access H2 in memory database created
-        in another Spring Boot application
-    </description>
-
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.4.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/spring-boot-h2/spring-boot-h2-remote-app/src/main/resources/application.properties b/spring-boot-h2/spring-boot-h2-remote-app/src/main/resources/application.properties
deleted file mode 100644
index 6c3446f03a..0000000000
--- a/spring-boot-h2/spring-boot-h2-remote-app/src/main/resources/application.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-spring.datasource.url=jdbc:h2:tcp://localhost:9091/mem:mydb
-spring.datasource.driverClassName=org.h2.Driver
-spring.datasource.username=sa
-spring.datasource.password=
-spring.jpa.hibernate.ddl-auto=create
\ No newline at end of file

From 6995a96704911fa77db2cc450c62866131b71bc0 Mon Sep 17 00:00:00 2001
From: Akash Pandey <akash-pandey@users.noreply.github.com>
Date: Fri, 21 Sep 2018 15:01:47 +0530
Subject: [PATCH 093/114] BAEL-2159: Mini Article on "Separate double into
 integer and decimal parts" (#5300)

---
 .../doubles/SplitFloatingPointNumbers.java    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java

diff --git a/core-java/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java b/core-java/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java
new file mode 100644
index 0000000000..a28ac3d5a1
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/doubles/SplitFloatingPointNumbers.java
@@ -0,0 +1,40 @@
+package com.baeldung.doubles;
+
+import java.math.BigDecimal;
+
+public class SplitFloatingPointNumbers {
+
+    public static void main(String[] args) {
+        
+        double doubleNumber = 24.04;
+        splitUsingFloatingTypes(doubleNumber); 
+        splitUsingString(doubleNumber);
+        splitUsingBigDecimal(doubleNumber);
+    }
+
+    private static void splitUsingFloatingTypes(double doubleNumber) {
+        System.out.println("Using Floating Point Arithmetics:");
+        int intPart = (int) doubleNumber;
+        System.out.println("Double Number: "+doubleNumber);
+        System.out.println("Integer Part: "+ intPart);
+        System.out.println("Decimal Part: "+ (doubleNumber - intPart));
+    }
+
+    private static void splitUsingString(double doubleNumber) {
+        System.out.println("Using String Operations:");
+        String doubleAsString = String.valueOf(doubleNumber);
+        int indexOfDecimal = doubleAsString.indexOf(".");
+        System.out.println("Double Number: "+doubleNumber);
+        System.out.println("Integer Part: "+ doubleAsString.substring(0, indexOfDecimal));
+        System.out.println("Decimal Part: "+ doubleAsString.substring(indexOfDecimal));
+    }
+
+    private static void splitUsingBigDecimal(double doubleNumber) {
+        System.out.println("Using BigDecimal Operations:");
+        BigDecimal bigDecimal = new BigDecimal(String.valueOf(doubleNumber));
+        int intValue = bigDecimal.intValue();
+        System.out.println("Double Number: "+bigDecimal.toPlainString());
+        System.out.println("Integer Part: "+intValue);
+        System.out.println("Decimal Part: "+bigDecimal.subtract(new BigDecimal(intValue)).toPlainString());
+    }
+}

From 980c00e5ba3637eeaaee888e574546b6552b17be Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Fri, 21 Sep 2018 15:42:32 +0530
Subject: [PATCH 094/114] BAEL-8963 Fix surefire configs of springresttomcat,
 roo, spring-swagger, vertx, twilio and twitter4j projects

- Fixed surefire configs and basic pom standardization
---
 Twitter4J/pom.xml                             | 25 ------
 pom.xml                                       |  6 +-
 spring-4/pom.xml                              |  2 -
 spring-boot-jasypt/pom.xml                    |  4 -
 .../disabling-console-jul/pom.xml             | 17 ++--
 .../disabling-console-log4j2/pom.xml          | 79 +++++++++----------
 .../disabling-console-logging/pom.xml         |  2 -
 spring-boot-logging-log4j2/pom.xml            |  8 --
 .../spring-boot-logging-log4j2-app/pom.xml    |  2 -
 spring-boot-mvc/pom.xml                       |  7 +-
 spring-rest-embedded-tomcat/pom.xml           | 26 ------
 spring-rest-shell/pom.xml                     |  8 --
 spring-security-openid/pom.xml                |  2 -
 spring-swagger-codegen/pom.xml                |  1 -
 .../spring-swagger-codegen-api-client/pom.xml | 17 ----
 .../spring-swagger-codegen-app/pom.xml        |  6 +-
 spring-vertx/pom.xml                          | 23 ------
 twilio/pom.xml                                | 13 ++-
 18 files changed, 52 insertions(+), 196 deletions(-)

diff --git a/Twitter4J/pom.xml b/Twitter4J/pom.xml
index 80236a2cd4..982c1adc23 100644
--- a/Twitter4J/pom.xml
+++ b/Twitter4J/pom.xml
@@ -1,13 +1,9 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.mabsisa</groupId>
     <artifactId>Twitter4J</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-SNAPSHOT</version>
     <name>Twitter4J</name>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -23,27 +19,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/ApplicationTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <twitter4j-stream.version>4.0.6</twitter4j-stream.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index f4f09b427e..258d5af893 100644
--- a/pom.xml
+++ b/pom.xml
@@ -471,7 +471,7 @@
 				<module>spring-boot-persistence</module>
 				<module>spring-boot-security</module>
 				<module>spring-boot-mvc</module>
-                                <module>spring-boot-vue</module>
+                <module>spring-boot-vue</module>
 				<module>spring-boot-logging-log4j2</module>
 				<module>spring-cloud-data-flow</module>
 				<module>spring-cloud</module>
@@ -635,7 +635,7 @@
 				<!-- <module>rest-with-spark-java</module> --><!-- PMD voilation -->
 				<module>spring-boot-autoconfiguration</module>
 				<module>spring-boot-custom-starter</module>
-				<!-- <module>spring-boot-jasypt</module> --><!-- PMD voilation -->
+				<module>spring-boot-jasypt</module>
 				<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
 				<module>spring-data-rest-querydsl</module>
 				<!-- <module>spring-groovy</module> --><!-- PMD voilation -->
@@ -652,7 +652,7 @@
 				<!-- <module>static-analysis</module> --><!-- PMD voilation -->
 				<module>stripe</module>
 				<!-- <module>structurizr</module> --><!-- Artiifact not found -->
-				<!-- <module>Twitter4J</module> --><!-- Test failure -->
+				<module>Twitter4J</module>
 				<module>wicket</module>
 				<module>xstream</module>
 				<module>cas/cas-secured-app</module>
diff --git a/spring-4/pom.xml b/spring-4/pom.xml
index cf10f64aa2..78939bba95 100644
--- a/spring-4/pom.xml
+++ b/spring-4/pom.xml
@@ -71,10 +71,8 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <flips-web.version>1.0.1</flips-web.version>
         <lombok.version>1.16.18</lombok.version>
-        <java.version>1.8</java.version>
         <h2database.version>1.4.197</h2database.version>
     </properties>
 
diff --git a/spring-boot-jasypt/pom.xml b/spring-boot-jasypt/pom.xml
index 212f524da6..de0df92678 100644
--- a/spring-boot-jasypt/pom.xml
+++ b/spring-boot-jasypt/pom.xml
@@ -5,7 +5,6 @@
 
     <groupId>com.example.jasypt</groupId>
     <artifactId>spring-boot-jasypt</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>spring-boot-jasypt</name>
     <description>Demo project for Spring Boot</description>
@@ -52,9 +51,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <jasypt.version>2.0.0</jasypt.version>
     </properties>
 
diff --git a/spring-boot-logging-log4j2/disabling-console-logging/disabling-console-jul/pom.xml b/spring-boot-logging-log4j2/disabling-console-logging/disabling-console-jul/pom.xml
index c4f9b12676..c3bad74352 100644
--- a/spring-boot-logging-log4j2/disabling-console-logging/disabling-console-jul/pom.xml
+++ b/spring-boot-logging-log4j2/disabling-console-logging/disabling-console-jul/pom.xml
@@ -1,15 +1,13 @@
 <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>
-    <version>0.0.1-SNAPSHOT</version>
     <artifactId>disabling-console-jul</artifactId>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.4.RELEASE</version>
-    </parent>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>disabling-console-logging</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
 
     <dependencies>
         <dependency>
@@ -45,9 +43,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
 </project>
\ No newline at end of file
diff --git a/spring-boot-logging-log4j2/disabling-console-logging/disabling-console-log4j2/pom.xml b/spring-boot-logging-log4j2/disabling-console-logging/disabling-console-log4j2/pom.xml
index 97d10c574a..f9b34ec7d9 100644
--- a/spring-boot-logging-log4j2/disabling-console-logging/disabling-console-log4j2/pom.xml
+++ b/spring-boot-logging-log4j2/disabling-console-logging/disabling-console-log4j2/pom.xml
@@ -1,49 +1,42 @@
 <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>
-    <version>0.0.1-SNAPSHOT</version>
-    <artifactId>disabling-console-log4j2</artifactId>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.4.RELEASE</version>
-    </parent>
+	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>disabling-console-log4j2</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-        </dependency>
-    </dependencies>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>disabling-console-logging</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j2</artifactId>
+		</dependency>
+	</dependencies>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-logging-log4j2/disabling-console-logging/pom.xml b/spring-boot-logging-log4j2/disabling-console-logging/pom.xml
index bc248e49b2..39a4a40f12 100644
--- a/spring-boot-logging-log4j2/disabling-console-logging/pom.xml
+++ b/spring-boot-logging-log4j2/disabling-console-logging/pom.xml
@@ -1,8 +1,6 @@
 <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>
-    <version>0.0.1-SNAPSHOT</version>
-    <groupId>com.baeldung</groupId>
     <artifactId>disabling-console-logging</artifactId>
     <packaging>pom</packaging>
     <description>Projects for Disabling Spring Boot Console Logging tutorials</description>
diff --git a/spring-boot-logging-log4j2/pom.xml b/spring-boot-logging-log4j2/pom.xml
index ee4d07c3e8..7caf1e8690 100644
--- a/spring-boot-logging-log4j2/pom.xml
+++ b/spring-boot-logging-log4j2/pom.xml
@@ -3,9 +3,7 @@
     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>spring-boot-logging-log4j2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>Projects for Spring Boot Logging tutorials</description>
 
@@ -43,10 +41,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
 </project>
diff --git a/spring-boot-logging-log4j2/spring-boot-logging-log4j2-app/pom.xml b/spring-boot-logging-log4j2/spring-boot-logging-log4j2-app/pom.xml
index 1d4c8867fb..571794167e 100644
--- a/spring-boot-logging-log4j2/spring-boot-logging-log4j2-app/pom.xml
+++ b/spring-boot-logging-log4j2/spring-boot-logging-log4j2-app/pom.xml
@@ -3,9 +3,7 @@
     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>spring-boot-logging-log4j2-app</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>Demo project for Spring Boot Logging with Log4J2</description>
 
diff --git a/spring-boot-mvc/pom.xml b/spring-boot-mvc/pom.xml
index 9ca187db5d..d6751b9355 100644
--- a/spring-boot-mvc/pom.xml
+++ b/spring-boot-mvc/pom.xml
@@ -2,12 +2,10 @@
 <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>spring-boot-mvc</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>spring-boot-mvc</name>
-	<description>Demo project for Spring Boot</description>
+	<description>Module For Spring Boot MVC</description>
 
 	<parent>
         <artifactId>parent-boot-2</artifactId>
@@ -55,9 +53,6 @@
 	</build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
           <!-- ROME for RSS -->
         <rome.version>1.10.0</rome.version>
         <start-class>com.baeldung.springbootmvc.SpringBootMvcApplication</start-class>
diff --git a/spring-rest-embedded-tomcat/pom.xml b/spring-rest-embedded-tomcat/pom.xml
index 9f6eb0d703..3cbbf63d94 100644
--- a/spring-rest-embedded-tomcat/pom.xml
+++ b/spring-rest-embedded-tomcat/pom.xml
@@ -3,7 +3,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung.embedded</groupId>
     <artifactId>spring-rest-embedded-tomcat</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>spring-rest-embedded-tomcat</name>
     <packaging>war</packaging>
 
@@ -61,33 +60,8 @@
 
     </dependencies>
 
-    <build>
-        <finalName>spring-rest-embedded-tomcat</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <forkCount>3</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LongRunningUnitTest.java</exclude>
-                        <exclude>**/*ManualTest.java</exclude>
-                        <exclude>**/JdbcTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <jackson.library>2.9.2</jackson.library>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <servlet.version>4.0.0</servlet.version>
         <tomcat.version>9.0.1</tomcat.version>
         <httpclient.version>4.5.3</httpclient.version>
diff --git a/spring-rest-shell/pom.xml b/spring-rest-shell/pom.xml
index 2f7d1c8933..7a604946b6 100644
--- a/spring-rest-shell/pom.xml
+++ b/spring-rest-shell/pom.xml
@@ -2,9 +2,7 @@
 <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>spring-rest-shell</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>spring-rest-shell</name>
     <description>A simple project to demonstrate Spring REST Shell features.</description>
@@ -48,10 +46,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
 </project>
diff --git a/spring-security-openid/pom.xml b/spring-security-openid/pom.xml
index a2c0b6b119..4343996e02 100644
--- a/spring-security-openid/pom.xml
+++ b/spring-security-openid/pom.xml
@@ -3,9 +3,7 @@
     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>spring-security-openid</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>spring-security-openid</name>
     <description>Spring OpenID sample project</description>
diff --git a/spring-swagger-codegen/pom.xml b/spring-swagger-codegen/pom.xml
index d14dcc3176..8e551d850f 100644
--- a/spring-swagger-codegen/pom.xml
+++ b/spring-swagger-codegen/pom.xml
@@ -1,7 +1,6 @@
 <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>spring-swagger-codegen</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
diff --git a/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml b/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml
index 0f1cfa27ac..06a92ffae7 100644
--- a/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml
+++ b/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml
@@ -38,23 +38,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-
             <!-- attach test jar -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/spring-swagger-codegen/spring-swagger-codegen-app/pom.xml b/spring-swagger-codegen/spring-swagger-codegen-app/pom.xml
index 281ed59857..0fb5cf8e75 100644
--- a/spring-swagger-codegen/spring-swagger-codegen-app/pom.xml
+++ b/spring-swagger-codegen/spring-swagger-codegen-app/pom.xml
@@ -1,11 +1,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>spring-swagger-codegen-app</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-	
+    
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>spring-swagger-codegen</artifactId>
@@ -37,7 +34,6 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring-swagger-codegen-api-client.version>0.0.1-SNAPSHOT</spring-swagger-codegen-api-client.version>
 		<spring.version>1.5.10.RELEASE</spring.version>
     </properties>
diff --git a/spring-vertx/pom.xml b/spring-vertx/pom.xml
index 69a043ed01..790eeff128 100644
--- a/spring-vertx/pom.xml
+++ b/spring-vertx/pom.xml
@@ -3,9 +3,7 @@
     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>spring-vertx</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Spring Vertx</name>
     <description>A demo project with vertx spring integration</description>
@@ -57,31 +55,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <forkCount>3</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LongRunningUnitTest.java</exclude>
-                        <exclude>**/*ManualTest.java</exclude>
-                        <exclude>**/JdbcTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <vertx.version>3.4.1</vertx.version>
     </properties>
 
diff --git a/twilio/pom.xml b/twilio/pom.xml
index 8683192b5c..610cc04b60 100644
--- a/twilio/pom.xml
+++ b/twilio/pom.xml
@@ -2,11 +2,15 @@
 <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>twilio</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+	<parent>
+		<artifactId>parent-modules</artifactId>
+		<groupId>com.baeldung</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
     <dependencies>
         <dependency>
             <groupId>com.twilio.sdk</groupId>
@@ -15,9 +19,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
 </project>

From f96b4ed33b431da82ba5d9c9463a9b35b4d66804 Mon Sep 17 00:00:00 2001
From: vizsoro <zsolt.vicze@gmail.com>
Date: Sun, 16 Sep 2018 07:12:26 +0200
Subject: [PATCH 095/114] SpringBoot- service, controller, dao with JSF

---
 spring-boot-mvc/pom.xml                       | 26 ++++++++++
 .../jsfapplication/JsfApplication.java        | 31 ++++++++++++
 .../controller/JsfController.java             | 19 +++++++
 .../jsfapplication/model/Dao.java             | 17 +++++++
 .../jsfapplication/model/Todo.java            | 32 ++++++++++++
 .../jsfapplication/model/TodoDao.java         | 48 ++++++++++++++++++
 .../jsfapplication/service/TodoService.java   | 50 +++++++++++++++++++
 .../src/main/webapp/WEB-INF/faces-config.xml  |  9 ++++
 .../src/main/webapp/WEB-INF/web.xml           | 21 ++++++++
 spring-boot-mvc/src/main/webapp/index.xhtml   | 20 ++++++++
 spring-boot-mvc/src/main/webapp/todo.xhtml    | 38 ++++++++++++++
 11 files changed, 311 insertions(+)
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/JsfApplication.java
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/controller/JsfController.java
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/Dao.java
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/Todo.java
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/service/TodoService.java
 create mode 100644 spring-boot-mvc/src/main/webapp/WEB-INF/faces-config.xml
 create mode 100644 spring-boot-mvc/src/main/webapp/WEB-INF/web.xml
 create mode 100644 spring-boot-mvc/src/main/webapp/index.xhtml
 create mode 100644 spring-boot-mvc/src/main/webapp/todo.xhtml

diff --git a/spring-boot-mvc/pom.xml b/spring-boot-mvc/pom.xml
index e456155f36..bf90f8f57c 100644
--- a/spring-boot-mvc/pom.xml
+++ b/spring-boot-mvc/pom.xml
@@ -21,6 +21,32 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<!--JSF-->
+		<dependency>
+			<groupId>com.sun.faces</groupId>
+			<artifactId>jsf-api</artifactId>
+			<version>2.2.9</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-jasper</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.faces</groupId>
+			<artifactId>javax.faces-api</artifactId>
+			<version>2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.faces</groupId>
+			<artifactId>jsf-impl</artifactId>
+			<version>2.2.8-02</version>
+		</dependency>
+
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/JsfApplication.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/JsfApplication.java
new file mode 100644
index 0000000000..5b4250d5e3
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/JsfApplication.java
@@ -0,0 +1,31 @@
+package com.baeldung.springbootmvc.jsfapplication;
+
+import javax.faces.webapp.FacesServlet;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+
+import com.baeldung.springbootmvc.jsfapplication.controller.JsfController;
+import com.baeldung.springbootmvc.jsfapplication.model.TodoDao;
+import com.baeldung.springbootmvc.jsfapplication.service.TodoService;
+
+@SpringBootApplication
+@ComponentScan(basePackageClasses = { JsfController.class, TodoDao.class, TodoService.class })
+public class JsfApplication extends SpringBootServletInitializer {
+
+    public static void main(String[] args) {
+        SpringApplication.run(JsfApplication.class, args);
+    }
+
+    @Bean
+    public ServletRegistrationBean servletRegistrationBean() {
+        FacesServlet servlet = new FacesServlet();
+        ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(servlet, "*.jsf");
+        return servletRegistrationBean;
+    }
+
+}
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/controller/JsfController.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/controller/JsfController.java
new file mode 100644
index 0000000000..a9d21175c7
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/controller/JsfController.java
@@ -0,0 +1,19 @@
+package com.baeldung.springbootmvc.jsfapplication.controller;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Scope(value = "session")
+@Component(value = "jsfController")
+public class JsfController {
+
+    public String loadTodoPage() {
+        checkPermission();
+        return "/todo.xhtml";
+    }
+
+    private void checkPermission() {
+        // Details omitted
+    }
+
+}
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/Dao.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/Dao.java
new file mode 100644
index 0000000000..0b97c5a78e
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/Dao.java
@@ -0,0 +1,17 @@
+package com.baeldung.springbootmvc.jsfapplication.model;
+
+import java.util.Collection;
+import java.util.Optional;
+
+public interface Dao<T> {
+
+    Optional<T> get(int id);
+
+    Collection<T> getAll();
+
+    int save(T t);
+
+    void update(T t);
+
+    void delete(T t);
+}
\ No newline at end of file
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/Todo.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/Todo.java
new file mode 100644
index 0000000000..7aa8480f43
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/Todo.java
@@ -0,0 +1,32 @@
+package com.baeldung.springbootmvc.jsfapplication.model;
+
+public class Todo {
+
+    private int id;
+    private String message;
+    private int priority;
+	
+	public int getId() {
+		return id;
+	}
+	
+	public void setId(int id) {
+		this.id = id;
+	}
+	
+	public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public int getPriority() {
+        return priority;
+    }
+
+    public void setPriority(int priority) {
+        this.priority = priority;
+    }
+}
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java
new file mode 100644
index 0000000000..d33f5e5da0
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java
@@ -0,0 +1,48 @@
+package com.baeldung.springbootmvc.jsfapplication.model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class TodoDao implements Dao<Todo> {
+
+    private List<Todo> todoList = new ArrayList<>();
+    
+    @Override
+    public Optional<Todo> get(int id) {
+        return Optional.ofNullable(todoList.get(id));
+    }
+
+    @Override
+    public Collection<Todo> getAll() {
+        return Collections.unmodifiableCollection(todoList.stream()
+            .filter(Objects::nonNull)
+            .collect(Collectors.toList()));
+    }
+
+    @Override
+    public int save(Todo todo) {
+        todoList.add(todo);
+        int index = todoList.size() - 1;
+        todo.setId(index);
+        return index;
+    }
+
+    @Override
+    public void update(Todo todo) {
+        todoList.set(todo.getId(), todo);
+    }
+
+    @Override
+    public void delete(Todo todo) {
+        todoList.set(todo.getId(), null);
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/service/TodoService.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/service/TodoService.java
new file mode 100644
index 0000000000..89af3c66b9
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/service/TodoService.java
@@ -0,0 +1,50 @@
+package com.baeldung.springbootmvc.jsfapplication.service;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import com.baeldung.springbootmvc.jsfapplication.model.Dao;
+import com.baeldung.springbootmvc.jsfapplication.model.Todo;
+
+@Scope(value = "session")
+@Component(value = "todoService")
+public class TodoService {
+
+    @Autowired
+    private Dao<Todo> todoDao;
+    private Todo todo = new Todo();
+
+    public void save() {
+        todoDao.save(todo);
+        todo = new Todo();
+    }
+
+    public Collection<Todo> getAllTodo() {
+        return todoDao.getAll();
+    }
+
+    public Collection<Todo> getAllTodoSortedByPriority() {
+        return todoDao.getAll()
+            .stream()
+            .sorted(Comparator.comparingInt(Todo::getId))
+            .collect(Collectors.toList());
+    }
+
+    public int saveTodo(Todo todo) {
+        validate(todo);
+        return todoDao.save(todo);
+    }
+
+    private void validate(Todo todo) {
+        // Details omitted
+    }
+
+    public Todo getTodo() {
+        return todo;
+    }
+}
diff --git a/spring-boot-mvc/src/main/webapp/WEB-INF/faces-config.xml b/spring-boot-mvc/src/main/webapp/WEB-INF/faces-config.xml
new file mode 100644
index 0000000000..9e31a2e09d
--- /dev/null
+++ b/spring-boot-mvc/src/main/webapp/WEB-INF/faces-config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"
+	version="2.2">
+	<application>
+		<el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver</el-resolver>
+	</application>
+</faces-config>
\ No newline at end of file
diff --git a/spring-boot-mvc/src/main/webapp/WEB-INF/web.xml b/spring-boot-mvc/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..2690947a5a
--- /dev/null
+++ b/spring-boot-mvc/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+          http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	version="2.5">
+
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Faces Servlet</servlet-name>
+		<url-pattern>*.jsf</url-pattern>
+	</servlet-mapping>
+	<context-param>
+		<param-name>com.sun.faces.forceLoadConfiguration</param-name>
+		<param-value>true</param-value>
+	</context-param>
+</web-app>
\ No newline at end of file
diff --git a/spring-boot-mvc/src/main/webapp/index.xhtml b/spring-boot-mvc/src/main/webapp/index.xhtml
new file mode 100644
index 0000000000..40042b812c
--- /dev/null
+++ b/spring-boot-mvc/src/main/webapp/index.xhtml
@@ -0,0 +1,20 @@
+<f:view xmlns="http://www.w3c.org/1999/xhtml"
+        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html">
+    <h:head>
+        <meta charset="utf-8"/>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+        <title>TO-DO application</title>
+    </h:head>
+    <h:body>
+        <div>
+            <p>Welcome in the TO-DO application!</p>
+            <p style="height:50px">
+                This is a static message rendered from xhtml.
+                <h:form>
+                    <h:commandButton value="Load To-do page!" action="#{jsfController.loadTodoPage}" />
+                </h:form>
+            </p>
+        </div>
+    </h:body>
+</f:view>
\ No newline at end of file
diff --git a/spring-boot-mvc/src/main/webapp/todo.xhtml b/spring-boot-mvc/src/main/webapp/todo.xhtml
new file mode 100644
index 0000000000..426e101908
--- /dev/null
+++ b/spring-boot-mvc/src/main/webapp/todo.xhtml
@@ -0,0 +1,38 @@
+<f:view xmlns="http://www.w3c.org/1999/xhtml"
+        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:h="http://java.sun.com/jsf/html">
+    <h:head>
+        <meta charset="utf-8"/>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+        <title>TO-DO application</title>
+    </h:head>
+    <h:body>
+        <div>
+            <div>
+                List of TO-DO items
+            </div>
+            <h:dataTable value="#{todoService.allTodo}" var="item">
+                <h:column>
+                    <f:facet name="header"> Message</f:facet>
+                    #{item.message}
+                </h:column>
+                <h:column>
+                    <f:facet name="header"> Priority</f:facet>
+                    #{item.priority}
+                </h:column>
+            </h:dataTable>
+        </div>
+        <div>
+            <div>
+                Add new to-do item:
+            </div>
+            <h:form>
+                <h:outputLabel for="message" value="Message: "/>
+                <h:inputText id="message" value="#{todoService.todo.message}"/>
+                <h:outputLabel for="priority" value="Priority: "/>
+                <h:inputText id="priority" value="#{todoService.todo.priority}" converterMessage="Please enter digits only."/>
+                <h:commandButton value="Save" action="#{todoService.save}"/>
+            </h:form>
+        </div>
+    </h:body>
+</f:view>
\ No newline at end of file

From 5d7cc1174596ff801cda900c21599a68eda8f7b1 Mon Sep 17 00:00:00 2001
From: Mher Baghinyan <mbaghinyan@gmail.com>
Date: Sat, 22 Sep 2018 12:25:52 +0400
Subject: [PATCH 096/114] Bael 2053 (#5161)

* String performance class

* String intern performance

* String performance replace

* String performance concat

* String performance split

* String performance convert

* String performance comparison

* String performance ==

* String performance check length

* String performance

* String performance matches

* String performance hints

* String performance %d

* fixing benchmark tests

* String performance final

* method naming convention fix

* renaming class name

* remove loops
---
 java-strings/pom.xml                          |   5 +
 .../baeldung/string/StringPerformance.java    | 163 ++++++++++++++++++
 .../string/StringPerformanceHints.java        | 133 ++++++++++++++
 3 files changed, 301 insertions(+)
 create mode 100644 java-strings/src/main/java/com/baeldung/string/StringPerformance.java
 create mode 100644 java-strings/src/main/java/com/baeldung/string/StringPerformanceHints.java

diff --git a/java-strings/pom.xml b/java-strings/pom.xml
index 29e992a2ce..b1ba49b33a 100644
--- a/java-strings/pom.xml
+++ b/java-strings/pom.xml
@@ -47,6 +47,11 @@
             <artifactId>jmh-core</artifactId>
             <version>${jmh-core.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.ibm.icu</groupId>
             <artifactId>icu4j</artifactId>
diff --git a/java-strings/src/main/java/com/baeldung/string/StringPerformance.java b/java-strings/src/main/java/com/baeldung/string/StringPerformance.java
new file mode 100644
index 0000000000..4873bd320c
--- /dev/null
+++ b/java-strings/src/main/java/com/baeldung/string/StringPerformance.java
@@ -0,0 +1,163 @@
+package com.baeldung.string;
+
+import org.apache.commons.lang3.StringUtils;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.SingleShotTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Measurement(batchSize = 10000, iterations = 10)
+@Warmup(batchSize = 10000, iterations = 10)
+public class StringPerformance extends StringPerformanceHints {
+
+    @Benchmark
+    public String benchmarkStringDynamicConcat() {
+        return dynamicConcat();
+    }
+
+    @Benchmark
+    public StringBuilder  benchmarkStringBuilder() {
+        StringBuilder stringBuilder = new StringBuilder(result);
+        stringBuilder.append(baeldung);
+        return stringBuilder;
+    }
+
+    @Benchmark
+    public StringBuffer benchmarkStringBuffer() {
+        StringBuffer stringBuffer = new StringBuffer(result);
+        stringBuffer.append(baeldung);
+        return stringBuffer;
+    }
+
+    @Benchmark
+    public String benchmarkStringConstructor() {
+        return stringConstructor();
+    }
+
+    @Benchmark
+    public String benchmarkStringLiteral() {
+        return stringLiteral();
+    }
+
+    @Benchmark
+    public String benchmarkStringFormat_s() {
+        return stringFormat_s();
+    }
+
+    @Benchmark
+    public String benchmarkStringConcat() {
+        return stringConcat();
+    }
+
+    @Benchmark
+    public String benchmarkStringIntern() {
+        return stringIntern();
+    }
+
+    @Benchmark
+    public String benchmarkStringReplace() {
+        return longString.replace("average", " average !!!");
+    }
+
+    @Benchmark
+    public String benchmarkStringUtilsReplace() {
+        return StringUtils.replace(longString, "average", " average !!!");
+    }
+
+    @Benchmark
+    public List<String> benchmarkGuavaSplitter() {
+        return guavaSplitter();
+    }
+
+    @Benchmark
+    public String [] benchmarkStringSplit() {
+        return stringSplit();
+    }
+
+    @Benchmark
+    public String [] benchmarkStringSplitPattern() {
+        return stringSplitPattern();
+    }
+
+    @Benchmark
+    public List benchmarkStringTokenizer() {
+        return stringTokenizer();
+    }
+
+    @Benchmark
+    public List benchmarkStringIndexOf() {
+        return stringIndexOf();
+    }
+
+
+    @Benchmark
+    public String benchmarkIntegerToString() {
+        return stringIntegerToString();
+    }
+
+    @Benchmark
+    public String benchmarkStringValueOf() {
+        return stringValueOf();
+    }
+
+
+    @Benchmark
+    public String benchmarkStringConvertPlus() {
+        return stringConvertPlus();
+    }
+
+        @Benchmark
+    public String benchmarkStringFormat_d() {
+        return stringFormat_d();
+    }
+
+    @Benchmark
+    public boolean benchmarkStringEquals() {
+        return stringEquals();
+    }
+
+
+    @Benchmark
+    public boolean benchmarkStringEqualsIgnoreCase() {
+        return stringEqualsIgnoreCase();
+    }
+
+    @Benchmark
+    public boolean benchmarkStringMatches() {
+        return stringIsMatch();
+    }
+
+    @Benchmark
+    public boolean benchmarkPrecompiledMatches() {
+        return precompiledMatches();
+    }
+
+    @Benchmark
+    public int benchmarkStringCompareTo() {
+        return stringCompareTo();
+    }
+
+    @Benchmark
+    public boolean benchmarkStringIsEmpty() {
+        return stringIsEmpty();
+    }
+
+    @Benchmark
+    public boolean benchmarkStringLengthZero() {
+        return stringLengthZero();
+    }
+
+    public static void main(String[] args) throws Exception {
+        Options options = new OptionsBuilder()
+                .include(StringPerformance.class.getSimpleName()).threads(1)
+                .forks(1).shouldFailOnError(true)
+                .shouldDoGC(true)
+                .jvmArgs("-server").build();
+        new Runner(options).run();
+    }
+}
diff --git a/java-strings/src/main/java/com/baeldung/string/StringPerformanceHints.java b/java-strings/src/main/java/com/baeldung/string/StringPerformanceHints.java
new file mode 100644
index 0000000000..509222136f
--- /dev/null
+++ b/java-strings/src/main/java/com/baeldung/string/StringPerformanceHints.java
@@ -0,0 +1,133 @@
+package com.baeldung.string;
+
+import com.google.common.base.Splitter;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.regex.Pattern;
+
+@State(Scope.Thread)
+public class StringPerformanceHints {
+
+    protected String baeldung = "baeldung";
+    protected String longString = "Hello baeldung, I am a bit longer than other Strings";
+    protected String formatString = "hello %s, nice to meet you";
+    protected String formatDigit = "%d";
+    protected String emptyString = " ";
+    protected String result = "";
+
+    protected int sampleNumber = 100;
+
+    protected Pattern spacePattern = Pattern.compile(emptyString);
+    protected Pattern longPattern = Pattern.compile(longString);
+    protected List<String> stringSplit = new ArrayList<>();
+    protected List<String> stringTokenizer = new ArrayList<>();
+
+    protected String dynamicConcat() {
+        result += baeldung;
+        return result;
+    }
+
+    protected String stringConstructor() {
+        return new String(baeldung);
+    }
+
+    protected String stringLiteral() {
+        result = baeldung;
+        return result;
+    }
+
+    protected String stringFormat_s() {
+        return String.format(formatString, baeldung);
+    }
+
+    protected String stringFormat_d() {
+        return String.format(formatDigit, sampleNumber);
+    }
+
+    protected String stringConcat() {
+        result = result.concat(baeldung);
+        return result;
+    }
+
+    protected List stringTokenizer() {
+        StringTokenizer st = new StringTokenizer(longString);
+        while (st.hasMoreTokens()) {
+            stringTokenizer.add(st.nextToken());
+        }
+        return stringTokenizer;
+    }
+
+    protected List stringIndexOf() {
+        int pos = 0, end;
+        while ((end = longString.indexOf(' ', pos)) >= 0) {
+            stringSplit.add(longString.substring(pos, end));
+            pos = end + 1;
+        }
+        return stringSplit;
+    }
+
+    protected String stringIntegerToString() {
+        return Integer.toString(sampleNumber);
+    }
+
+    protected String stringValueOf() {
+        return String.valueOf(sampleNumber);
+    }
+
+
+    protected String stringConvertPlus() {
+        return sampleNumber + "";
+    }
+
+
+    protected boolean stringEquals() {
+        return longString.equals(baeldung);
+    }
+
+
+    protected boolean stringEqualsIgnoreCase() {
+        return longString.equalsIgnoreCase(baeldung);
+    }
+
+    protected boolean stringIsMatch() {
+        return longString.matches(baeldung);
+    }
+
+    protected boolean precompiledMatches() {
+        return longPattern.matcher(baeldung).matches();
+    }
+
+    protected int stringCompareTo() {
+        return longString.compareTo(baeldung);
+    }
+
+    protected boolean stringIsEmpty() {
+        return longString.isEmpty();
+    }
+
+    protected boolean stringLengthZero() {
+        return longString.length() == 0;
+    }
+
+    protected String [] stringSplitPattern() {
+        return spacePattern.split(longString, 0);
+    }
+
+    protected String [] stringSplit() {
+        return longString.split(emptyString);
+    }
+
+    protected List<String> guavaSplitter() {
+        return Splitter.on(" ").trimResults()
+                .omitEmptyStrings()
+                .splitToList(longString);
+    }
+
+    protected String stringIntern() {
+        return baeldung.intern();
+    }
+}

From d9724fc1536603bc550dc2e6f63bf93afd5cd39a Mon Sep 17 00:00:00 2001
From: Chirag Dewan <chirag.dewan@ericsson.com>
Date: Sat, 22 Sep 2018 15:22:06 +0530
Subject: [PATCH 097/114] BAEL-1426 Adding a message generator and updated Word
 Count Transactional App

---
 .../kafka/TransactionalMessageProducer.java   | 56 +++++++++++++++++++
 ...alApp.java => TransactionalWordCount.java} | 39 +++++++------
 .../main/java/com/baeldung/kafka/Tuple.java   | 24 ++++++++
 3 files changed, 101 insertions(+), 18 deletions(-)
 create mode 100644 libraries/src/main/java/com/baeldung/kafka/TransactionalMessageProducer.java
 rename libraries/src/main/java/com/baeldung/kafka/{TransactionalApp.java => TransactionalWordCount.java} (66%)
 create mode 100644 libraries/src/main/java/com/baeldung/kafka/Tuple.java

diff --git a/libraries/src/main/java/com/baeldung/kafka/TransactionalMessageProducer.java b/libraries/src/main/java/com/baeldung/kafka/TransactionalMessageProducer.java
new file mode 100644
index 0000000000..15488bbaf4
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/kafka/TransactionalMessageProducer.java
@@ -0,0 +1,56 @@
+package com.baeldung.kafka;
+
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.KafkaException;
+
+import java.util.Properties;
+import java.util.stream.Stream;
+
+import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.TRANSACTIONAL_ID_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
+
+public class TransactionalMessageProducer {
+
+    private static final String DATA_MESSAGE_1 = "Put any space separated data here for count";
+    private static final String DATA_MESSAGE_2 = "Output will contain count of every word in the message";
+
+    public static void main(String[] args) {
+
+        KafkaProducer<String, String> producer = createKafkaProducer();
+
+        producer.initTransactions();
+
+        try{
+
+            producer.beginTransaction();
+
+            Stream.of(DATA_MESSAGE_1, DATA_MESSAGE_2).forEach(s -> producer.send(
+                    new ProducerRecord<String, String>("input", null, s)));
+
+            producer.commitTransaction();
+
+        }catch (KafkaException e){
+
+            producer.abortTransaction();
+
+        }
+
+    }
+
+    private static KafkaProducer<String, String> createKafkaProducer() {
+
+        Properties props = new Properties();
+        props.put(BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+        props.put(ENABLE_IDEMPOTENCE_CONFIG, "true");
+        props.put(TRANSACTIONAL_ID_CONFIG, "prod-0");
+        props.put(KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+        props.put(VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+
+        return new KafkaProducer(props);
+
+    }
+}
diff --git a/libraries/src/main/java/com/baeldung/kafka/TransactionalApp.java b/libraries/src/main/java/com/baeldung/kafka/TransactionalWordCount.java
similarity index 66%
rename from libraries/src/main/java/com/baeldung/kafka/TransactionalApp.java
rename to libraries/src/main/java/com/baeldung/kafka/TransactionalWordCount.java
index 1e95041a0d..0563ba6684 100644
--- a/libraries/src/main/java/com/baeldung/kafka/TransactionalApp.java
+++ b/libraries/src/main/java/com/baeldung/kafka/TransactionalWordCount.java
@@ -14,6 +14,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static java.time.Duration.ofSeconds;
 import static java.util.Collections.singleton;
@@ -21,16 +23,16 @@ import static org.apache.kafka.clients.consumer.ConsumerConfig.*;
 import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG;
 import static org.apache.kafka.clients.producer.ProducerConfig.*;
 
-public class TransactionalApp {
+public class TransactionalWordCount {
 
-    private static final String CONSUMER_GROUP_ID = "test";
+    private static final String CONSUMER_GROUP_ID = "my-group-id";
     private static final String OUTPUT_TOPIC = "output";
     private static final String INPUT_TOPIC = "input";
 
     public static void main(String[] args) {
 
-        KafkaConsumer<String, String> consumer = initConsumer();
-        KafkaProducer<String, String> producer = initProducer();
+        KafkaConsumer<String, String> consumer = createKafkaConsumer();
+        KafkaProducer<String, String> producer = createKafkaProducer();
 
         producer.initTransactions();
 
@@ -38,12 +40,17 @@ public class TransactionalApp {
 
             while (true) {
 
-                ConsumerRecords<String, String> records = consumer.poll(ofSeconds(20));
+                ConsumerRecords<String, String> records = consumer.poll(ofSeconds(60));
+
+                Map<String, Integer> wordCountMap = records.records(new TopicPartition(INPUT_TOPIC, 0))
+                        .stream()
+                        .flatMap(record -> Stream.of(record.value().split(" ")))
+                        .map(word -> Tuple.of(word, 1))
+                        .collect(Collectors.toMap(tuple -> tuple.getKey(), t1 -> t1.getValue(), (v1, v2) -> v1 + v2));
 
                 producer.beginTransaction();
 
-                for (ConsumerRecord record : records)
-                    producer.send(new ProducerRecord(OUTPUT_TOPIC, record));
+                wordCountMap.forEach((key, value) -> producer.send(new ProducerRecord<String, String>(OUTPUT_TOPIC, key, value.toString())));
 
                 Map<TopicPartition, OffsetAndMetadata> offsetsToCommit = new HashMap<>();
 
@@ -51,7 +58,7 @@ public class TransactionalApp {
                     List<ConsumerRecord<String, String>> partitionedRecords = records.records(partition);
                     long offset = partitionedRecords.get(partitionedRecords.size() - 1).offset();
 
-                    offsetsToCommit.put(partition, new OffsetAndMetadata(offset));
+                    offsetsToCommit.put(partition, new OffsetAndMetadata(offset + 1));
                 }
 
                 producer.sendOffsetsToTransaction(offsetsToCommit, CONSUMER_GROUP_ID);
@@ -68,11 +75,12 @@ public class TransactionalApp {
 
     }
 
-    private static KafkaConsumer<String, String> initConsumer() {
+    private static KafkaConsumer<String, String> createKafkaConsumer() {
         Properties props = new Properties();
         props.put(BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
         props.put(GROUP_ID_CONFIG, CONSUMER_GROUP_ID);
         props.put(ENABLE_AUTO_COMMIT_CONFIG, "false");
+        props.put(ISOLATION_LEVEL_CONFIG, "read_committed");
         props.put(KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
         props.put(VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
 
@@ -81,19 +89,14 @@ public class TransactionalApp {
         return consumer;
     }
 
-    private static KafkaProducer<String, String> initProducer() {
+    private static KafkaProducer<String, String> createKafkaProducer() {
 
         Properties props = new Properties();
-        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
-        props.put(ACKS_CONFIG, "all");
-        props.put(RETRIES_CONFIG, 3);
-        props.put(BATCH_SIZE_CONFIG, 16384);
-        props.put(LINGER_MS_CONFIG, 1);
-        props.put(BUFFER_MEMORY_CONFIG, 33554432);
+        props.put(BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
         props.put(ENABLE_IDEMPOTENCE_CONFIG, "true");
         props.put(TRANSACTIONAL_ID_CONFIG, "prod-1");
-        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
-        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+        props.put(KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+        props.put(VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
 
         return new KafkaProducer(props);
 
diff --git a/libraries/src/main/java/com/baeldung/kafka/Tuple.java b/libraries/src/main/java/com/baeldung/kafka/Tuple.java
new file mode 100644
index 0000000000..883de4ba21
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/kafka/Tuple.java
@@ -0,0 +1,24 @@
+package com.baeldung.kafka;
+
+public class Tuple {
+
+    private String key;
+    private Integer value;
+
+    private Tuple(String key, Integer value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public static Tuple of(String key, Integer value){
+        return new Tuple(key,value);
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

From 31a8f2a4eccaaaa9758b295cad5c028dd7bb2f51 Mon Sep 17 00:00:00 2001
From: vizsoro <zsolt.vicze@gmail.com>
Date: Sat, 22 Sep 2018 12:11:09 +0200
Subject: [PATCH 098/114] version change in web.xml

---
 spring-boot-mvc/src/main/webapp/WEB-INF/web.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-mvc/src/main/webapp/WEB-INF/web.xml b/spring-boot-mvc/src/main/webapp/WEB-INF/web.xml
index 2690947a5a..e0cd4d8850 100644
--- a/spring-boot-mvc/src/main/webapp/WEB-INF/web.xml
+++ b/spring-boot-mvc/src/main/webapp/WEB-INF/web.xml
@@ -2,8 +2,8 @@
 <web-app xmlns="http://java.sun.com/xml/ns/javaee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-          http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
+          http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
 
 	<servlet>
 		<servlet-name>Faces Servlet</servlet-name>

From 91ea35ee387324346156e3711cb6a4e196d3654e Mon Sep 17 00:00:00 2001
From: mherbaghinyan <mbaghinyan@gmail.com>
Date: Sat, 22 Sep 2018 21:15:03 +0400
Subject: [PATCH 099/114] review changes

---
 .../java/com/baeldung/sort/SortHashMap.java   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
index f7ea2f655b..38eddc6cf3 100644
--- a/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
+++ b/core-java-collections/src/main/java/com/baeldung/sort/SortHashMap.java
@@ -21,12 +21,15 @@ public class SortHashMap {
         arrayListSortByValue();
         arrayListSortByKey();
 
-        treeSetByKey();
-        treeSetByValue();
-
         sortStream();
 
         sortGuava();
+
+        addDuplicates();
+
+        treeSetByKey();
+        treeSetByValue();
+
     }
 
     private static void sortGuava() {
@@ -63,10 +66,7 @@ public class SortHashMap {
         TreeMap<String, Employee> sorted = new TreeMap<>(map);
         sorted.putAll(map);
 
-        for (Map.Entry<String, Employee> entry : sorted.entrySet()) {
-            System.out.println("Key = " + entry.getKey() +
-                    ", Value = " + entry.getValue());
-        }
+        sorted.entrySet().forEach(System.out::println);
 
     }
 
@@ -94,4 +94,11 @@ public class SortHashMap {
         Employee employee4 = new Employee(2L, "George");
         map.put(employee4.getName(), employee4);
     }
+
+    private static void addDuplicates() {
+        Employee employee5 = new Employee(1L, "Mher");
+        map.put(employee5.getName(), employee5);
+        Employee employee6 = new Employee(22L, "Annie");
+        map.put(employee6.getName(), employee6);
+    }
 }

From d1ee152d6c44877804b76a8fe8fe6303d6cf9972 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sat, 22 Sep 2018 20:29:17 +0300
Subject: [PATCH 100/114] fix start of spring-boot-mvc

---
 .../nosuchbeandefinitionexception/BeanA.java                 | 2 +-
 .../com/baeldung/nosuchbeandefinitionexception/BeanB.java    | 5 +++++
 .../NoSuchBeanDefinitionDemoApp.java                         | 2 +-
 .../springbootmvc/nosuchbeandefinitionexception/BeanB.java   | 5 -----
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename spring-boot-mvc/src/main/java/com/baeldung/{springbootmvc => }/nosuchbeandefinitionexception/BeanA.java (72%)
 create mode 100644 spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/BeanB.java
 rename spring-boot-mvc/src/main/java/com/baeldung/{springbootmvc => }/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java (82%)
 delete mode 100644 spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanB.java

diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanA.java b/spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/BeanA.java
similarity index 72%
rename from spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanA.java
rename to spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/BeanA.java
index 21d7007917..030216b747 100644
--- a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanA.java
+++ b/spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/BeanA.java
@@ -1,4 +1,4 @@
-package com.baeldung.springbootmvc.nosuchbeandefinitionexception;
+package com.baeldung.nosuchbeandefinitionexception;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/BeanB.java b/spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/BeanB.java
new file mode 100644
index 0000000000..f0cc263504
--- /dev/null
+++ b/spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/BeanB.java
@@ -0,0 +1,5 @@
+package com.baeldung.nosuchbeandefinitionexception;
+
+public class BeanB {
+
+}
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java b/spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java
similarity index 82%
rename from spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java
rename to spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java
index 01d19437c5..8709cf85ac 100644
--- a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java
+++ b/spring-boot-mvc/src/main/java/com/baeldung/nosuchbeandefinitionexception/NoSuchBeanDefinitionDemoApp.java
@@ -1,4 +1,4 @@
-package com.baeldung.springbootmvc.nosuchbeandefinitionexception;
+package com.baeldung.nosuchbeandefinitionexception;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanB.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanB.java
deleted file mode 100644
index 3dd72aacc6..0000000000
--- a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/nosuchbeandefinitionexception/BeanB.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.baeldung.springbootmvc.nosuchbeandefinitionexception;
-
-public class BeanB {
-
-}

From 74a6d38d24252cb74327e837e8ca266d46ae240f Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sat, 22 Sep 2018 21:09:23 +0300
Subject: [PATCH 101/114] fix for zip empty dir

---
 .../src/main/java/com/baeldung/zip/ZipDirectory.java       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core-java-io/src/main/java/com/baeldung/zip/ZipDirectory.java b/core-java-io/src/main/java/com/baeldung/zip/ZipDirectory.java
index 7da71a093d..42147b07db 100644
--- a/core-java-io/src/main/java/com/baeldung/zip/ZipDirectory.java
+++ b/core-java-io/src/main/java/com/baeldung/zip/ZipDirectory.java
@@ -24,6 +24,13 @@ public class ZipDirectory {
             return;
         }
         if (fileToZip.isDirectory()) {
+            if (fileName.endsWith("/")) {
+                zipOut.putNextEntry(new ZipEntry(fileName));
+                zipOut.closeEntry();
+            } else {
+                zipOut.putNextEntry(new ZipEntry(fileName + "/"));
+                zipOut.closeEntry();
+            }
             final File[] children = fileToZip.listFiles();
             for (final File childFile : children) {
                 zipFile(childFile, fileName + "/" + childFile.getName(), zipOut);

From 38027c56b4f200b2f641dbf115d260d127fddca6 Mon Sep 17 00:00:00 2001
From: rozagerardo <rozagerardo@gmail.com>
Date: Sat, 22 Sep 2018 18:10:33 -0300
Subject: [PATCH 102/114] [BAEL-2115] spring-cloud | Configuring Netflix
 Archaius (#5289)

*  added examples for archaius:
* dynamodb
* jdbc
configurations

*  added archaius zookeeper config

* small fixes, removed dependency that was already provided by another library, and changed property value to match project name
---
 .../dynamodb-config/pom.xml                   | 47 +++++++++++++++
 .../DynamoSourcesApplication.java             | 12 ++++
 .../ApplicationPropertiesConfigurations.java  | 52 +++++++++++++++++
 .../config/DynamoDbConfiguration.java         | 46 +++++++++++++++
 .../ConfigPropertiesController.java           | 32 ++++++++++
 .../dynamodb/ArchaiusProperties.java          | 23 ++++++++
 .../ArchaiusPropertiesRepository.java         |  7 +++
 .../src/main/resources/application.properties |  6 ++
 .../ArchaiusDynamoDbLiveTest.java             | 53 +++++++++++++++++
 .../spring-cloud-archaius/jdbc-config/pom.xml | 30 ++++++++++
 .../jdbconfig/JdbcSourcesApplication.java     | 13 +++++
 .../ApplicationPropertiesConfigurations.java  | 27 +++++++++
 .../ConfigPropertiesController.java           | 32 ++++++++++
 .../archaius/jdbconfig/jdbc/Properties.java   | 14 +++++
 .../src/main/resources/application.properties |  4 ++
 .../jdbc-config/src/main/resources/data.sql   |  5 ++
 .../jdbconfig/ArchaiusJDBCSourceLiveTest.java | 53 +++++++++++++++++
 spring-cloud/spring-cloud-archaius/pom.xml    |  3 +
 .../zookeeper-config/pom.xml                  | 48 +++++++++++++++
 .../ZookeeperConfigApplication.java           | 12 ++++
 .../config/ZookeeperConfigsInitializer.java   | 58 +++++++++++++++++++
 .../ConfigPropertiesController.java           | 51 ++++++++++++++++
 .../src/main/resources/application.properties |  4 ++
 .../ArchaiusZookeeperLiveTest.java            | 53 +++++++++++++++++
 24 files changed, 685 insertions(+)
 create mode 100644 spring-cloud/spring-cloud-archaius/dynamodb-config/pom.xml
 create mode 100644 spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java
 create mode 100644 spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java
 create mode 100644 spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java
 create mode 100644 spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java
 create mode 100644 spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java
 create mode 100644 spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java
 create mode 100644 spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties
 create mode 100644 spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java
 create mode 100644 spring-cloud/spring-cloud-archaius/jdbc-config/pom.xml
 create mode 100644 spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java
 create mode 100644 spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java
 create mode 100644 spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java
 create mode 100644 spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java
 create mode 100644 spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties
 create mode 100644 spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql
 create mode 100644 spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java
 create mode 100644 spring-cloud/spring-cloud-archaius/zookeeper-config/pom.xml
 create mode 100644 spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java
 create mode 100644 spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java
 create mode 100644 spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java
 create mode 100644 spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties
 create mode 100644 spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java

diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/pom.xml b/spring-cloud/spring-cloud-archaius/dynamodb-config/pom.xml
new file mode 100644
index 0000000000..3ffbf8f619
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/dynamodb-config/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+    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>dynamodb-config</artifactId>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-archaius</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-dynamodb</artifactId>
+            <version>${aws.sdk.dynamo.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.derjust</groupId>
+            <artifactId>spring-data-dynamodb</artifactId>
+            <version>${spring.dynamo.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.archaius</groupId>
+            <artifactId>archaius-aws</artifactId>
+            <version>${archaius.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <aws.sdk.dynamo.version>1.11.407</aws.sdk.dynamo.version>
+        <spring.dynamo.version>5.0.3</spring.dynamo.version>
+        <archaius.version>0.7.6</archaius.version>
+    </properties>
+</project>
diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java
new file mode 100644
index 0000000000..ee08f2b1fb
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.spring.cloud.archaius.dynamosources;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DynamoSourcesApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(DynamoSourcesApplication.class, args);
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java
new file mode 100644
index 0000000000..7b533e8021
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java
@@ -0,0 +1,52 @@
+package com.baeldung.spring.cloud.archaius.dynamosources.config;
+
+import java.util.Arrays;
+
+import org.apache.commons.configuration.AbstractConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;
+import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
+import com.amazonaws.services.dynamodbv2.util.TableUtils;
+import com.baeldung.spring.cloud.archaius.dynamosources.dynamodb.ArchaiusProperties;
+import com.baeldung.spring.cloud.archaius.dynamosources.dynamodb.ArchaiusPropertiesRepository;
+import com.netflix.config.DynamicConfiguration;
+import com.netflix.config.FixedDelayPollingScheduler;
+import com.netflix.config.PolledConfigurationSource;
+import com.netflix.config.sources.DynamoDbConfigurationSource;
+
+@Configuration
+public class ApplicationPropertiesConfigurations {
+
+    @Autowired
+    AmazonDynamoDB amazonDynamoDb;
+
+    @Autowired
+    private ArchaiusPropertiesRepository repository;
+
+    @Bean
+    public AbstractConfiguration addApplicationPropertiesSource() {
+        // Normally, the DB Table would be already created and populated.
+        // In this case, we'll do it just before creating the archaius config source that uses it
+        initDatabase();
+        PolledConfigurationSource source = new DynamoDbConfigurationSource(amazonDynamoDb);
+        return new DynamicConfiguration(source, new FixedDelayPollingScheduler());
+    }
+
+    private void initDatabase() {
+        // Create the table
+        DynamoDBMapper mapper = new DynamoDBMapper(amazonDynamoDb);
+        CreateTableRequest tableRequest = mapper.generateCreateTableRequest(ArchaiusProperties.class);
+        tableRequest.setProvisionedThroughput(new ProvisionedThroughput(1L, 1L));
+        TableUtils.createTableIfNotExists(amazonDynamoDb, tableRequest);
+
+        // Populate the table
+        ArchaiusProperties property = new ArchaiusProperties("baeldung.archaius.properties.one", "one FROM:dynamoDB");
+        ArchaiusProperties property3 = new ArchaiusProperties("baeldung.archaius.properties.three", "three FROM:dynamoDB");
+        repository.saveAll(Arrays.asList(property, property3));
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java
new file mode 100644
index 0000000000..8f12051a7f
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java
@@ -0,0 +1,46 @@
+package com.baeldung.spring.cloud.archaius.dynamosources.config;
+
+import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
+
+@Configuration
+@EnableDynamoDBRepositories(basePackages = "com.baeldung.spring.cloud.archaius.dynamosources.dynamodb")
+public class DynamoDbConfiguration {
+
+    @Value("${amazon.dynamodb.endpoint}")
+    private String amazonDynamoDBEndpoint;
+
+    @Value("${aws.accessKeyId}")
+    private String amazonDynamoDBAccessKeyId;
+
+    @Value("${aws.secretKey}")
+    private String amazonDynamoDBSecretKey;
+
+    @Bean
+    public AmazonDynamoDB amazonDynamoDB() {
+        AmazonDynamoDB amazonDynamoDB = AmazonDynamoDBClientBuilder.standard()
+            .withCredentials(amazonAWSCredentials())
+            .withEndpointConfiguration(setupEndpointConfiguration())
+            .build();
+
+        return amazonDynamoDB;
+    }
+
+    private AWSCredentialsProvider amazonAWSCredentials() {
+        return new AWSStaticCredentialsProvider(new BasicAWSCredentials(amazonDynamoDBAccessKeyId, amazonDynamoDBSecretKey));
+    }
+
+    private EndpointConfiguration setupEndpointConfiguration() {
+        return new EndpointConfiguration(amazonDynamoDBEndpoint, Regions.DEFAULT_REGION.getName());
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java
new file mode 100644
index 0000000000..2ac5055fe3
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java
@@ -0,0 +1,32 @@
+package com.baeldung.spring.cloud.archaius.dynamosources.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicStringProperty;
+
+@RestController
+public class ConfigPropertiesController {
+
+    private DynamicStringProperty propertyOneWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.one", "not found!");
+
+    private DynamicStringProperty propertyTwoWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.two", "not found!");
+    
+    private DynamicStringProperty propertyThreeWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.three", "not found!");
+
+    @GetMapping("/properties-from-dynamic")
+    public Map<String, String> getPropertiesFromDynamic() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put(propertyOneWithDynamic.getName(), propertyOneWithDynamic.get());
+        properties.put(propertyTwoWithDynamic.getName(), propertyTwoWithDynamic.get());
+        properties.put(propertyThreeWithDynamic.getName(), propertyThreeWithDynamic.get());
+        return properties;
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java
new file mode 100644
index 0000000000..016f8433cf
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java
@@ -0,0 +1,23 @@
+package com.baeldung.spring.cloud.archaius.dynamosources.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@DynamoDBTable(tableName = "archaiusProperties")
+public class ArchaiusProperties {
+
+    @DynamoDBHashKey
+    @DynamoDBAttribute
+    private String key;
+
+    @DynamoDBAttribute
+    private String value;
+}
diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java
new file mode 100644
index 0000000000..fbcc953261
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java
@@ -0,0 +1,7 @@
+package com.baeldung.spring.cloud.archaius.dynamosources.dynamodb;
+
+import org.springframework.data.repository.CrudRepository;
+
+public interface ArchaiusPropertiesRepository extends CrudRepository<ArchaiusProperties, String> {
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties
new file mode 100644
index 0000000000..3823d2685f
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+server.port=8082
+baeldung.archaius.properties.one=one FROM:application.properties
+baeldung.archaius.properties.two=two FROM:application.properties
+amazon.dynamodb.endpoint=http://localhost:8000/
+aws.accessKeyId=key
+aws.secretKey=key2
diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java
new file mode 100644
index 0000000000..3802cb99cd
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.spring.cloud.archaius.dynamosources;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class ArchaiusDynamoDbLiveTest {
+
+    private static final String BASE_URL = "http://localhost:8082";
+
+    private static final String DYNAMIC_PROPERTIES_URL = "/properties-from-dynamic";
+    private static final Map<String, String> EXPECTED_ARCHAIUS_PROPERTIES = createExpectedArchaiusProperties();
+
+    private static Map<String, String> createExpectedArchaiusProperties() {
+        Map<String, String> map = new HashMap<>();
+        map.put("baeldung.archaius.properties.one", "one FROM:dynamoDB");
+        map.put("baeldung.archaius.properties.two", "two FROM:application.properties");
+        map.put("baeldung.archaius.properties.three", "three FROM:dynamoDB");
+        return map;
+    }
+
+    @Autowired
+    ConfigurableApplicationContext context;
+
+    @Autowired
+    private TestRestTemplate template;
+
+    private <T> Map<T, T> exchangeAsMap(String uri, ParameterizedTypeReference<Map<T, T>> responseType) {
+        return template.exchange(uri, HttpMethod.GET, null, responseType)
+            .getBody();
+    }
+
+    @Test
+    public void givenNonDefaultConfigurationFilesSetup_whenRequestProperties_thenEndpointRetrievesValuesInFiles() {
+        Map<String, String> initialResponse = this.exchangeAsMap(BASE_URL + DYNAMIC_PROPERTIES_URL, new ParameterizedTypeReference<Map<String, String>>() {
+        });
+
+        assertThat(initialResponse).containsAllEntriesOf(EXPECTED_ARCHAIUS_PROPERTIES);
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/pom.xml b/spring-cloud/spring-cloud-archaius/jdbc-config/pom.xml
new file mode 100644
index 0000000000..bb283576d8
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/jdbc-config/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+    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>jdbc-config</artifactId>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-archaius</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java
new file mode 100644
index 0000000000..ee7beec87b
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.spring.cloud.archaius.jdbconfig;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class JdbcSourcesApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(JdbcSourcesApplication.class, args);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java
new file mode 100644
index 0000000000..f3eed0c2b5
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java
@@ -0,0 +1,27 @@
+package com.baeldung.spring.cloud.archaius.jdbconfig.config;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.configuration.AbstractConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.netflix.config.DynamicConfiguration;
+import com.netflix.config.FixedDelayPollingScheduler;
+import com.netflix.config.PolledConfigurationSource;
+import com.netflix.config.sources.JDBCConfigurationSource;
+
+@Configuration
+public class ApplicationPropertiesConfigurations {
+
+    @Autowired
+    DataSource h2DataSource;
+
+    @Bean
+    public AbstractConfiguration addApplicationPropertiesSource() {
+        PolledConfigurationSource source = new JDBCConfigurationSource(h2DataSource, "select distinct key, value from properties", "key", "value");
+        return new DynamicConfiguration(source, new FixedDelayPollingScheduler());
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java
new file mode 100644
index 0000000000..a793f39b29
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java
@@ -0,0 +1,32 @@
+package com.baeldung.spring.cloud.archaius.jdbconfig.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicStringProperty;
+
+@RestController
+public class ConfigPropertiesController {
+
+    private DynamicStringProperty propertyOneWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.one", "not found!");
+
+    private DynamicStringProperty propertyTwoWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.two", "not found!");
+
+    private DynamicStringProperty propertyThreeWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.three", "not found!");
+
+    @GetMapping("/properties-from-dynamic")
+    public Map<String, String> getPropertiesFromDynamic() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put(propertyOneWithDynamic.getName(), propertyOneWithDynamic.get());
+        properties.put(propertyTwoWithDynamic.getName(), propertyTwoWithDynamic.get());
+        properties.put(propertyThreeWithDynamic.getName(), propertyThreeWithDynamic.get());
+        return properties;
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java
new file mode 100644
index 0000000000..cc2783b506
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java
@@ -0,0 +1,14 @@
+package com.baeldung.spring.cloud.archaius.jdbconfig.jdbc;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class Properties {    
+
+    @Id
+    private String key;
+    
+    @SuppressWarnings("unused")
+    private String value;
+}
diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties
new file mode 100644
index 0000000000..eca873f897
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+server.port=8082
+baeldung.archaius.properties.one=one FROM:application.properties
+baeldung.archaius.properties.two=two FROM:application.properties
+spring.h2.console.enabled=true
diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql
new file mode 100644
index 0000000000..eb80126d48
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql
@@ -0,0 +1,5 @@
+insert into properties
+values('baeldung.archaius.properties.one', 'one FROM:jdbc_source');
+
+insert into properties
+values('baeldung.archaius.properties.three', 'three FROM:jdbc_source');
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java b/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java
new file mode 100644
index 0000000000..91d5f5754e
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.spring.cloud.archaius.jdbconfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class ArchaiusJDBCSourceLiveTest {
+
+    private static final String BASE_URL = "http://localhost:8082";
+
+    private static final String DYNAMIC_PROPERTIES_URL = "/properties-from-dynamic";
+    private static final Map<String, String> EXPECTED_ARCHAIUS_PROPERTIES = createExpectedArchaiusProperties();
+
+    private static Map<String, String> createExpectedArchaiusProperties() {
+        Map<String, String> map = new HashMap<>();
+        map.put("baeldung.archaius.properties.one", "one FROM:jdbc_source");
+        map.put("baeldung.archaius.properties.two", "two FROM:application.properties");
+        map.put("baeldung.archaius.properties.three", "three FROM:jdbc_source");
+        return map;
+    }
+
+    @Autowired
+    ConfigurableApplicationContext context;
+
+    @Autowired
+    private TestRestTemplate template;
+
+    private <T> Map<T, T> exchangeAsMap(String uri, ParameterizedTypeReference<Map<T, T>> responseType) {
+        return template.exchange(uri, HttpMethod.GET, null, responseType)
+            .getBody();
+    }
+
+    @Test
+    public void givenNonDefaultConfigurationFilesSetup_whenRequestProperties_thenEndpointRetrievesValuesInFiles() {
+        Map<String, String> initialResponse = this.exchangeAsMap(BASE_URL + DYNAMIC_PROPERTIES_URL, new ParameterizedTypeReference<Map<String, String>>() {
+        });
+
+        assertThat(initialResponse).containsAllEntriesOf(EXPECTED_ARCHAIUS_PROPERTIES);
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/pom.xml b/spring-cloud/spring-cloud-archaius/pom.xml
index cd102f86cd..fd3e34e463 100644
--- a/spring-cloud/spring-cloud-archaius/pom.xml
+++ b/spring-cloud/spring-cloud-archaius/pom.xml
@@ -21,6 +21,9 @@
         <module>basic-config</module>
         <module>additional-sources-simple</module>
         <module>extra-configs</module>
+        <module>jdbc-config</module>
+        <module>dynamodb-config</module>
+        <module>zookeeper-config</module>
     </modules>
 
     <dependencies>
diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/pom.xml b/spring-cloud/spring-cloud-archaius/zookeeper-config/pom.xml
new file mode 100644
index 0000000000..8f8ec99ad8
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/zookeeper-config/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+    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>zookeeper-config</artifactId>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-archaius</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zookeeper-config</artifactId>
+            <version>${cloud.zookeeper.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>${zookeeper.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <cloud.zookeeper.version>2.0.0.RELEASE</cloud.zookeeper.version>
+        <zookeeper.version>3.4.13</zookeeper.version>
+    </properties>
+</project>
diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java
new file mode 100644
index 0000000000..12119e3e29
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.spring.cloud.archaius.zookeeperconfig;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ZookeeperConfigApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ZookeeperConfigApplication.class, args);
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java
new file mode 100644
index 0000000000..59ef10aaf7
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java
@@ -0,0 +1,58 @@
+package com.baeldung.spring.cloud.archaius.zookeeperconfig.config;
+
+import org.apache.curator.framework.CuratorFramework;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * 
+ * Ideally, we wouldn't need to initialize the zookeeper config values.
+ * Here we do it to verify that configurations are being retrieved.
+ *
+ */
+@Component
+public class ZookeeperConfigsInitializer {
+
+    private static final String CONFIG_BASE_NODE_PATH = "/config";
+    private static final String APPLICATION_BASE_NODE_PATH = CONFIG_BASE_NODE_PATH + "/application";
+
+    @Autowired
+    CuratorFramework client;
+
+    @EventListener
+    public void appReady(ApplicationReadyEvent event) throws Exception {
+        String pathOne = APPLICATION_BASE_NODE_PATH + "/baeldung.archaius.properties.one";
+        String valueOne = "one FROM:zookeeper";
+        String pathThree = APPLICATION_BASE_NODE_PATH + "/baeldung.archaius.properties.three";
+        String valueThree = "three FROM:zookeeper";
+        createBaseNodes();
+        setValue(pathOne, valueOne);
+        setValue(pathThree, valueThree);
+    }
+
+    private void setValue(String path, String value) throws Exception {
+        if (client.checkExists()
+            .forPath(path) == null) {
+            client.create()
+                .forPath(path, value.getBytes());
+        } else {
+            client.setData()
+                .forPath(path, value.getBytes());
+        }
+    }
+
+    private void createBaseNodes() throws Exception {
+        if (client.checkExists()
+            .forPath(CONFIG_BASE_NODE_PATH) == null) {
+            client.create()
+                .forPath(CONFIG_BASE_NODE_PATH);
+        }
+        if (client.checkExists()
+            .forPath(APPLICATION_BASE_NODE_PATH) == null) {
+            client.create()
+                .forPath(APPLICATION_BASE_NODE_PATH);
+        }
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java
new file mode 100644
index 0000000000..c8a5e53ee4
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java
@@ -0,0 +1,51 @@
+package com.baeldung.spring.cloud.archaius.zookeeperconfig.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicStringProperty;
+
+@RestController
+public class ConfigPropertiesController {
+    
+    @Value("${baeldung.archaius.properties.one:not found!}")
+    private String propertyOneWithValue;
+
+    @Value("${baeldung.archaius.properties.two:not found!}")
+    private String propertyTwoWithValue;
+
+    @Value("${baeldung.archaius.properties.three:not found!}")
+    private String propertyThreeWithValue;
+
+    private DynamicStringProperty propertyOneWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.one", "not found!");
+
+    private DynamicStringProperty propertyTwoWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.two", "not found!");
+    
+    private DynamicStringProperty propertyThreeWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.three", "not found!");
+
+    @GetMapping("/properties-from-dynamic")
+    public Map<String, String> getPropertiesFromDynamic() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put(propertyOneWithDynamic.getName(), propertyOneWithDynamic.get());
+        properties.put(propertyTwoWithDynamic.getName(), propertyTwoWithDynamic.get());
+        properties.put(propertyThreeWithDynamic.getName(), propertyThreeWithDynamic.get());
+        return properties;
+    }
+    
+    @GetMapping("/properties-from-value")
+    public Map<String, String> getPropertiesFromValue() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("baeldung.archaius.properties.one", propertyOneWithValue);
+        properties.put("baeldung.archaius.properties.two", propertyTwoWithValue);
+        properties.put("baeldung.archaius.properties.three", propertyThreeWithValue);
+        return properties;
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties
new file mode 100644
index 0000000000..91ad18a932
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+server.port=8082
+baeldung.archaius.properties.one=one FROM:application.properties
+baeldung.archaius.properties.two=two FROM:application.properties
+spring.application.name=zookeeper-config
diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java
new file mode 100644
index 0000000000..ff4358cb8f
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.spring.cloud.archaius.zookeeperconfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class ArchaiusZookeeperLiveTest {
+
+    private static final String BASE_URL = "http://localhost:8082";
+
+    private static final String DYNAMIC_PROPERTIES_URL = "/properties-from-dynamic";
+    private static final Map<String, String> EXPECTED_ARCHAIUS_PROPERTIES = createExpectedArchaiusProperties();
+
+    private static Map<String, String> createExpectedArchaiusProperties() {
+        Map<String, String> map = new HashMap<>();
+        map.put("baeldung.archaius.properties.one", "one FROM:zookeeper");
+        map.put("baeldung.archaius.properties.two", "two FROM:application.properties");
+        map.put("baeldung.archaius.properties.three", "three FROM:zookeeper");
+        return map;
+    }
+
+    @Autowired
+    ConfigurableApplicationContext context;
+
+    @Autowired
+    private TestRestTemplate template;
+
+    private <T> Map<T, T> exchangeAsMap(String uri, ParameterizedTypeReference<Map<T, T>> responseType) {
+        return template.exchange(uri, HttpMethod.GET, null, responseType)
+            .getBody();
+    }
+
+    @Test
+    public void givenNonDefaultConfigurationFilesSetup_whenRequestProperties_thenEndpointRetrievesValuesInFiles() {
+        Map<String, String> initialResponse = this.exchangeAsMap(BASE_URL + DYNAMIC_PROPERTIES_URL, new ParameterizedTypeReference<Map<String, String>>() {
+        });
+
+        assertThat(initialResponse).containsAllEntriesOf(EXPECTED_ARCHAIUS_PROPERTIES);
+    }
+}

From 991d6937f17b7d7eca0b81d09996b75d20203da6 Mon Sep 17 00:00:00 2001
From: bungrudi <30967151+bungrudi@users.noreply.github.com>
Date: Sun, 23 Sep 2018 11:41:55 +0700
Subject: [PATCH 103/114] Bael-1043 - introduction to protonpack (#5243)

* BAEL-1043

* update protonpack version

* import static Arrays.stream
---
 java-streams/pom.xml                          |   2 +-
 .../protonpack/ProtonpackUnitTest.java        | 209 ++++++++++++++++++
 2 files changed, 210 insertions(+), 1 deletion(-)
 create mode 100644 java-streams/src/test/java/com/baeldung/protonpack/ProtonpackUnitTest.java

diff --git a/java-streams/pom.xml b/java-streams/pom.xml
index 023a5f695b..e4670c268d 100644
--- a/java-streams/pom.xml
+++ b/java-streams/pom.xml
@@ -105,7 +105,7 @@
         <commons-lang3.version>3.5</commons-lang3.version>
         <lombok.version>1.16.12</lombok.version>
         <vavr.version>0.9.0</vavr.version>
-        <protonpack.version>1.13</protonpack.version>
+        <protonpack.version>1.15</protonpack.version>
         <streamex.version>0.6.5</streamex.version>
         <joda.version>2.10</joda.version>
         <!-- testing -->
diff --git a/java-streams/src/test/java/com/baeldung/protonpack/ProtonpackUnitTest.java b/java-streams/src/test/java/com/baeldung/protonpack/ProtonpackUnitTest.java
new file mode 100644
index 0000000000..1b64c8924a
--- /dev/null
+++ b/java-streams/src/test/java/com/baeldung/protonpack/ProtonpackUnitTest.java
@@ -0,0 +1,209 @@
+package com.baeldung.protonpack;
+
+import com.codepoetics.protonpack.Indexed;
+import com.codepoetics.protonpack.StreamUtils;
+import com.codepoetics.protonpack.collectors.CollectorUtils;
+import com.codepoetics.protonpack.collectors.NonUniqueValueException;
+import com.codepoetics.protonpack.selectors.Selector;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.util.Arrays.asList;
+import static java.util.Arrays.stream;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+@SuppressWarnings("unchecked")
+public class ProtonpackUnitTest {
+    @Test
+    public void whenTakeWhile_thenTakenWhile() {
+        Stream<Integer> streamOfInt = Stream.iterate(1, i -> i + 1);
+        List<Integer> result = StreamUtils.takeWhile(streamOfInt, i -> i < 5).collect(Collectors.toList());
+        assertThat(result).contains(1, 2, 3, 4);
+    }
+
+    @Test
+    public void whenTakeUntil_thenTakenUntil() {
+        Stream<Integer> streamOfInt = Stream.iterate(1, i -> i + 1);
+        List<Integer> result = StreamUtils.takeUntil(streamOfInt, i -> i > 50).collect(Collectors.toList());
+        assertThat(result).contains(10, 20, 30, 40);
+    }
+
+    @Test
+    public void givenMultipleStream_whenZipped_thenZipped() {
+        String[] clubs = { "Juventus", "Barcelona", "Liverpool", "PSG" };
+        String[] players = { "Ronaldo", "Messi", "Salah" };
+        Set<String> zippedFrom2Sources = StreamUtils.zip(stream(clubs), stream(players), (club, player) -> club + " " + player)
+            .collect(Collectors.toSet());
+        assertThat(zippedFrom2Sources).contains("Juventus Ronaldo", "Barcelona Messi", "Liverpool Salah");
+
+        String[] leagues = { "Serie A", "La Liga", "Premier League" };
+        Set<String> zippedFrom3Sources = StreamUtils.zip(stream(clubs), stream(players), stream(leagues),
+            (club, player, league) -> club + " " + player + " " + league).collect(Collectors.toSet());
+        assertThat(zippedFrom3Sources).contains("Juventus Ronaldo Serie A", "Barcelona Messi La Liga",
+            "Liverpool Salah Premier League");
+    }
+
+    @Test
+    public void whenZippedWithIndex_thenZippedWithIndex() {
+        Stream<String> streamOfClubs = Stream.of("Juventus", "Barcelona", "Liverpool");
+        Set<Indexed<String>> zipsWithIndex = StreamUtils.zipWithIndex(streamOfClubs).collect(Collectors.toSet());
+        assertThat(zipsWithIndex).contains(Indexed.index(0, "Juventus"), Indexed.index(1, "Barcelona"),
+            Indexed.index(2, "Liverpool"));
+    }
+
+    @Test
+    public void givenMultipleStream_whenMerged_thenMerged() {
+        Stream<String> streamOfClubs = Stream.of("Juventus", "Barcelona", "Liverpool", "PSG");
+        Stream<String> streamOfPlayers = Stream.of("Ronaldo", "Messi", "Salah");
+        Stream<String> streamOfLeagues = Stream.of("Serie A", "La Liga", "Premier League");
+
+        Set<String> merged = StreamUtils.merge(() -> "", (valOne, valTwo) -> valOne + " " + valTwo, streamOfClubs,
+            streamOfPlayers, streamOfLeagues).collect(Collectors.toSet());
+
+        assertThat(merged).contains(" Juventus Ronaldo Serie A", " Barcelona Messi La Liga", " Liverpool Salah Premier League",
+            " PSG");
+    }
+
+    @Test
+    public void givenMultipleStream_whenMergedToList_thenMergedToList() {
+        Stream<String> streamOfClubs = Stream.of("Juventus", "Barcelona", "PSG");
+        Stream<String> streamOfPlayers = Stream.of("Ronaldo", "Messi");
+
+        List<List<String>> mergedListOfList = StreamUtils.mergeToList(streamOfClubs, streamOfPlayers)
+            .collect(Collectors.toList());
+        assertThat(mergedListOfList.get(0)).isInstanceOf(List.class);
+        assertThat(mergedListOfList.get(0)).containsExactly("Juventus", "Ronaldo");
+        assertThat(mergedListOfList.get(1)).containsExactly("Barcelona", "Messi");
+        assertThat(mergedListOfList.get(2)).containsExactly("PSG");
+    }
+
+    @Test
+    public void givenMultipleStream_whenInterleaved_thenInterleaved() {
+        Stream<String> streamOfClubs = Stream.of("Juventus", "Barcelona", "Liverpool");
+        Stream<String> streamOfPlayers = Stream.of("Ronaldo", "Messi");
+        Stream<String> streamOfLeagues = Stream.of("Serie A", "La Liga");
+
+        AtomicInteger counter = new AtomicInteger(0);
+        Selector roundRobinSelector = (o) -> {
+            Object[] vals = (Object[]) o;
+            while (counter.get() >= vals.length || vals[counter.get()] == null) {
+                if (counter.incrementAndGet() >= vals.length)
+                    counter.set(0);
+            }
+            return counter.getAndIncrement();
+        };
+        Stream<String> interleavedStream = StreamUtils.interleave(roundRobinSelector, streamOfClubs, streamOfPlayers,
+            streamOfLeagues);
+        List<String> interleavedList = interleavedStream.collect(Collectors.toList());
+        assertThat(interleavedList).containsExactly("Juventus", "Ronaldo", "Serie A", "Barcelona", "Messi", "La Liga",
+            "Liverpool");
+    }
+
+    @Test
+    public void whenSkippedUntil_thenSkippedUntil() {
+        Integer[] numbers = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+        List<Integer> skippedUntilGreaterThan5 = StreamUtils.skipUntil(stream(numbers), i -> i > 5).collect(Collectors.toList());
+        assertThat(skippedUntilGreaterThan5).containsExactly(6, 7, 8, 9, 10);
+
+        List<Integer> skippedUntilLessThanEquals5 = StreamUtils.skipUntil(stream(numbers), i -> i <= 5)
+            .collect(Collectors.toList());
+        assertThat(skippedUntilLessThanEquals5).containsExactly(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void whenSkippedWhile_thenSkippedWhile() {
+        Integer[] numbers = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+        List<Integer> skippedWhileLessThanEquals5 = StreamUtils.skipWhile(stream(numbers), i -> i <= 5)
+            .collect(Collectors.toList());
+        assertThat(skippedWhileLessThanEquals5).containsExactly(6, 7, 8, 9, 10);
+
+        List<Integer> skippedWhileGreaterThan5 = StreamUtils.skipWhile(stream(numbers), i -> i > 5).collect(Collectors.toList());
+        assertThat(skippedWhileGreaterThan5).containsExactly(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void givenFibonacciGenerator_whenUnfolded_thenUnfolded() {
+        AtomicInteger lastValue = new AtomicInteger(0);
+        Function<Integer, Optional<Integer>> fibonacciGenerator = (i) -> (i < 10) ?
+            Optional.of(i + lastValue.getAndSet(i)) :
+            Optional.empty();
+
+        List<Integer> fib = StreamUtils.unfold(1, fibonacciGenerator).collect(Collectors.toList());
+        assertThat(fib).containsExactly(1, 1, 2, 3, 5, 8, 13);
+    }
+
+    @Test
+    public void whenWindowed_thenWindowed() {
+        Integer[] numbers = { 1, 2, 3, 4, 5, 6, 7 };
+
+        List<List<Integer>> windowedWithSkip1 = StreamUtils.windowed(stream(numbers), 3, 1).collect(Collectors.toList());
+        assertThat(windowedWithSkip1).containsExactly(asList(1, 2, 3), asList(2, 3, 4), asList(3, 4, 5), asList(4, 5, 6),
+            asList(5, 6, 7));
+
+        List<List<Integer>> windowedWithSkip2 = StreamUtils.windowed(stream(numbers), 3, 2).collect(Collectors.toList());
+        assertThat(windowedWithSkip2).containsExactly(asList(1, 2, 3), asList(3, 4, 5), asList(5, 6, 7));
+    }
+
+    @Test
+    public void whenAggregated_thenAggregated() {
+        Integer[] numbers = { 1, 2, 2, 3, 4, 4, 4, 5 };
+        List<List<Integer>> aggregated = StreamUtils.aggregate(stream(numbers), (int1, int2) -> int1.compareTo(int2) == 0)
+            .collect(Collectors.toList());
+        assertThat(aggregated).containsExactly(asList(1), asList(2, 2), asList(3), asList(4, 4, 4), asList(5));
+
+        List<List<Integer>> aggregatedFixSize = StreamUtils.aggregate(stream(numbers), 5).collect(Collectors.toList());
+        assertThat(aggregatedFixSize).containsExactly(asList(1, 2, 2, 3, 4), asList(4, 4, 5));
+    }
+
+    @Test
+    public void whenGroupedRun_thenGroupedRun() {
+        Integer[] numbers = { 1, 1, 2, 3, 4, 4, 5 };
+        List<List<Integer>> grouped = StreamUtils.groupRuns(stream(numbers)).collect(Collectors.toList());
+        assertThat(grouped).containsExactly(asList(1, 1), asList(2), asList(3), asList(4, 4), asList(5));
+
+        Integer[] numbers2 = { 1, 2, 3, 1 };
+        List<List<Integer>> grouped2 = StreamUtils.groupRuns(stream(numbers2)).collect(Collectors.toList());
+        assertThat(grouped2).containsExactly(asList(1), asList(2), asList(3), asList(1));
+    }
+
+    @Test
+    public void whenAggregatedOnListCondition_thenAggregatedOnListCondition() {
+        Integer[] numbers = { 1, 1, 2, 3, 4, 4, 5 };
+        Stream<List<Integer>> aggregated = StreamUtils.aggregateOnListCondition(stream(numbers),
+            (currentList, nextInt) -> currentList.stream().mapToInt(Integer::intValue).sum() + nextInt <= 5);
+        assertThat(aggregated).containsExactly(asList(1, 1, 2), asList(3), asList(4), asList(4), asList(5));
+    }
+
+    @Test
+    public void givenProjectionFunction_whenMaxedBy_thenMaxedBy() {
+        Stream<String> clubs = Stream.of("Juventus", "Barcelona", "PSG");
+        Optional<String> longestName = clubs.collect(CollectorUtils.maxBy(String::length));
+        assertThat(longestName.get()).isEqualTo("Barcelona");
+    }
+
+    @Test
+    public void givenStreamOfMultipleElem_whenUniqueCollector_thenValueReturned() {
+        Stream<Integer> singleElement = Stream.of(1);
+        Optional<Integer> unique = singleElement.collect(CollectorUtils.unique());
+        assertThat(unique.get()).isEqualTo(1);
+
+    }
+
+    @Test
+    public void givenStreamOfMultipleElem_whenUniqueCollector_thenExceptionThrown() {
+        Stream<Integer> multipleElement = Stream.of(1, 2, 3);
+        assertThatExceptionOfType(NonUniqueValueException.class).isThrownBy(() -> {
+            multipleElement.collect(CollectorUtils.unique());
+        });
+    }
+
+}

From 5e8076dddd04673f23695d1789f61de2e6a9f1fa Mon Sep 17 00:00:00 2001
From: myluckagain <myluckagain@gmail.com>
Date: Sun, 23 Sep 2018 08:43:20 +0300
Subject: [PATCH 104/114] BAEL-2182 (#5257)

* BAEL-2182

* refactoring
---
 .../switchstatement/SwitchStatement.java      | 70 +++++++++++++++++++
 .../SwitchStatementUnitTest.java              | 38 ++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/switchstatement/SwitchStatement.java
 create mode 100644 core-java/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java

diff --git a/core-java/src/main/java/com/baeldung/switchstatement/SwitchStatement.java b/core-java/src/main/java/com/baeldung/switchstatement/SwitchStatement.java
new file mode 100644
index 0000000000..69e151bfcb
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/switchstatement/SwitchStatement.java
@@ -0,0 +1,70 @@
+package com.baeldung.switchstatement;
+
+public class SwitchStatement {
+
+    public String exampleOfIF(String animal) {
+
+        String result;
+
+        if (animal.equals("DOG") || animal.equals("CAT")) {
+            result = "domestic animal";
+        } else if (animal.equals("TIGER")) {
+            result = "wild animal";
+        } else {
+            result = "unknown animal";
+        }
+        return result;
+    }
+
+    public String exampleOfSwitch(String animal) {
+
+        String result;
+
+        switch (animal) {
+        case "DOG":
+        case "CAT":
+            result = "domestic animal";
+            break;
+        case "TIGER":
+            result = "wild animal";
+            break;
+        default:
+            result = "unknown animal";
+            break;
+        }
+        return result;
+    }
+
+    public String forgetBreakInSwitch(String animal) {
+
+        String result;
+
+        switch (animal) {
+
+        case "DOG":
+            System.out.println("domestic animal");
+            result = "domestic animal";
+
+        default:
+            System.out.println("unknown animal");
+            result = "unknown animal";
+
+        }
+        return result;
+    }
+
+    public String constantCaseValue(String animal) {
+
+        String result = "";
+
+        final String dog = "DOG";
+
+        switch (animal) {
+
+        case dog:
+            result = "domestic animal";
+        }
+        return result;
+    }
+
+}
diff --git a/core-java/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java b/core-java/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java
new file mode 100644
index 0000000000..e8ac645531
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/switchstatement/SwitchStatementUnitTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.switchstatement;
+
+import org.junit.Test;
+
+import org.junit.Assert;
+
+public class SwitchStatementUnitTest {
+    private SwitchStatement s = new SwitchStatement();
+
+    
+    @Test
+    public void whenDog_thenDomesticAnimal() {
+        
+        String animal = "DOG";
+        Assert.assertEquals("domestic animal", s.exampleOfSwitch(animal));
+    }
+    
+    @Test
+    public void whenNoBreaks_thenGoThroughBlocks() {
+        String animal = "DOG";
+        Assert.assertEquals("unknown animal", s.forgetBreakInSwitch(animal));
+    }
+    
+    @Test(expected=NullPointerException.class)
+    public void whenSwitchAgumentIsNull_thenNullPointerException() {
+        String animal = null;
+        Assert.assertEquals("domestic animal", s.exampleOfSwitch(animal));
+    }
+    
+       
+    @Test
+    public void whenCompareStrings_thenByEqual() {
+        String animal = new String("DOG");
+        Assert.assertEquals("domestic animal", s.exampleOfSwitch(animal));
+    }
+    
+  
+}

From 7adf284a38ae9f67af870effa896d1f68afb6c04 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 23 Sep 2018 11:33:01 +0300
Subject: [PATCH 105/114] fix maven war plugin, edit readme

---
 spring-security-mvc-socket/README.md | 7 +++++++
 spring-security-mvc-socket/pom.xml   | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/spring-security-mvc-socket/README.md b/spring-security-mvc-socket/README.md
index 828d9a3448..e99555e7fa 100644
--- a/spring-security-mvc-socket/README.md
+++ b/spring-security-mvc-socket/README.md
@@ -1,3 +1,10 @@
+To build the project, run the command: mvn clean install. This will build a war file in the target folder that you can deploye on a server like Tomcat.
+
+Alternatively, run the project from an IDE.
+
+To login, use credentials from the data.sql file in src/main/resource, eg: user/password.
+
+
 ### Relevant Articles: 
 - [Intro to Security and WebSockets](http://www.baeldung.com/spring-security-websockets)
 - [Spring WebSockets: Specific User Chat](http://www.baeldung.com/spring-websocket-specific-user-chat)
\ No newline at end of file
diff --git a/spring-security-mvc-socket/pom.xml b/spring-security-mvc-socket/pom.xml
index b7559753b5..ade24d8f7b 100644
--- a/spring-security-mvc-socket/pom.xml
+++ b/spring-security-mvc-socket/pom.xml
@@ -151,7 +151,7 @@
     </dependencies>
 
     <build>
-        <pluginManagement>
+      
             <plugins>
                 <plugin>
                     <groupId>org.apache.tomcat.maven</groupId>
@@ -171,7 +171,6 @@
                     </configuration>
                 </plugin>
             </plugins>
-        </pluginManagement>
         <finalName>spring-security-mvc-socket</finalName>
     </build>
 

From 7d4b0d161075501b215952456a63139d040038dc Mon Sep 17 00:00:00 2001
From: Alfonso Lentini <valenzise.alfonso@gmail.com>
Date: Sun, 23 Sep 2018 12:29:23 +0200
Subject: [PATCH 106/114] ScribeJava

---
 libraries-security/pom.xml                    | 22 ++++++-
 .../scribejava/ScribejavaApplication.java     | 15 +++++
 .../com/baeldung/scribejava/api/MyApi.java    | 27 +++++++++
 .../controller/GoogleController.java          | 49 ++++++++++++++++
 .../controller/TwitterController.java         | 57 +++++++++++++++++++
 .../scribejava/controller/UserController.java | 46 +++++++++++++++
 .../scribejava/oauth/AuthServiceConfig.java   | 45 +++++++++++++++
 .../scribejava/oauth/WebSecurityConfig.java   | 53 +++++++++++++++++
 .../scribejava/service/GoogleService.java     | 31 ++++++++++
 .../scribejava/service/MyService.java         | 29 ++++++++++
 .../scribejava/service/TwitterService.java    | 29 ++++++++++
 .../src/main/resources/application.properties |  1 +
 .../ScribejavaApplicationTests.java           | 16 ++++++
 13 files changed, 418 insertions(+), 2 deletions(-)
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/ScribejavaApplication.java
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/controller/GoogleController.java
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/controller/UserController.java
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/oauth/AuthServiceConfig.java
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/oauth/WebSecurityConfig.java
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/service/GoogleService.java
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/service/MyService.java
 create mode 100644 libraries-security/src/main/java/com/baeldung/scribejava/service/TwitterService.java
 create mode 100644 libraries-security/src/main/resources/application.properties
 create mode 100644 libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaApplicationTests.java

diff --git a/libraries-security/pom.xml b/libraries-security/pom.xml
index 8f8506172f..0b7cddb885 100644
--- a/libraries-security/pom.xml
+++ b/libraries-security/pom.xml
@@ -8,12 +8,30 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-boot-1</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-1</relativePath>
     </parent>
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth</groupId>
+            <artifactId>spring-security-oauth2</artifactId>
+            <version>2.3.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.scribejava</groupId>
+            <artifactId>scribejava-apis</artifactId>
+            <version>5.6.0</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/ScribejavaApplication.java b/libraries-security/src/main/java/com/baeldung/scribejava/ScribejavaApplication.java
new file mode 100644
index 0000000000..bb86c497b0
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/ScribejavaApplication.java
@@ -0,0 +1,15 @@
+package com.baeldung.scribejava;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+@SpringBootApplication
+public class ScribejavaApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ScribejavaApplication.class, args);
+    }
+
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java b/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java
new file mode 100644
index 0000000000..577e753c07
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java
@@ -0,0 +1,27 @@
+package com.baeldung.scribejava.api;
+
+import com.github.scribejava.core.builder.api.DefaultApi20;
+
+public class MyApi extends DefaultApi20 {
+
+    public MyApi() {
+    }
+
+    private static class InstanceHolder {
+        private static final MyApi INSTANCE = new MyApi();
+    }
+
+    public static MyApi instance() {
+        return InstanceHolder.INSTANCE;
+    }
+
+    @Override
+    public String getAccessTokenEndpoint() {
+        return "http://localhost:8080/oauth/token";
+    }
+
+    @Override
+    protected String getAuthorizationBaseUrl() {
+        return null;
+    }
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/controller/GoogleController.java b/libraries-security/src/main/java/com/baeldung/scribejava/controller/GoogleController.java
new file mode 100644
index 0000000000..ffe4f0cc8a
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/controller/GoogleController.java
@@ -0,0 +1,49 @@
+package com.baeldung.scribejava.controller;
+
+import com.baeldung.scribejava.service.GoogleService;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Response;
+import com.github.scribejava.core.model.Verb;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+public class GoogleController {
+
+    @Autowired
+    private GoogleService service;
+
+
+    @GetMapping(value ="/me/google")
+    public void me(HttpServletResponse response){
+        String auth = service.getService().getAuthorizationUrl();
+
+        response.setHeader("Location", auth);
+        response.setStatus(302);
+
+    }
+
+    @GetMapping(value = "/auth/google")
+    public String google(@RequestParam String code, HttpServletResponse servletResponse){
+
+        try {
+            OAuth2AccessToken token = service.getService().getAccessToken(code);
+
+            OAuthRequest request = new OAuthRequest(Verb.GET, "https://www.googleapis.com/oauth2/v1/userinfo?alt=json");
+            service.getService().signRequest(token, request);
+            Response response = service.getService().execute(request);
+            return response.getBody();
+
+        }catch (Exception e){
+            servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+        return null;
+    }
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java b/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
new file mode 100644
index 0000000000..bfcd6d960c
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
@@ -0,0 +1,57 @@
+package com.baeldung.scribejava.controller;
+
+import com.baeldung.scribejava.service.TwitterService;
+import com.github.scribejava.core.model.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Scanner;
+import java.util.concurrent.ExecutionException;
+
+@RestController
+public class TwitterController {
+
+    @Autowired
+    private TwitterService service;
+
+
+    @GetMapping(value ="/me/twitter")
+    public String me(HttpServletResponse servletResponse){
+        try {
+            OAuth1RequestToken requestToken = service.getService().getRequestToken();
+
+            String auth = service.getService().getAuthorizationUrl(requestToken);
+
+            Runtime runtime = Runtime.getRuntime();
+            try {
+                runtime.exec("rundll32 url.dll,FileProtocolHandler " + auth);
+            } catch (IOException e) {
+                servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+                return null;
+            }
+
+            System.out.println("Insert twitter code:");
+            Scanner in = new Scanner(System.in);
+
+            String oauthverifier = in.nextLine();
+
+            final OAuth1AccessToken accessToken = service.getService().getAccessToken(requestToken,oauthverifier);
+
+            OAuthRequest request = new OAuthRequest(Verb.GET, "https://api.twitter.com/1.1/account/verify_credentials.json");
+            service.getService().signRequest(accessToken, request);
+            Response response = service.getService().execute(request);
+            return response.getBody();
+
+        } catch (IOException | InterruptedException | ExecutionException e) {
+            servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+        return null;
+    }
+
+
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/controller/UserController.java b/libraries-security/src/main/java/com/baeldung/scribejava/controller/UserController.java
new file mode 100644
index 0000000000..68a11250de
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/controller/UserController.java
@@ -0,0 +1,46 @@
+package com.baeldung.scribejava.controller;
+
+import com.baeldung.scribejava.service.MyService;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Response;
+import com.github.scribejava.core.model.Verb;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.Principal;
+
+@RestController(value = "/user")
+public class UserController {
+
+    @Autowired
+    private MyService service;
+
+    @GetMapping("/me/myapi")
+    public String me(@RequestParam String username, @RequestParam String password, HttpServletResponse responsehttp) {
+
+        try {
+            OAuth2AccessToken token = service.getService().getAccessTokenPasswordGrant(username, password);
+
+            OAuthRequest request = new OAuthRequest(Verb.GET, "http://localhost:8080/me");
+            service.getService().signRequest(token, request);
+            Response response = service.getService().execute(request);
+
+            return response.getBody();
+
+        } catch (Exception e) {
+            responsehttp.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+        return null;
+
+    }
+
+    @GetMapping("/me")
+    public Principal user(Principal principal) {
+        return principal;
+    }
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/oauth/AuthServiceConfig.java b/libraries-security/src/main/java/com/baeldung/scribejava/oauth/AuthServiceConfig.java
new file mode 100644
index 0000000000..2c7162399b
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/oauth/AuthServiceConfig.java
@@ -0,0 +1,45 @@
+package com.baeldung.scribejava.oauth;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
+import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
+import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
+
+
+@Configuration
+@EnableAuthorizationServer
+public class AuthServiceConfig extends AuthorizationServerConfigurerAdapter {
+
+    @Autowired
+    @Qualifier("authenticationManagerBean")
+    private AuthenticationManager authenticationManager;
+
+    @Override
+    public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception {
+        oauthServer.tokenKeyAccess("permitAll()")
+                .checkTokenAccess("isAuthenticated()");
+    }
+
+    @Override
+    public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
+        clients.inMemory()
+                .withClient("baeldung_api_key")
+                .secret("baeldung_api_secret")
+                .authorizedGrantTypes("password","refresh_token")
+                .scopes("read","write").autoApprove(true);
+    }
+
+    @Override
+    public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception {
+        endpoints
+                .authenticationManager(authenticationManager)
+                .allowedTokenEndpointRequestMethods(HttpMethod.GET, HttpMethod.POST);
+    }
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/oauth/WebSecurityConfig.java b/libraries-security/src/main/java/com/baeldung/scribejava/oauth/WebSecurityConfig.java
new file mode 100644
index 0000000000..7aa51400ea
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/oauth/WebSecurityConfig.java
@@ -0,0 +1,53 @@
+package com.baeldung.scribejava.oauth;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+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.WebSecurityConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
+
+@Configuration
+@EnableResourceServer
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http
+            .headers().frameOptions().disable()
+            .and()
+            .csrf().disable();
+    }
+
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.inMemoryAuthentication()
+                .withUser("baeldung")
+                .password("scribejava")
+                .roles("USER");
+    }
+
+    @Override
+    @Bean
+    public AuthenticationManager authenticationManagerBean() throws Exception {
+        return super.authenticationManagerBean();
+    }
+
+
+    @EnableResourceServer
+    @Configuration
+    public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
+
+        @Override
+        public void configure(HttpSecurity http) throws Exception {
+            http
+                .authorizeRequests()
+                .antMatchers("/user/me").authenticated()
+                .and()
+                .csrf().disable();
+        }
+    }
+
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/service/GoogleService.java b/libraries-security/src/main/java/com/baeldung/scribejava/service/GoogleService.java
new file mode 100644
index 0000000000..fbcc39763c
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/service/GoogleService.java
@@ -0,0 +1,31 @@
+package com.baeldung.scribejava.service;
+
+import com.github.scribejava.apis.GoogleApi20;
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.core.oauth.OAuth20Service;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+@Component
+public class GoogleService {
+
+    private OAuth20Service service;
+    private final String API_KEY = "api_key";
+    private final String API_SECRET = "api_secret";
+    private final String SCOPE = "https://www.googleapis.com/auth/userinfo.email";
+    private final String CALLBACK = "http://localhost:8080/auth/google";
+
+    @PostConstruct
+    private void init(){
+        this.service  = new ServiceBuilder(API_KEY)
+                .apiSecret(API_SECRET)
+                .scope(SCOPE)
+                .callback(CALLBACK)
+                .build(GoogleApi20.instance());
+    }
+
+
+    public OAuth20Service getService() {
+        return service;
+    }
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/service/MyService.java b/libraries-security/src/main/java/com/baeldung/scribejava/service/MyService.java
new file mode 100644
index 0000000000..739c82172c
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/service/MyService.java
@@ -0,0 +1,29 @@
+package com.baeldung.scribejava.service;
+
+import com.baeldung.scribejava.api.MyApi;
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.core.oauth.OAuth20Service;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class MyService {
+
+    private OAuth20Service service;
+    private final String API_KEY = "baeldung_api_key";
+    private final String API_SECRET = "baeldung_api_secret";
+
+    @PostConstruct
+    private void init(){
+        this.service  = new ServiceBuilder(API_KEY)
+                .apiSecret(API_SECRET)
+                .scope("read write")
+                .build(MyApi.instance());
+    }
+
+
+    public OAuth20Service getService() {
+        return service;
+    }
+}
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/service/TwitterService.java b/libraries-security/src/main/java/com/baeldung/scribejava/service/TwitterService.java
new file mode 100644
index 0000000000..df49f74679
--- /dev/null
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/service/TwitterService.java
@@ -0,0 +1,29 @@
+package com.baeldung.scribejava.service;
+
+import com.github.scribejava.apis.TwitterApi;
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.core.oauth.OAuth10aService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class TwitterService {
+
+    private final String API_KEY = "api_key";
+    private final String API_SECRET = "api_secret";
+    private OAuth10aService service;
+
+    @PostConstruct
+    private void init(){
+        this.service = new ServiceBuilder(API_KEY)
+                .apiSecret(API_SECRET)
+                .build(TwitterApi.instance());
+    }
+
+    public OAuth10aService getService(){
+        return service;
+    }
+
+
+}
diff --git a/libraries-security/src/main/resources/application.properties b/libraries-security/src/main/resources/application.properties
new file mode 100644
index 0000000000..71c6176533
--- /dev/null
+++ b/libraries-security/src/main/resources/application.properties
@@ -0,0 +1 @@
+security.oauth2.resource.filter-order = 3
\ No newline at end of file
diff --git a/libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaApplicationTests.java b/libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaApplicationTests.java
new file mode 100644
index 0000000000..99e2265d10
--- /dev/null
+++ b/libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaApplicationTests.java
@@ -0,0 +1,16 @@
+package com.baeldung.scribejava;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ScribejavaApplicationTests {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}

From b9970c5e3a27eade87c86e2381b132b37387eeb5 Mon Sep 17 00:00:00 2001
From: nguyennamthai <namthainguyen@gmail.com>
Date: Sun, 23 Sep 2018 17:46:26 +0700
Subject: [PATCH 107/114] Bael 2110 (#5286)

* Fix a division method mistake

* What a Spring bean is

* Update

* 2nd update
---
 .../java/com/baeldung/definition/Config.java   | 16 ++++++++++++++++
 .../baeldung/definition/domain/Address.java    | 14 ++++++++++++++
 .../baeldung/definition/domain/Company.java    | 14 ++++++++++++++
 .../definition/SpringBeanIntegrationTest.java  | 18 ++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 spring-core/src/main/java/com/baeldung/definition/Config.java
 create mode 100644 spring-core/src/main/java/com/baeldung/definition/domain/Address.java
 create mode 100644 spring-core/src/main/java/com/baeldung/definition/domain/Company.java
 create mode 100644 spring-core/src/test/java/com/baeldung/definition/SpringBeanIntegrationTest.java

diff --git a/spring-core/src/main/java/com/baeldung/definition/Config.java b/spring-core/src/main/java/com/baeldung/definition/Config.java
new file mode 100644
index 0000000000..126e6259ca
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/definition/Config.java
@@ -0,0 +1,16 @@
+package com.baeldung.definition;
+
+import com.baeldung.definition.domain.Address;
+import com.baeldung.definition.domain.Company;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan(basePackageClasses = Company.class)
+public class Config {
+    @Bean
+    public Address getAddress() {
+        return new Address("High Street", 1000);
+    }
+}
diff --git a/spring-core/src/main/java/com/baeldung/definition/domain/Address.java b/spring-core/src/main/java/com/baeldung/definition/domain/Address.java
new file mode 100644
index 0000000000..91be18398e
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/definition/domain/Address.java
@@ -0,0 +1,14 @@
+package com.baeldung.definition.domain;
+
+import lombok.Data;
+
+@Data
+public class Address {
+    private String street;
+    private int number;
+
+    public Address(String street, int number) {
+        this.street = street;
+        this.number = number;
+    }
+}
diff --git a/spring-core/src/main/java/com/baeldung/definition/domain/Company.java b/spring-core/src/main/java/com/baeldung/definition/domain/Company.java
new file mode 100644
index 0000000000..eabde8afdf
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/definition/domain/Company.java
@@ -0,0 +1,14 @@
+package com.baeldung.definition.domain;
+
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+public class Company {
+    private Address address;
+
+    public Company(Address address) {
+        this.address = address;
+    }
+}
diff --git a/spring-core/src/test/java/com/baeldung/definition/SpringBeanIntegrationTest.java b/spring-core/src/test/java/com/baeldung/definition/SpringBeanIntegrationTest.java
new file mode 100644
index 0000000000..0057611308
--- /dev/null
+++ b/spring-core/src/test/java/com/baeldung/definition/SpringBeanIntegrationTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.definition;
+
+import com.baeldung.definition.domain.Company;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import static org.junit.Assert.assertEquals;
+
+public class SpringBeanIntegrationTest {
+    @Test
+    public void whenUsingIoC_thenDependenciesAreInjected() {
+        ApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
+        Company company = context.getBean("company", Company.class);
+        assertEquals("High Street", company.getAddress().getStreet());
+        assertEquals(1000, company.getAddress().getNumber());
+    }
+}

From 6ff8919dec39752225fb8ab7a0f91d13165a6cb4 Mon Sep 17 00:00:00 2001
From: Alfonso Lentini <valenzise.alfonso@gmail.com>
Date: Sun, 23 Sep 2018 12:54:26 +0200
Subject: [PATCH 108/114] build fix

---
 libraries-security/pom.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/libraries-security/pom.xml b/libraries-security/pom.xml
index 0b7cddb885..75ccf29cd6 100644
--- a/libraries-security/pom.xml
+++ b/libraries-security/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.github.scribejava</groupId>
             <artifactId>scribejava-apis</artifactId>
-            <version>5.6.0</version>
+            <version>${scribejava.version}</version>
         </dependency>
 
         <dependency>
@@ -41,8 +41,21 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <junit.version>4.12</junit.version>
+        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
+        <scribejava.version>5.6.0</scribejava.version>
     </properties>
 
+
 </project>

From 419b6e66b18b591f709bc740cfffabe3fccaa035 Mon Sep 17 00:00:00 2001
From: Alfonso Lentini <valenzise.alfonso@gmail.com>
Date: Sun, 23 Sep 2018 13:19:48 +0200
Subject: [PATCH 109/114] build fix

---
 .../com/baeldung/scribejava/api/MyApi.java    |  2 +-
 .../controller/TwitterController.java         | 56 +++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java b/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java
index 577e753c07..cf073d3035 100644
--- a/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/api/MyApi.java
@@ -4,7 +4,7 @@ import com.github.scribejava.core.builder.api.DefaultApi20;
 
 public class MyApi extends DefaultApi20 {
 
-    public MyApi() {
+    private MyApi() {
     }
 
     private static class InstanceHolder {
diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java b/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
index bfcd6d960c..0b8b48220d 100644
--- a/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
@@ -20,34 +20,34 @@ public class TwitterController {
 
     @GetMapping(value ="/me/twitter")
     public String me(HttpServletResponse servletResponse){
-        try {
-            OAuth1RequestToken requestToken = service.getService().getRequestToken();
-
-            String auth = service.getService().getAuthorizationUrl(requestToken);
-
-            Runtime runtime = Runtime.getRuntime();
-            try {
-                runtime.exec("rundll32 url.dll,FileProtocolHandler " + auth);
-            } catch (IOException e) {
-                servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-                return null;
-            }
-
-            System.out.println("Insert twitter code:");
-            Scanner in = new Scanner(System.in);
-
-            String oauthverifier = in.nextLine();
-
-            final OAuth1AccessToken accessToken = service.getService().getAccessToken(requestToken,oauthverifier);
-
-            OAuthRequest request = new OAuthRequest(Verb.GET, "https://api.twitter.com/1.1/account/verify_credentials.json");
-            service.getService().signRequest(accessToken, request);
-            Response response = service.getService().execute(request);
-            return response.getBody();
-
-        } catch (IOException | InterruptedException | ExecutionException e) {
-            servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-        }
+//        try {
+//            OAuth1RequestToken requestToken = service.getService().getRequestToken();
+//
+//            String auth = service.getService().getAuthorizationUrl(requestToken);
+//
+//            Runtime runtime = Runtime.getRuntime();
+//            try {
+//                runtime.exec("rundll32 url.dll,FileProtocolHandler " + auth);
+//            } catch (IOException e) {
+//                servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+//                return null;
+//            }
+//
+//            System.out.println("Insert twitter code:");
+//            Scanner in = new Scanner(System.in);
+//
+//            String oauthverifier = in.nextLine();
+//
+//            final OAuth1AccessToken accessToken = service.getService().getAccessToken(requestToken,oauthverifier);
+//
+//            OAuthRequest request = new OAuthRequest(Verb.GET, "https://api.twitter.com/1.1/account/verify_credentials.json");
+//            service.getService().signRequest(accessToken, request);
+//            Response response = service.getService().execute(request);
+//            return response.getBody();
+//
+//        } catch (IOException | InterruptedException | ExecutionException e) {
+//            servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+//        }
 
         return null;
     }

From 98f57fee9d3582eddf786454903b4ad7fb606003 Mon Sep 17 00:00:00 2001
From: Alfonso Lentini <valenzise.alfonso@gmail.com>
Date: Sun, 23 Sep 2018 13:20:39 +0200
Subject: [PATCH 110/114] build fix

---
 libraries-security/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/libraries-security/pom.xml b/libraries-security/pom.xml
index 75ccf29cd6..a57f029702 100644
--- a/libraries-security/pom.xml
+++ b/libraries-security/pom.xml
@@ -41,16 +41,6 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <junit.version>4.12</junit.version>
         <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>

From 465c571f1851c0f2f5b28ff3a02a8bacdb322a20 Mon Sep 17 00:00:00 2001
From: Alfonso Lentini <valenzise.alfonso@gmail.com>
Date: Sun, 23 Sep 2018 13:55:39 +0200
Subject: [PATCH 111/114] build fix

---
 .../controller/TwitterController.java         | 56 +++++++++----------
 ...tionTests.java => ScribejavaUnitTest.java} |  5 +-
 2 files changed, 31 insertions(+), 30 deletions(-)
 rename libraries-security/src/test/java/com/baeldung/scribejava/{ScribejavaApplicationTests.java => ScribejavaUnitTest.java} (78%)

diff --git a/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java b/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
index 0b8b48220d..bfcd6d960c 100644
--- a/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
+++ b/libraries-security/src/main/java/com/baeldung/scribejava/controller/TwitterController.java
@@ -20,34 +20,34 @@ public class TwitterController {
 
     @GetMapping(value ="/me/twitter")
     public String me(HttpServletResponse servletResponse){
-//        try {
-//            OAuth1RequestToken requestToken = service.getService().getRequestToken();
-//
-//            String auth = service.getService().getAuthorizationUrl(requestToken);
-//
-//            Runtime runtime = Runtime.getRuntime();
-//            try {
-//                runtime.exec("rundll32 url.dll,FileProtocolHandler " + auth);
-//            } catch (IOException e) {
-//                servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-//                return null;
-//            }
-//
-//            System.out.println("Insert twitter code:");
-//            Scanner in = new Scanner(System.in);
-//
-//            String oauthverifier = in.nextLine();
-//
-//            final OAuth1AccessToken accessToken = service.getService().getAccessToken(requestToken,oauthverifier);
-//
-//            OAuthRequest request = new OAuthRequest(Verb.GET, "https://api.twitter.com/1.1/account/verify_credentials.json");
-//            service.getService().signRequest(accessToken, request);
-//            Response response = service.getService().execute(request);
-//            return response.getBody();
-//
-//        } catch (IOException | InterruptedException | ExecutionException e) {
-//            servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-//        }
+        try {
+            OAuth1RequestToken requestToken = service.getService().getRequestToken();
+
+            String auth = service.getService().getAuthorizationUrl(requestToken);
+
+            Runtime runtime = Runtime.getRuntime();
+            try {
+                runtime.exec("rundll32 url.dll,FileProtocolHandler " + auth);
+            } catch (IOException e) {
+                servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+                return null;
+            }
+
+            System.out.println("Insert twitter code:");
+            Scanner in = new Scanner(System.in);
+
+            String oauthverifier = in.nextLine();
+
+            final OAuth1AccessToken accessToken = service.getService().getAccessToken(requestToken,oauthverifier);
+
+            OAuthRequest request = new OAuthRequest(Verb.GET, "https://api.twitter.com/1.1/account/verify_credentials.json");
+            service.getService().signRequest(accessToken, request);
+            Response response = service.getService().execute(request);
+            return response.getBody();
+
+        } catch (IOException | InterruptedException | ExecutionException e) {
+            servletResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        }
 
         return null;
     }
diff --git a/libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaApplicationTests.java b/libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaUnitTest.java
similarity index 78%
rename from libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaApplicationTests.java
rename to libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaUnitTest.java
index 99e2265d10..6565a5b085 100644
--- a/libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaApplicationTests.java
+++ b/libraries-security/src/test/java/com/baeldung/scribejava/ScribejavaUnitTest.java
@@ -7,10 +7,11 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class ScribejavaApplicationTests {
+public class ScribejavaUnitTest {
 
     @Test
-    public void contextLoads() {
+    public void contextLoad(){
+
     }
 
 }

From 1a8eb6a0efe078eeebbd0a520feb769cd70fda30 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 23 Sep 2018 17:54:41 +0300
Subject: [PATCH 112/114] refactor dao

---
 .../springbootmvc/jsfapplication/model/TodoDao.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java
index d33f5e5da0..96d44474af 100644
--- a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 public class TodoDao implements Dao<Todo> {
 
     private List<Todo> todoList = new ArrayList<>();
-    
+
     @Override
     public Optional<Todo> get(int id) {
         return Optional.ofNullable(todoList.get(id));
@@ -22,9 +22,9 @@ public class TodoDao implements Dao<Todo> {
 
     @Override
     public Collection<Todo> getAll() {
-        return Collections.unmodifiableCollection(todoList.stream()
+        return todoList.stream()
             .filter(Objects::nonNull)
-            .collect(Collectors.toList()));
+            .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
     }
 
     @Override

From a336320f5294a9663049cdfb8849b65df71c4ca9 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Sun, 23 Sep 2018 18:32:13 +0300
Subject: [PATCH 113/114] Update README.md

---
 spring-security-mvc-socket/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-security-mvc-socket/README.md b/spring-security-mvc-socket/README.md
index e99555e7fa..3daf9199e6 100644
--- a/spring-security-mvc-socket/README.md
+++ b/spring-security-mvc-socket/README.md
@@ -7,4 +7,4 @@ To login, use credentials from the data.sql file in src/main/resource, eg: user/
 
 ### Relevant Articles: 
 - [Intro to Security and WebSockets](http://www.baeldung.com/spring-security-websockets)
-- [Spring WebSockets: Specific User Chat](http://www.baeldung.com/spring-websocket-specific-user-chat)
\ No newline at end of file
+- [Spring WebSockets: Specific User Chat](https://www.baeldung.com/spring-websockets-send-message-to-user)

From f599419181b74f8cba9e683e4d82c865acac141b Mon Sep 17 00:00:00 2001
From: vizsoro <zsolt.vicze@gmail.com>
Date: Sun, 23 Sep 2018 20:25:06 +0200
Subject: [PATCH 114/114] using collectingAndThen

---
 .../springbootmvc/jsfapplication/model/TodoDao.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java
index d33f5e5da0..96d44474af 100644
--- a/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java
+++ b/spring-boot-mvc/src/main/java/com/baeldung/springbootmvc/jsfapplication/model/TodoDao.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 public class TodoDao implements Dao<Todo> {
 
     private List<Todo> todoList = new ArrayList<>();
-    
+
     @Override
     public Optional<Todo> get(int id) {
         return Optional.ofNullable(todoList.get(id));
@@ -22,9 +22,9 @@ public class TodoDao implements Dao<Todo> {
 
     @Override
     public Collection<Todo> getAll() {
-        return Collections.unmodifiableCollection(todoList.stream()
+        return todoList.stream()
             .filter(Objects::nonNull)
-            .collect(Collectors.toList()));
+            .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
     }
 
     @Override