From d9368899219b8d67c9cb3cc68057eb4be469253e Mon Sep 17 00:00:00 2001
From: hgomez <hugo.gomez@evolutionfinance.com>
Date: Sat, 4 Nov 2017 17:43:04 -0400
Subject: [PATCH 01/72] first version

---
 libraries/pom.xml                             | 15 ++++
 .../DailyMotionExample.java                   | 74 +++++++++++++++++++
 .../googlehttpclientguide/DailyMotionUrl.java | 22 ++++++
 .../baeldung/googlehttpclientguide/Video.java | 23 ++++++
 .../googlehttpclientguide/VideoFeed.java      | 20 +++++
 .../googlehttpclientguide/logging.properties  | 10 +++
 6 files changed, 164 insertions(+)
 create mode 100644 libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java
 create mode 100644 libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java
 create mode 100644 libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java
 create mode 100644 libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java
 create mode 100644 libraries/src/main/java/com/baeldung/googlehttpclientguide/logging.properties

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 25c1113fea..9384f58493 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -622,6 +622,21 @@
 	    <artifactId>bcpkix-jdk15on</artifactId>
 	    <version>1.58</version>
 	</dependency>
+        <dependency>
+            <groupId>com.google.http-client</groupId>
+            <artifactId>google-http-client</artifactId>
+            <version>1.23.0</version>
+        </dependency>
+        <dependency>
+          <groupId>com.google.http-client</groupId>
+          <artifactId>google-http-client-jackson2</artifactId>
+            <version>1.23.0</version>
+        </dependency>
+        <dependency>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client-gson</artifactId>
+        <version>1.23.0</version>
+      </dependency>
     </dependencies>
     <repositories>
         <repository>
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java
new file mode 100644
index 0000000000..dd559f3aa2
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java
@@ -0,0 +1,74 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.baeldung.googlehttpclientguide;
+
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpRequestFactory;
+import com.google.api.client.http.HttpRequestInitializer;
+import com.google.api.client.http.HttpResponseException;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.JsonObjectParser;
+import com.google.api.client.json.gson.GsonFactory;
+import com.google.api.client.json.jackson2.JacksonFactory;
+
+/**
+ *
+ * @author Hugo
+ */
+public class DailyMotionExample {
+
+    static final HttpTransport HTTP_TRANSPORT = new NetHttpTransport();
+    static final JsonFactory JSON_FACTORY = new JacksonFactory();
+    //static final JsonFactory JSON_FACTORY = new GsonFactory();
+
+    private static void run() throws Exception {
+        HttpRequestFactory requestFactory
+                = HTTP_TRANSPORT.createRequestFactory(
+                        new HttpRequestInitializer() {
+
+                    public void initialize(HttpRequest request) {
+                        request.setParser(new JsonObjectParser(JSON_FACTORY));
+                    }
+                });
+        DailyMotionUrl url = new DailyMotionUrl("https://api.dailymotion.com/videos/");
+        url.fields = "id,tags,title,url";
+        HttpRequest request = requestFactory.buildGetRequest(url);
+        VideoFeed videoFeed = request.execute().parseAs(VideoFeed.class);
+        if (videoFeed.list.isEmpty()) {
+            System.out.println("No videos found.");
+        } else {
+            if (videoFeed.hasMore) {
+                System.out.print("First ");
+            }
+            System.out.println(videoFeed.list.size() + " videos found:");
+            for (Video video : videoFeed.list) {
+                System.out.println();
+                System.out.println("-----------------------------------------------");
+                System.out.println("ID: " + video.id);
+                System.out.println("Title: " + video.title);
+                System.out.println("Tags: " + video.tags);
+                System.out.println("URL: " + video.url);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        try {
+            try {
+                run();
+                return;
+            } catch (HttpResponseException e) {
+                System.err.println(e.getMessage());
+            }
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+        System.exit(1);
+    }
+
+}
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java
new file mode 100644
index 0000000000..0f77cdd2f6
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java
@@ -0,0 +1,22 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.baeldung.googlehttpclientguide;
+
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.util.Key;
+
+/**
+ *
+ * @author Hugo
+ */
+  public class DailyMotionUrl extends GenericUrl {
+
+    public DailyMotionUrl(String encodedUrl) {
+      super(encodedUrl);
+    }
+
+    @Key public String fields;
+  }
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java
new file mode 100644
index 0000000000..62622deaf5
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java
@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.baeldung.googlehttpclientguide;
+
+import com.google.api.client.util.Key;
+import java.util.List;
+
+/**
+ *
+ * @author Hugo
+ */
+  public  class Video {
+    @Key public String id;
+
+    @Key public List<String> tags;
+
+    @Key public String title;
+
+    @Key public String url;
+  }
\ No newline at end of file
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java
new file mode 100644
index 0000000000..6b62f61924
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java
@@ -0,0 +1,20 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.baeldung.googlehttpclientguide;
+
+import com.google.api.client.util.Key;
+import java.util.List;
+
+/**
+ *
+ * @author Hugo
+ */
+  public class VideoFeed {
+    @Key public List<Video> list;
+
+    @Key("has_more")
+    public boolean hasMore;
+  }
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/logging.properties b/libraries/src/main/java/com/baeldung/googlehttpclientguide/logging.properties
new file mode 100644
index 0000000000..02489378df
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/logging.properties
@@ -0,0 +1,10 @@
+# Properties file which configures the operation of the JDK logging facility.
+# The system will look for this config file to be specified as a system property: 
+# -Djava.util.logging.config.file=${project_loc:dailymotion-simple-cmdline-sample}/logging.properties
+
+# Set up the console handler (uncomment "level" to show more fine-grained messages) 
+handlers = java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level = ALL
+
+# Set up logging of HTTP requests and responses (uncomment "level" to show)
+com.google.api.client.http.level = ALL

From 3db7b366622d70d0c4831c4d716dca753685fb2d Mon Sep 17 00:00:00 2001
From: hgomez <hugo.gomez@evolutionfinance.com>
Date: Sun, 5 Nov 2017 18:36:44 -0500
Subject: [PATCH 02/72] Removed comments from author, reformat

---
 .../DailyMotionExample.java                   | 30 ++++++++-----------
 .../googlehttpclientguide/DailyMotionUrl.java | 19 ++++--------
 .../baeldung/googlehttpclientguide/Video.java | 27 ++++++++---------
 .../googlehttpclientguide/VideoFeed.java      | 17 ++++-------
 4 files changed, 36 insertions(+), 57 deletions(-)

diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java
index dd559f3aa2..dc0fb1e1c5 100644
--- a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java
@@ -1,25 +1,16 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.baeldung.googlehttpclientguide;
 
+import com.google.api.client.http.HttpBackOffUnsuccessfulResponseHandler;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestFactory;
-import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
-import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.util.ExponentialBackOff;
 
-/**
- *
- * @author Hugo
- */
 public class DailyMotionExample {
 
     static final HttpTransport HTTP_TRANSPORT = new NetHttpTransport();
@@ -29,15 +20,20 @@ public class DailyMotionExample {
     private static void run() throws Exception {
         HttpRequestFactory requestFactory
                 = HTTP_TRANSPORT.createRequestFactory(
-                        new HttpRequestInitializer() {
-
-                    public void initialize(HttpRequest request) {
-                        request.setParser(new JsonObjectParser(JSON_FACTORY));
-                    }
-                });
+                        (HttpRequest request) -> {
+                            request.setParser(new JsonObjectParser(JSON_FACTORY));
+                        });
         DailyMotionUrl url = new DailyMotionUrl("https://api.dailymotion.com/videos/");
         url.fields = "id,tags,title,url";
         HttpRequest request = requestFactory.buildGetRequest(url);
+        ExponentialBackOff backoff = new ExponentialBackOff.Builder()
+                .setInitialIntervalMillis(500)
+                .setMaxElapsedTimeMillis(900000)
+                .setMaxIntervalMillis(6000)
+                .setMultiplier(1.5)
+                .setRandomizationFactor(0.5)
+                .build();
+        request.setUnsuccessfulResponseHandler(new HttpBackOffUnsuccessfulResponseHandler(backoff));
         VideoFeed videoFeed = request.execute().parseAs(VideoFeed.class);
         if (videoFeed.list.isEmpty()) {
             System.out.println("No videos found.");
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java
index 0f77cdd2f6..ebfc63d492 100644
--- a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java
@@ -1,22 +1,15 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.baeldung.googlehttpclientguide;
 
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.util.Key;
 
-/**
- *
- * @author Hugo
- */
-  public class DailyMotionUrl extends GenericUrl {
+
+public class DailyMotionUrl extends GenericUrl {
 
     public DailyMotionUrl(String encodedUrl) {
-      super(encodedUrl);
+        super(encodedUrl);
     }
 
-    @Key public String fields;
-  }
+    @Key
+    public String fields;
+}
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java
index 62622deaf5..4d2515b202 100644
--- a/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java
@@ -1,23 +1,20 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.baeldung.googlehttpclientguide;
 
+import com.google.api.client.json.GenericJson;
 import com.google.api.client.util.Key;
 import java.util.List;
 
-/**
- *
- * @author Hugo
- */
-  public  class Video {
-    @Key public String id;
+public class Video extends GenericJson {
 
-    @Key public List<String> tags;
+    @Key
+    public String id;
 
-    @Key public String title;
+    @Key
+    public List<String> tags;
 
-    @Key public String url;
-  }
\ No newline at end of file
+    @Key
+    public String title;
+
+    @Key
+    public String url;
+}
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java
index 6b62f61924..c24f528ba7 100644
--- a/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java
@@ -1,20 +1,13 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.baeldung.googlehttpclientguide;
 
 import com.google.api.client.util.Key;
 import java.util.List;
 
-/**
- *
- * @author Hugo
- */
-  public class VideoFeed {
-    @Key public List<Video> list;
+public class VideoFeed {
+
+    @Key
+    public List<Video> list;
 
     @Key("has_more")
     public boolean hasMore;
-  }
+}

From 8e5e0e3bb3b4c1ebd26e74200803bf78ca653374 Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <dzhdanov@tango.me>
Date: Mon, 6 Nov 2017 22:16:23 +0300
Subject: [PATCH 03/72] BAEL-1290 Creating a Java Compiler Plugin

* a sample Javac plugin
* a test framework for Javac plugins
* sample Javac plugin's tests
---
 core-java/pom.xml                             |   7 +
 .../java/com/baeldung/javac/Positive.java     |   9 ++
 .../com/baeldung/javac/SampleJavacPlugin.java | 124 ++++++++++++++++++
 .../services/com.sun.source.util.Plugin       |   1 +
 .../SampleJavacPluginIntegrationTest.java     |  42 ++++++
 .../com/baeldung/javac/SimpleClassFile.java   |  26 ++++
 .../com/baeldung/javac/SimpleFileManager.java |  34 +++++
 .../com/baeldung/javac/SimpleSourceFile.java  |  23 ++++
 .../java/com/baeldung/javac/TestCompiler.java |  35 +++++
 .../java/com/baeldung/javac/TestRunner.java   |  41 ++++++
 10 files changed, 342 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/javac/Positive.java
 create mode 100644 core-java/src/main/java/com/baeldung/javac/SampleJavacPlugin.java
 create mode 100644 core-java/src/main/resources/META-INF/services/com.sun.source.util.Plugin
 create mode 100644 core-java/src/test/java/com/baeldung/javac/SampleJavacPluginIntegrationTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/javac/SimpleClassFile.java
 create mode 100644 core-java/src/test/java/com/baeldung/javac/SimpleFileManager.java
 create mode 100644 core-java/src/test/java/com/baeldung/javac/SimpleSourceFile.java
 create mode 100644 core-java/src/test/java/com/baeldung/javac/TestCompiler.java
 create mode 100644 core-java/src/test/java/com/baeldung/javac/TestRunner.java

diff --git a/core-java/pom.xml b/core-java/pom.xml
index bb3958f36c..6215a2d45b 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -216,6 +216,13 @@
 		    <artifactId>spring-web</artifactId>
 		    <version>4.3.4.RELEASE</version>
 		</dependency>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <version>1.8.0</version>
+            <scope>system</scope>
+            <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/core-java/src/main/java/com/baeldung/javac/Positive.java b/core-java/src/main/java/com/baeldung/javac/Positive.java
new file mode 100644
index 0000000000..443b866fea
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/javac/Positive.java
@@ -0,0 +1,9 @@
+package com.baeldung.javac;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.PARAMETER})
+public @interface Positive {
+}
diff --git a/core-java/src/main/java/com/baeldung/javac/SampleJavacPlugin.java b/core-java/src/main/java/com/baeldung/javac/SampleJavacPlugin.java
new file mode 100644
index 0000000000..c85b04f0cf
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/javac/SampleJavacPlugin.java
@@ -0,0 +1,124 @@
+package com.baeldung.javac;
+
+import com.sun.source.tree.MethodTree;
+import com.sun.source.tree.VariableTree;
+import com.sun.source.util.*;
+import com.sun.tools.javac.api.BasicJavacTask;
+import com.sun.tools.javac.code.TypeTag;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.TreeMaker;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.util.Names;
+
+import javax.tools.JavaCompiler;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.sun.tools.javac.util.List.nil;
+
+/**
+ * A {@link JavaCompiler javac} plugin which inserts {@code >= 0} checks into resulting {@code *.class} files
+ * for numeric method parameters marked by {@link Positive}
+ */
+public class SampleJavacPlugin implements Plugin {
+
+    public static final String NAME = "MyPlugin";
+
+    private static Set<String> TARGET_TYPES = new HashSet<>(Arrays.asList(
+            // Use only primitive types for simplicity
+            byte.class.getName(), short.class.getName(), char.class.getName(), int.class.getName(),
+            long.class.getName(), float.class.getName(), double.class.getName()
+    ));
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    @Override
+    public void init(JavacTask task, String... args) {
+        Context context = ((BasicJavacTask) task).getContext();
+        task.addTaskListener(new TaskListener() {
+            @Override
+            public void started(TaskEvent e) {
+            }
+
+            @Override
+            public void finished(TaskEvent e) {
+                if (e.getKind() != TaskEvent.Kind.PARSE) {
+                    return;
+                }
+                e.getCompilationUnit().accept(new TreeScanner<Void, Void>() {
+                    @Override
+                    public Void visitMethod(MethodTree method, Void v) {
+                        List<VariableTree> parametersToInstrument = method.getParameters()
+                                                                        .stream()
+                                                                        .filter(SampleJavacPlugin.this::shouldInstrument)
+                                                                        .collect(Collectors.toList());
+                        if (!parametersToInstrument.isEmpty()) {
+                            // There is a possible case that more than one argument is marked by @Positive,
+                            // as the checks are added to the method's body beginning, we process parameters RTL
+                            // to ensure correct order.
+                            Collections.reverse(parametersToInstrument);
+                            parametersToInstrument.forEach(p -> addCheck(method, p, context));
+                        }
+                        // There is a possible case that there is a nested class declared in a method's body,
+                        // hence, we want to proceed with method body AST as well.
+                        return super.visitMethod(method, v);
+                    }
+                }, null);
+            }
+        });
+    }
+
+    private boolean shouldInstrument(VariableTree parameter) {
+        return TARGET_TYPES.contains(parameter.getType().toString())
+               && parameter.getModifiers().getAnnotations()
+                           .stream()
+                           .anyMatch(a -> Positive.class.getSimpleName().equals(a.getAnnotationType().toString()));
+    }
+
+    private void addCheck(MethodTree method, VariableTree parameter, Context context) {
+        JCTree.JCIf check = createCheck(parameter, context);
+        JCTree.JCBlock body = (JCTree.JCBlock) method.getBody();
+        body.stats = body.stats.prepend(check);
+    }
+
+    private static JCTree.JCIf createCheck(VariableTree parameter, Context context) {
+        TreeMaker factory = TreeMaker.instance(context);
+        Names symbolsTable = Names.instance(context);
+        String parameterName = parameter.getName().toString();
+        String errorMessagePrefix = String.format("Argument '%s' of type %s is marked by @%s but got '",
+                                            parameterName, parameter.getType(), Positive.class.getSimpleName());
+        String errorMessageSuffix = "' for it";
+        Name parameterId = symbolsTable.fromString(parameterName);
+        return factory.at(((JCTree) parameter).pos).If(
+                factory.Parens(
+                        factory.Binary(
+                                JCTree.Tag.LE,
+                                factory.Ident(parameterId),
+                                factory.Literal(TypeTag.INT, 0))
+                ),
+                factory.Block(0, com.sun.tools.javac.util.List.of(
+                        factory.Throw(
+                                factory.NewClass(
+                                        null,
+                                        nil(),
+                                        factory.Ident(
+                                                symbolsTable.fromString(IllegalArgumentException.class.getSimpleName())
+                                        ),
+                                        com.sun.tools.javac.util.List.of(
+                                                factory.Binary(JCTree.Tag.PLUS,
+                                                               factory.Binary(JCTree.Tag.PLUS,
+                                                                              factory.Literal(TypeTag.CLASS, errorMessagePrefix),
+                                                                              factory.Ident(parameterId)),
+                                                               factory.Literal(TypeTag.CLASS, errorMessageSuffix))),
+                                        null
+                                )
+                        )
+                )),
+                null
+        );
+    }
+}
diff --git a/core-java/src/main/resources/META-INF/services/com.sun.source.util.Plugin b/core-java/src/main/resources/META-INF/services/com.sun.source.util.Plugin
new file mode 100644
index 0000000000..91fb6eb3b0
--- /dev/null
+++ b/core-java/src/main/resources/META-INF/services/com.sun.source.util.Plugin
@@ -0,0 +1 @@
+com.baeldung.javac.SampleJavacPlugin
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/javac/SampleJavacPluginIntegrationTest.java b/core-java/src/test/java/com/baeldung/javac/SampleJavacPluginIntegrationTest.java
new file mode 100644
index 0000000000..b877038add
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/javac/SampleJavacPluginIntegrationTest.java
@@ -0,0 +1,42 @@
+package com.baeldung.javac;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class SampleJavacPluginIntegrationTest {
+
+    private static final String CLASS_TEMPLATE =
+            "package com.baeldung.javac;\n" +
+            "\n" +
+            "public class Test {\n" +
+            "    public static %1$s service(@Positive %1$s i) {\n" +
+            "        return i;\n" +
+            "    }\n" +
+            "}\n" +
+            "";
+
+    private TestCompiler compiler = new TestCompiler();
+    private TestRunner   runner   = new TestRunner();
+
+    @Test(expected = IllegalArgumentException.class)
+    public void givenInt_whenNegative_thenThrowsException() throws Throwable {
+        compileAndRun(double.class,-1);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void givenInt_whenZero_thenThrowsException() throws Throwable {
+        compileAndRun(int.class,0);
+    }
+
+    @Test
+    public void givenInt_whenPositive_thenSuccess() throws Throwable {
+        assertEquals(1, compileAndRun(int.class, 1));
+    }
+
+    private Object compileAndRun(Class<?> argumentType, Object argument) throws Throwable {
+        String qualifiedClassName = "com.baeldung.javac.Test";
+        byte[] byteCode = compiler.compile(qualifiedClassName, String.format(CLASS_TEMPLATE, argumentType.getName()));
+        return runner.run(byteCode, qualifiedClassName, "service", new Class[] {argumentType}, argument);
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/javac/SimpleClassFile.java b/core-java/src/test/java/com/baeldung/javac/SimpleClassFile.java
new file mode 100644
index 0000000000..2c8e66e6e3
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/javac/SimpleClassFile.java
@@ -0,0 +1,26 @@
+package com.baeldung.javac;
+
+import javax.tools.SimpleJavaFileObject;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
+
+/** Holds compiled byte code in a byte array */
+public class SimpleClassFile extends SimpleJavaFileObject {
+
+    private ByteArrayOutputStream out;
+
+    public SimpleClassFile(URI uri) {
+        super(uri, Kind.CLASS);
+    }
+
+    @Override
+    public OutputStream openOutputStream() throws IOException {
+        return out = new ByteArrayOutputStream();
+    }
+
+    public byte[] getCompiledBinaries() {
+        return out.toByteArray();
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/javac/SimpleFileManager.java b/core-java/src/test/java/com/baeldung/javac/SimpleFileManager.java
new file mode 100644
index 0000000000..346f240754
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/javac/SimpleFileManager.java
@@ -0,0 +1,34 @@
+package com.baeldung.javac;
+
+import javax.tools.*;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+/** Adapts {@link SimpleClassFile} to the {@link JavaCompiler} */
+public class SimpleFileManager extends ForwardingJavaFileManager<StandardJavaFileManager> {
+
+    private final List<SimpleClassFile> compiled = new ArrayList<>();
+
+    public SimpleFileManager(StandardJavaFileManager delegate) {
+        super(delegate);
+    }
+
+    @Override
+    public JavaFileObject getJavaFileForOutput(Location location,
+                                               String className,
+                                               JavaFileObject.Kind kind,
+                                               FileObject sibling)
+    {
+        SimpleClassFile result = new SimpleClassFile(URI.create("string://" + className));
+        compiled.add(result);
+        return result;
+    }
+
+    /**
+     * @return  compiled binaries processed by the current class
+     */
+    public List<SimpleClassFile> getCompiled() {
+        return compiled;
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/javac/SimpleSourceFile.java b/core-java/src/test/java/com/baeldung/javac/SimpleSourceFile.java
new file mode 100644
index 0000000000..9287b1a0dd
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/javac/SimpleSourceFile.java
@@ -0,0 +1,23 @@
+package com.baeldung.javac;
+
+import javax.tools.SimpleJavaFileObject;
+import java.net.URI;
+
+/** Exposes given test source to the compiler. */
+public class SimpleSourceFile extends SimpleJavaFileObject {
+
+    private final String content;
+
+    public SimpleSourceFile(String qualifiedClassName, String testSource) {
+        super(URI.create(String.format("file://%s%s",
+                                       qualifiedClassName.replaceAll("\\.", "/"),
+                                       Kind.SOURCE.extension)),
+              Kind.SOURCE);
+        content = testSource;
+    }
+
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+        return content;
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/javac/TestCompiler.java b/core-java/src/test/java/com/baeldung/javac/TestCompiler.java
new file mode 100644
index 0000000000..ee40e563a3
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/javac/TestCompiler.java
@@ -0,0 +1,35 @@
+package com.baeldung.javac;
+
+import javax.tools.JavaCompiler;
+import javax.tools.ToolProvider;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+
+public class TestCompiler {
+    public byte[] compile(String qualifiedClassName, String testSource) {
+        StringWriter output = new StringWriter();
+
+        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+        SimpleFileManager fileManager = new SimpleFileManager(compiler.getStandardFileManager(
+                null,
+                null,
+                null
+        ));
+        List<SimpleSourceFile> compilationUnits = singletonList(new SimpleSourceFile(qualifiedClassName, testSource));
+        List<String> arguments = new ArrayList<>();
+        arguments.addAll(asList("-classpath", System.getProperty("java.class.path"),
+                                "-Xplugin:" + SampleJavacPlugin.NAME));
+        JavaCompiler.CompilationTask task = compiler.getTask(output,
+                                                             fileManager,
+                                                             null,
+                                                             arguments,
+                                                             null,
+                                                             compilationUnits);
+        task.call();
+        return fileManager.getCompiled().iterator().next().getCompiledBinaries();
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/javac/TestRunner.java b/core-java/src/test/java/com/baeldung/javac/TestRunner.java
new file mode 100644
index 0000000000..6a03ad4918
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/javac/TestRunner.java
@@ -0,0 +1,41 @@
+package com.baeldung.javac;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class TestRunner {
+
+    public Object run(byte[] byteCode,
+                      String qualifiedClassName,
+                      String methodName,
+                      Class<?>[] argumentTypes,
+                      Object... args)
+            throws Throwable
+    {
+        ClassLoader classLoader = new ClassLoader() {
+            @Override
+            protected Class<?> findClass(String name) throws ClassNotFoundException {
+                return defineClass(name, byteCode, 0, byteCode.length);
+            }
+        };
+        Class<?> clazz;
+        try {
+            clazz = classLoader.loadClass(qualifiedClassName);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Can't load compiled test class", e);
+        }
+
+        Method method;
+        try {
+            method = clazz.getMethod(methodName, argumentTypes);
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Can't find the 'main()' method in the compiled test class", e);
+        }
+
+        try {
+            return method.invoke(null, args);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+}

From 4857675e2d7be441bdca08a27dda9c22904d5dcb Mon Sep 17 00:00:00 2001
From: Allan Vital <allan.vital@gmail.com>
Date: Thu, 9 Nov 2017 00:29:10 -0200
Subject: [PATCH 04/72] BAEL-1319 Quick Guide on Data.sql and Schema.sql Files
 in Spring

---
 .../java/org/baeldung/sqlfiles/Country.java   | 33 +++++++++++++++++++
 spring-jpa/src/main/resources/data.sql        |  5 +++
 spring-jpa/src/main/resources/schema.sql      |  5 +++
 .../src/main/resources/sqlfiles.properties    |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 spring-jpa/src/main/java/org/baeldung/sqlfiles/Country.java
 create mode 100644 spring-jpa/src/main/resources/data.sql
 create mode 100644 spring-jpa/src/main/resources/schema.sql
 create mode 100644 spring-jpa/src/main/resources/sqlfiles.properties

diff --git a/spring-jpa/src/main/java/org/baeldung/sqlfiles/Country.java b/spring-jpa/src/main/java/org/baeldung/sqlfiles/Country.java
new file mode 100644
index 0000000000..0555c8186c
--- /dev/null
+++ b/spring-jpa/src/main/java/org/baeldung/sqlfiles/Country.java
@@ -0,0 +1,33 @@
+package org.baeldung.sqlfiles;
+
+import static javax.persistence.GenerationType.IDENTITY;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Country {
+
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Integer id;
+    
+    @Column(nullable = false)
+    private String name;
+    
+    public Integer getId() {
+        return id;
+    }
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+}
diff --git a/spring-jpa/src/main/resources/data.sql b/spring-jpa/src/main/resources/data.sql
new file mode 100644
index 0000000000..f36e034ce1
--- /dev/null
+++ b/spring-jpa/src/main/resources/data.sql
@@ -0,0 +1,5 @@
+INSERT INTO country (name) VALUES ('India');
+INSERT INTO country (name) VALUES ('Brazil');
+INSERT INTO country (name) VALUES ('USA');
+INSERT INTO country (name) VALUES ('Italy');
+COMMIT;
diff --git a/spring-jpa/src/main/resources/schema.sql b/spring-jpa/src/main/resources/schema.sql
new file mode 100644
index 0000000000..15d7788cd7
--- /dev/null
+++ b/spring-jpa/src/main/resources/schema.sql
@@ -0,0 +1,5 @@
+CREATE TABLE country (
+    id   INTEGER      NOT NULL AUTO_INCREMENT,
+    name VARCHAR(128) NOT NULL,
+    PRIMARY KEY (id)
+);
diff --git a/spring-jpa/src/main/resources/sqlfiles.properties b/spring-jpa/src/main/resources/sqlfiles.properties
new file mode 100644
index 0000000000..0bea6adad1
--- /dev/null
+++ b/spring-jpa/src/main/resources/sqlfiles.properties
@@ -0,0 +1 @@
+spring.jpa.hibernate.ddl-auto=none
\ No newline at end of file

From cfd3def0150d9bfa56e1052396b1c8f7266ad16b Mon Sep 17 00:00:00 2001
From: felipeazv <felipeazv@users.noreply.github.com>
Date: Fri, 10 Nov 2017 07:57:09 +0100
Subject: [PATCH 05/72] BAEL-803: Backward Chaining with Drools - removed
 @RunWith (#3002)

* spring beans DI examples

* fix-1: shortening examples

* List of Rules Engines in Java

* BAEL-812: Openl-Tablets example added

* BAEL-812: artifacts names changed

* BAEL-812: moving rule-engines examples to rule-engines folder

* BAEL-812: removing evaluation article files

* BAEL-812: folder renamed

* BAEL-812: folder renamed

* BAEL-812: pom.xml - parent added

* BAEL-1027: Introduction to GraphQL - initial commit

* BAEL-781: Explore the new Spring Cloud Gateway

* BAEL-781: Fix UserService.java

* BAEL-781: Fix user-service pom.xml

* BAEL-781: remove eureka-server from the example

* BAEL-781: modifying example

* BAEL-803: Backward Chaining wih Drools

* BAEL-803: pom.xml

* BAEL-803: Backward Chaining with Drools - new example

* BAEL-803: Backward Chaining with Drools - parent module

* BAEL-803: Backward Chaining with Drools - parent module

* BAEL-803: Backward Chaining with Drools - meta-inf/maven-fix

* BAEL-803: Backward Chaining with Drools - drools parent module

* BAEL-803: Backward Chaining with Drools - removed @RunWith
---
 .../src/test/java/com/baeldung/test/BackwardChainingTest.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java b/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java
index 676e941950..112188f01f 100644
--- a/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java
+++ b/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java
@@ -2,8 +2,6 @@ package com.baeldung.test;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 import org.kie.api.KieServices;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
@@ -13,7 +11,6 @@ import com.baeldung.drools.model.Result;
 
 import static junit.framework.TestCase.assertEquals;
 
-@RunWith(value = JUnit4.class)
 public class BackwardChainingTest {
     private Result result;
     private KieServices ks;

From c9aaa0d993cdb70e4e23e966d17e1e46779f2a13 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Fri, 10 Nov 2017 13:33:52 +0200
Subject: [PATCH 06/72] hibernate identifiers examples (#2977)

* hibernate identifiers examples

* fix conflict

* change to longstream

* change to format
---
 .../com/baeldung/hibernate/HibernateUtil.java |  17 +++
 .../com/baeldung/hibernate/pojo/Course.java   |  27 +++++
 .../baeldung/hibernate/pojo/Department.java   |  25 +++++
 .../baeldung/hibernate/pojo/OrderEntry.java   |  20 ++++
 .../hibernate/pojo/OrderEntryIdClass.java     |  31 ++++++
 .../baeldung/hibernate/pojo/OrderEntryPK.java |  46 ++++++++
 .../com/baeldung/hibernate/pojo/Product.java  |  26 +++++
 .../com/baeldung/hibernate/pojo/Student.java  |  23 ++++
 .../com/baeldung/hibernate/pojo/User.java     |  24 +++++
 .../baeldung/hibernate/pojo/UserProfile.java  |  34 ++++++
 .../hibernate/pojo/generator/MyGenerator.java |  41 +++++++
 .../hibernate/IdentifiersIntegrationTest.java | 100 ++++++++++++++++++
 12 files changed, 414 insertions(+)
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/Course.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/Department.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntry.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryIdClass.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryPK.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/Product.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/Student.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/User.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/UserProfile.java
 create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/generator/MyGenerator.java
 create mode 100644 hibernate5/src/test/java/com/baeldung/hibernate/IdentifiersIntegrationTest.java

diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
index 0282673218..c44a80cbd9 100644
--- a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
@@ -2,8 +2,17 @@ package com.baeldung.hibernate;
 
 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.Product;
 import com.baeldung.hibernate.pojo.Phone;
 import com.baeldung.hibernate.pojo.TemporalValues;
+import com.baeldung.hibernate.pojo.Course;
+import com.baeldung.hibernate.pojo.Student;
+import com.baeldung.hibernate.pojo.User;
+import com.baeldung.hibernate.pojo.UserProfile;
+
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
@@ -33,6 +42,14 @@ public class HibernateUtil {
         metadataSources.addAnnotatedClass(Phone.class);
         metadataSources.addAnnotatedClass(EntityDescription.class);
         metadataSources.addAnnotatedClass(TemporalValues.class);
+        metadataSources.addAnnotatedClass(User.class);
+        metadataSources.addAnnotatedClass(Student.class);
+        metadataSources.addAnnotatedClass(Course.class);
+        metadataSources.addAnnotatedClass(Product.class);
+        metadataSources.addAnnotatedClass(OrderEntryPK.class);
+        metadataSources.addAnnotatedClass(OrderEntry.class);
+        metadataSources.addAnnotatedClass(OrderEntryIdClass.class);
+        metadataSources.addAnnotatedClass(UserProfile.class);
 
         Metadata metadata = metadataSources.buildMetadata();
         return metadata.getSessionFactoryBuilder()
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Course.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Course.java
new file mode 100644
index 0000000000..97760acd3b
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Course.java
@@ -0,0 +1,27 @@
+package com.baeldung.hibernate.pojo;
+
+import java.util.UUID;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Course {
+
+    @Id
+    @GeneratedValue
+    private UUID courseId;
+
+    public UUID getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(UUID courseId) {
+        this.courseId = courseId;
+    }
+    
+    
+
+   
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Department.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Department.java
new file mode 100644
index 0000000000..6dd106b88e
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Department.java
@@ -0,0 +1,25 @@
+package com.baeldung.hibernate.pojo;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.TableGenerator;
+
+@Entity
+public class Department {
+    @Id
+    @GeneratedValue(strategy = GenerationType.TABLE, generator="table-generator")
+    @TableGenerator (name="table-generator", table="dep_ids", pkColumnName="seq_id", valueColumnName="seq_value")
+    private long depId;
+
+    public long getDepId() {
+        return depId;
+    }
+
+    public void setDepId(long depId) {
+        this.depId = depId;
+    }
+    
+    
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntry.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntry.java
new file mode 100644
index 0000000000..a28b7c8dbe
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntry.java
@@ -0,0 +1,20 @@
+package com.baeldung.hibernate.pojo;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+
+@Entity
+public class OrderEntry {
+
+    @EmbeddedId
+    private OrderEntryPK entryId;
+
+    public OrderEntryPK getEntryId() {
+        return entryId;
+    }
+
+    public void setEntryId(OrderEntryPK entryId) {
+        this.entryId = entryId;
+    }
+
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryIdClass.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryIdClass.java
new file mode 100644
index 0000000000..18926640af
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryIdClass.java
@@ -0,0 +1,31 @@
+package com.baeldung.hibernate.pojo;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+
+@Entity
+@IdClass(OrderEntryPK.class)
+public class OrderEntryIdClass {
+    @Id
+    private long orderId;
+    @Id
+    private long productId;
+
+    public long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(long orderId) {
+        this.orderId = orderId;
+    }
+
+    public long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(long productId) {
+        this.productId = productId;
+    }
+
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryPK.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryPK.java
new file mode 100644
index 0000000000..637d590629
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/OrderEntryPK.java
@@ -0,0 +1,46 @@
+package com.baeldung.hibernate.pojo;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class OrderEntryPK implements Serializable {
+
+    private long orderId;
+    private long productId;
+
+    public long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(long orderId) {
+        this.orderId = orderId;
+    }
+
+    public long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(long productId) {
+        this.productId = productId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        OrderEntryPK pk = (OrderEntryPK) o;
+        return Objects.equals(orderId, pk.orderId) && Objects.equals(productId, pk.productId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId, productId);
+    }
+}
\ No newline at end of file
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Product.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Product.java
new file mode 100644
index 0000000000..efd6b63dc0
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Product.java
@@ -0,0 +1,26 @@
+package com.baeldung.hibernate.pojo;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
+
+@Entity
+public class Product {
+
+    @Id
+    @GeneratedValue(generator = "prod-generator")
+    @GenericGenerator(name = "prod-generator", parameters = @Parameter(name = "prefix", value = "prod"), strategy = "com.baeldung.hibernate.pojo.generator.MyGenerator")
+    private String prodId;
+
+    public String getProdId() {
+        return prodId;
+    }
+
+    public void setProdId(String prodId) {
+        this.prodId = prodId;
+    }
+
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Student.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Student.java
new file mode 100644
index 0000000000..a6dec4a30d
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Student.java
@@ -0,0 +1,23 @@
+package com.baeldung.hibernate.pojo;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Student {
+
+    @Id
+    @GeneratedValue (strategy = GenerationType.SEQUENCE)
+    private long studentId;
+
+    public long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudent_id(long studentId) {
+        this.studentId = studentId;
+    }
+    
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/User.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/User.java
new file mode 100644
index 0000000000..90203d29ec
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/User.java
@@ -0,0 +1,24 @@
+package com.baeldung.hibernate.pojo;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+
+@Entity
+public class User {
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequence-generator")
+    @SequenceGenerator(name = "sequence-generator", sequenceName = "user_sequence", initialValue = 4)
+    private long userId;
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/UserProfile.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/UserProfile.java
new file mode 100644
index 0000000000..ac870c2818
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/UserProfile.java
@@ -0,0 +1,34 @@
+package com.baeldung.hibernate.pojo;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapsId;
+import javax.persistence.OneToOne;
+
+@Entity
+public class UserProfile {
+
+    @Id
+    private long profileId;
+
+    @OneToOne
+    @MapsId
+    private User user;
+
+    public long getProfileId() {
+        return profileId;
+    }
+
+    public void setProfileId(long profileId) {
+        this.profileId = profileId;
+    }
+    
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+    
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/generator/MyGenerator.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/generator/MyGenerator.java
new file mode 100644
index 0000000000..17ffe9b7e1
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/generator/MyGenerator.java
@@ -0,0 +1,41 @@
+package com.baeldung.hibernate.pojo.generator;
+
+import java.io.Serializable;
+import java.util.Properties;
+import java.util.stream.Stream;
+
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.id.Configurable;
+import org.hibernate.id.IdentifierGenerator;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.type.Type;
+
+public class MyGenerator implements IdentifierGenerator, Configurable {
+
+    private String prefix;
+
+    @Override
+    public Serializable generate(SharedSessionContractImplementor session, Object obj) throws HibernateException {
+
+        String query = String.format("select %s from %s", 
+            session.getEntityPersister(obj.getClass().getName(), obj).getIdentifierPropertyName(),
+            obj.getClass().getSimpleName());
+
+        Stream<String> ids = session.createQuery(query).stream();
+
+        Long max = ids.map(o -> o.replace(prefix + "-", ""))
+            .mapToLong(Long::parseLong)
+            .max()
+            .orElse(0L);
+
+        return prefix + "-" + (max + 1);
+    }
+
+    @Override
+    public void configure(Type type, Properties properties, ServiceRegistry serviceRegistry) throws MappingException {
+        prefix = properties.getProperty("prefix");
+    }
+
+}
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/IdentifiersIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/IdentifiersIntegrationTest.java
new file mode 100644
index 0000000000..6b54dc80a8
--- /dev/null
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/IdentifiersIntegrationTest.java
@@ -0,0 +1,100 @@
+package com.baeldung.hibernate;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.hibernate.Transaction;
+import java.io.IOException;
+import org.hibernate.Session;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.baeldung.hibernate.pojo.Product;
+import com.baeldung.hibernate.pojo.Course;
+import com.baeldung.hibernate.pojo.OrderEntry;
+import com.baeldung.hibernate.pojo.OrderEntryIdClass;
+import com.baeldung.hibernate.pojo.OrderEntryPK;
+import com.baeldung.hibernate.pojo.Student;
+import com.baeldung.hibernate.pojo.User;
+import com.baeldung.hibernate.pojo.UserProfile;
+
+public class IdentifiersIntegrationTest {
+    private Session session;
+
+    private Transaction transaction;
+
+    @Before
+    public void setUp() throws IOException {
+        session = HibernateUtil.getSessionFactory()
+            .openSession();
+        transaction = session.beginTransaction();
+    }
+
+    @After
+    public void tearDown() {
+        transaction.rollback();
+        session.close();
+    }
+
+    @Test
+    public void whenSaveSimpleIdEntities_thenOk() {
+        Student student = new Student();
+        session.save(student);
+        User user = new User();
+        session.save(user);
+       
+        assertThat(student.getStudentId()).isEqualTo(1L);
+        assertThat(user.getUserId()).isEqualTo(4L);
+
+        Course course = new Course();
+        session.save(course);
+
+    }
+
+    @Test
+    public void whenSaveCustomGeneratedId_thenOk() {
+        Product product = new Product();
+        session.save(product);
+        Product product2 = new Product();
+        session.save(product2);
+
+        assertThat(product2.getProdId()).isEqualTo("prod-2");
+    }
+
+    @Test
+    public void whenSaveCompositeIdEntity_thenOk() {
+        OrderEntryPK entryPK = new OrderEntryPK();
+        entryPK.setOrderId(1L);
+        entryPK.setProductId(30L);
+
+        OrderEntry entry = new OrderEntry();
+        entry.setEntryId(entryPK);
+        session.save(entry);
+
+        assertThat(entry.getEntryId()
+            .getOrderId()).isEqualTo(1L);
+    }
+
+    @Test
+    public void whenSaveIdClassEntity_thenOk() {
+        OrderEntryIdClass entry = new OrderEntryIdClass();
+        entry.setOrderId(1L);
+        entry.setProductId(30L);
+        session.save(entry);
+
+        assertThat(entry.getOrderId()).isEqualTo(1L);
+    }
+
+    @Test
+    public void whenSaveDerivedIdEntity_thenOk() {
+        User user = new User();
+        session.save(user);
+
+        UserProfile profile = new UserProfile();
+        profile.setUser(user);
+        session.save(profile);
+
+        assertThat(profile.getProfileId()).isEqualTo(user.getUserId());
+    }
+
+}

From c6e7203f990270ecaef60444f70a22d3e17b8ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mitja=20Jeseni=C4=8Dnik=20Kotnik?= <mitja@cotnic.com>
Date: Fri, 10 Nov 2017 18:49:24 +0100
Subject: [PATCH 07/72] BAEL-624: Formating code (#3008)

---
 .../src/main/java/TestEJBServlet.java         | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java b/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
index e86f52ff56..a27f0efe51 100644
--- a/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
+++ b/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
@@ -16,32 +16,29 @@ import wildfly.beans.UserBeanLocal;
  * Servlet implementation class TestEJBServlet
  */
 public class TestEJBServlet extends HttpServlet {
-	private static final long serialVersionUID = 1L;
 
-	@EJB
-	private UserBeanLocal userBean;
+    @EJB
+    private UserBeanLocal userBean;
 
-	protected void doGet(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-		List<User> users = userBean.getUsers();
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        List<User> users = userBean.getUsers();
 
-		PrintWriter out = response.getWriter();
+        PrintWriter out = response.getWriter();
 
-		out.println("<html>");
-		out.println("<head><title>Users</title></head>");
-		out.println("<body>");
-		out.println("<center><h1>List of users:</h1>");
-		out.println("<table border=\"1\" align=\"center\" style=\"width:50%\">");
-		for (User user : users) {
-			out.println("<tr>");
-			out.print("<td>" + user.getUsername() + "</td>");
-			out.print("<td>" + user.getEmail() + "</td>");
-			out.println("</tr>");
-		}
-	}
+        out.println("<html>");
+        out.println("<head><title>Users</title></head>");
+        out.println("<body>");
+        out.println("<center><h1>List of users:</h1>");
+        out.println("<table border=\"1\" align=\"center\" style=\"width:50%\">");
+        for (User user : users) {
+            out.println("<tr>");
+            out.print("<td>" + user.getUsername() + "</td>");
+            out.print("<td>" + user.getEmail() + "</td>");
+            out.println("</tr>");
+        }
+    }
 
-	protected void doPost(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-		doGet(request, response);
-	}
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doGet(request, response);
+    }
 }

From fa589fa7bf6559457b2f31e725bf4457335b2271 Mon Sep 17 00:00:00 2001
From: Daniele Demichelis <danidemi@users.noreply.github.com>
Date: Sat, 11 Nov 2017 06:20:23 +0100
Subject: [PATCH 08/72] Bael 728 introduction to osgi (#3004)

* BAEL-728: first working geocoder example

* First steps with different geocoder

* Working plaing app

* Small step

* Maven project subdivided into components.

* <Export-Package> added

* CLient

* small step fwd

* Committing before resetting idea

* It does not compile!

* some other mod

* Works

* step

* Examples works

* removed unused code
---
 .../intro/osgi-intro-sample-activator/pom.xml | 55 +++++++++++
 .../osgi/sample/activator/HelloWorld.java     | 16 ++++
 osgi/intro/osgi-intro-sample-client/pom.xml   | 49 ++++++++++
 .../baeldung/osgi/sample/client/Client.java   | 44 +++++++++
 osgi/intro/osgi-intro-sample-service/pom.xml  | 46 ++++++++++
 .../sample/service/definition/Greeter.java    |  7 ++
 .../service/implementation/GreeterImpl.java   | 30 ++++++
 osgi/intro/pom.xml                            | 87 ++++++++++++++++++
 osgi/intro/readme.md                          | 91 +++++++++++++++++++
 9 files changed, 425 insertions(+)
 create mode 100644 osgi/intro/osgi-intro-sample-activator/pom.xml
 create mode 100644 osgi/intro/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java
 create mode 100644 osgi/intro/osgi-intro-sample-client/pom.xml
 create mode 100644 osgi/intro/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java
 create mode 100644 osgi/intro/osgi-intro-sample-service/pom.xml
 create mode 100644 osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java
 create mode 100644 osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java
 create mode 100644 osgi/intro/pom.xml
 create mode 100644 osgi/intro/readme.md

diff --git a/osgi/intro/osgi-intro-sample-activator/pom.xml b/osgi/intro/osgi-intro-sample-activator/pom.xml
new file mode 100644
index 0000000000..1584913627
--- /dev/null
+++ b/osgi/intro/osgi-intro-sample-activator/pom.xml
@@ -0,0 +1,55 @@
+<?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">
+
+    <!-- com.baeldung/osgi-intro-sample-activator/1.0-SNAPSHOT -->
+    <parent>
+        <artifactId>osgi-intro</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- Please, note this is not the usual 'jar'. -->
+    <packaging>bundle</packaging>
+
+    <artifactId>osgi-intro-sample-activator</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+
+                        <!-- Qualified name of the class that exposes the activator iface. -->
+                        <Bundle-Activator>com.baeldung.osgi.sample.activator.HelloWorld</Bundle-Activator>
+
+                        <!-- One important thing to note:
+                        since you are not exporting the package "com.baeldung.osgi.sample.activator",
+                        you should at least add it to the Private-Package instruction.
+                        Otherwise, the classes inside the package will not be copied to your bundle,
+                        as the default value of this instruction is empty. -->
+
+                        <Private-Package>com.baeldung.osgi.sample.activator</Private-Package>
+
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/osgi/intro/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java b/osgi/intro/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java
new file mode 100644
index 0000000000..72fe624bac
--- /dev/null
+++ b/osgi/intro/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java
@@ -0,0 +1,16 @@
+package com.baeldung.osgi.sample.activator;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class HelloWorld implements BundleActivator {
+
+    public void start(BundleContext ctx) {
+        System.out.println("Hello World.");
+    }
+
+    public void stop(BundleContext bundleContext) {
+        System.out.println("Goodbye World.");
+    }
+
+}
\ No newline at end of file
diff --git a/osgi/intro/osgi-intro-sample-client/pom.xml b/osgi/intro/osgi-intro-sample-client/pom.xml
new file mode 100644
index 0000000000..4096674d7d
--- /dev/null
+++ b/osgi/intro/osgi-intro-sample-client/pom.xml
@@ -0,0 +1,49 @@
+<?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">
+    <parent>
+        <artifactId>osgi-intro</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- mvn:com.baeldung/osgi-intro-sample-client/1.0-SNAPSHOT -->
+    <artifactId>osgi-intro-sample-client</artifactId>
+
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.baeldung</groupId>
+            <artifactId>osgi-intro-sample-service</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-Activator>com.baeldung.osgi.sample.client.Client</Bundle-Activator>
+
+                        <Private-Package>com.baeldung.osgi.sample.client</Private-Package>
+
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/osgi/intro/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java b/osgi/intro/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java
new file mode 100644
index 0000000000..a82ed63fa7
--- /dev/null
+++ b/osgi/intro/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java
@@ -0,0 +1,44 @@
+package com.baeldung.osgi.sample.client;
+
+import com.baeldung.osgi.sample.service.definition.Greeter;
+import org.osgi.framework.*;
+
+public class Client implements BundleActivator, ServiceListener {
+
+    private BundleContext ctx;
+    private ServiceReference serviceReference;
+
+    public void start(BundleContext ctx) {
+        this.ctx = ctx;
+        try {
+            ctx.addServiceListener(this, "(objectclass=" + Greeter.class.getName() + ")");
+        } catch (InvalidSyntaxException ise) {
+            ise.printStackTrace();
+        }
+    }
+
+    public void stop(BundleContext bundleContext) {
+        if (serviceReference != null) {
+            ctx.ungetService(serviceReference);
+        }
+        this.ctx = null;
+    }
+
+    public void serviceChanged(ServiceEvent serviceEvent) {
+        int type = serviceEvent.getType();
+        switch (type) {
+        case (ServiceEvent.REGISTERED):
+            System.out.println("Notification of service registered.");
+            serviceReference = serviceEvent.getServiceReference();
+            Greeter service = (Greeter) (ctx.getService(serviceReference));
+            System.out.println(service.sayHiTo("John"));
+            break;
+        case (ServiceEvent.UNREGISTERING):
+            System.out.println("Notification of service unregistered.");
+            ctx.ungetService(serviceEvent.getServiceReference());
+            break;
+        default:
+            break;
+        }
+    }
+}
diff --git a/osgi/intro/osgi-intro-sample-service/pom.xml b/osgi/intro/osgi-intro-sample-service/pom.xml
new file mode 100644
index 0000000000..cbc660bb74
--- /dev/null
+++ b/osgi/intro/osgi-intro-sample-service/pom.xml
@@ -0,0 +1,46 @@
+<?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">
+
+    <!-- mvn:com.baeldung/osgi-intro-sample-service/1.0-SNAPSHOT -->
+    <parent>
+        <artifactId>osgi-intro</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>osgi-intro-sample-service</artifactId>
+
+    <!-- Please, note this is not the usual 'jar'. -->
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-Activator>com.baeldung.osgi.sample.service.implementation.GreeterImpl</Bundle-Activator>
+                        <Private-Package>com.baeldung.osgi.sample.service.implementation</Private-Package>
+                        <Export-Package>com.baeldung.osgi.sample.service.definition</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java b/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java
new file mode 100644
index 0000000000..f1e82a3465
--- /dev/null
+++ b/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java
@@ -0,0 +1,7 @@
+package com.baeldung.osgi.sample.service.definition;
+
+public interface Greeter {
+
+    public String sayHiTo(String name);
+
+}
diff --git a/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java b/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java
new file mode 100644
index 0000000000..48e26e3e6b
--- /dev/null
+++ b/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java
@@ -0,0 +1,30 @@
+package com.baeldung.osgi.sample.service.implementation;
+
+import com.baeldung.osgi.sample.service.definition.Greeter;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+
+import java.util.Hashtable;
+
+public class GreeterImpl implements Greeter, BundleActivator {
+
+    private ServiceReference<Greeter> reference;
+    private ServiceRegistration<Greeter> registration;
+
+    @Override public String sayHiTo(String name) {
+        return "Hello " + name;
+    }
+
+    @Override public void start(BundleContext context) throws Exception {
+        System.out.println("Registering service.");
+        registration = context.registerService(Greeter.class, new GreeterImpl(), new Hashtable<String, String>());
+        reference = registration.getReference();
+    }
+
+    @Override public void stop(BundleContext context) throws Exception {
+        System.out.println("Unregistering service.");
+        registration.unregister();
+    }
+}
diff --git a/osgi/intro/pom.xml b/osgi/intro/pom.xml
new file mode 100644
index 0000000000..83db90d19e
--- /dev/null
+++ b/osgi/intro/pom.xml
@@ -0,0 +1,87 @@
+<?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>osgi-intro</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <modules>
+        <module>osgi-intro-sample-activator</module>
+        <module>osgi-intro-sample-service</module>
+        <module>osgi-intro-sample-client</module>
+    </modules>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>osgi-intro-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>osgi-intro-service</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>osgi-intro-gxyz</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>osgi-intro-mapquest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>3.9.0</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.json</groupId>
+                <artifactId>javax.json-api</artifactId>
+                <version>1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish</groupId>
+                <artifactId>javax.json</artifactId>
+                <version>1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>5.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>1.4.0</version>
+                    <extensions>true</extensions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/osgi/intro/readme.md b/osgi/intro/readme.md
new file mode 100644
index 0000000000..ea4a411c7b
--- /dev/null
+++ b/osgi/intro/readme.md
@@ -0,0 +1,91 @@
+OSGi
+====
+
+Info
+---
+
+com.baeldung.osgi
+com.baeldung.osgi.sample.activator
+
+Apache Felix
+---
+
+
+### Start
+
+Download Apache Felix Framework Distribution 
+from <https://felix.apache.org/downloads.cgi>
+org.apache.felix.main.distribution-5.6.8 
+
+No! The Apache Karaf container is best.
+Download it from: <https://karaf.apache.org/download.html>
+
+Download a binary distribution and unzip wherever you prefer.
+
+Then run
+
+    bin\karaf.bat start
+
+
+Unzip, pay attention to the files not being clipped(!).
+
+    system:exit 
+    
+exit!
+
+    shutdown -h
+ 
+or `^D`
+
+### clean start
+
+full clean, remove "data directory "
+
+or...
+
+    bin\karaf.bat clean
+
+    bin\start.bat clean
+
+### run mode
+
+can be launched in
+
+- the "regular" mode starts Apache Karaf in foreground, including the shell console.
+- the "server" mode starts Apache Karaf in foreground, without the shell console.
+- the "background" mode starts Apache Karaf in background.
+
+### Logging
+
+https://karaf.apache.org/manual/latest/#_log
+
+can be logged to console
+
+
+### Bundle deploy
+
+    bundle:install mvn:com.baeldung/osgi-intro-sample-activator/1.0-SNAPSHOT
+    
+    install mvn:com.baeldung/osgi-intro-sample-service/1.0-SNAPSHOT
+    install mvn:com.baeldung/osgi-intro-sample-client/1.0-SNAPSHOT
+
+Eclipse's Equinox
+====
+
+Eclipse's OSGi platform
+http://www.eclipse.org/equinox/
+
+http://www.eclipse.org/equinox/documents/quickstart-framework.php
+
+click on "download"
+
+Latest Release
+Oxygen.1 	Wed, 6 Sep 2017 -- 17:00 (-0400)
+
+org.eclipse.osgi_3.12.1.v20170821-1548.jar
+
+ = = NOT GOOD = =
+ 
+
+
+

From 9341d6f75146f46415b54f025a49b54679a02cbc Mon Sep 17 00:00:00 2001
From: "dhrubajyoti.bhattacharjee" <dhruba619@gmail.com>
Date: Fri, 10 Nov 2017 00:18:16 +0530
Subject: [PATCH 09/72] BAEL-1160 Introduction to Apache Lucene

---
 lucene/pom.xml                                | 37 +++++++++
 .../baeldung/lucene/InMemoryLuceneIndex.java  | 78 +++++++++++++++++++
 .../lucene/LuceneInMemorySearchTest.java      | 23 ++++++
 pom.xml                                       |  1 +
 4 files changed, 139 insertions(+)
 create mode 100644 lucene/pom.xml
 create mode 100644 lucene/src/main/java/com/baeldung/lucene/InMemoryLuceneIndex.java
 create mode 100644 lucene/src/test/java/com/baeldung/lucene/LuceneInMemorySearchTest.java

diff --git a/lucene/pom.xml b/lucene/pom.xml
new file mode 100644
index 0000000000..42b81a7d4a
--- /dev/null
+++ b/lucene/pom.xml
@@ -0,0 +1,37 @@
+<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>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-modules</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>lucene</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>lucene</name>
+	<description>An Apache Lucene demo application</description>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-core</artifactId>
+			<version>7.1.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-queryparser</artifactId>
+			<version>7.1.0</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/junit/junit -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+</project>
\ No newline at end of file
diff --git a/lucene/src/main/java/com/baeldung/lucene/InMemoryLuceneIndex.java b/lucene/src/main/java/com/baeldung/lucene/InMemoryLuceneIndex.java
new file mode 100644
index 0000000000..40a35fad86
--- /dev/null
+++ b/lucene/src/main/java/com/baeldung/lucene/InMemoryLuceneIndex.java
@@ -0,0 +1,78 @@
+package com.baeldung.lucene;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.Directory;
+
+public class InMemoryLuceneIndex {
+
+    private Directory memoryIndex;
+    private StandardAnalyzer analyzer;
+
+    public InMemoryLuceneIndex(Directory memoryIndex, StandardAnalyzer analyzer) {
+        super();
+        this.memoryIndex = memoryIndex;
+        this.analyzer = analyzer;
+    }
+
+    /**
+     * 
+     * @param title
+     * @param body
+     */
+    public void indexDocument(String title, String body) {
+
+        IndexWriterConfig indexWriterConfig = new IndexWriterConfig(analyzer);
+        try {
+            IndexWriter writter = new IndexWriter(memoryIndex, indexWriterConfig);
+            Document document = new Document();
+
+            document.add(new TextField("title", title, Field.Store.YES));
+            document.add(new TextField("body", body, Field.Store.YES));
+
+            writter.addDocument(document);
+            writter.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public List<Document> searchIndex(String inField, String queryString) {
+        try {
+            Query query = new QueryParser(inField, analyzer).parse(queryString);
+
+            IndexReader indexReader = DirectoryReader.open(memoryIndex);
+            IndexSearcher searcher = new IndexSearcher(indexReader);
+            TopDocs topDocs = searcher.search(query, 10);
+            List<Document> documents = new ArrayList<>();
+            for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
+                documents.add(searcher.doc(scoreDoc.doc));
+            }
+
+            return documents;
+        } catch (IOException | ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+
+    }
+
+}
+
+
diff --git a/lucene/src/test/java/com/baeldung/lucene/LuceneInMemorySearchTest.java b/lucene/src/test/java/com/baeldung/lucene/LuceneInMemorySearchTest.java
new file mode 100644
index 0000000000..c3a498a4b8
--- /dev/null
+++ b/lucene/src/test/java/com/baeldung/lucene/LuceneInMemorySearchTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.lucene;
+
+import java.util.List;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.store.RAMDirectory;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class LuceneInMemorySearchTest {
+
+    @Test
+    public void givenSearchQueryWhenFetchedDocumentThenCorrect() {
+        InMemoryLuceneIndex inMemoryLuceneIndex = new InMemoryLuceneIndex(new RAMDirectory(), new StandardAnalyzer());
+        inMemoryLuceneIndex.indexDocument("Hello world", "Some hello world ");
+
+        List<Document> documents = inMemoryLuceneIndex.searchIndex("body", "world");
+
+        Assert.assertEquals("Hello world", documents.get(0).get("title"));
+    }
+
+}
diff --git a/pom.xml b/pom.xml
index bc8e35ba94..403cd47aa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,6 +260,7 @@
         <module>saas</module>
         <module>deeplearning4j</module>
         <module>spring-boot-admin</module>
+        <module>lucene</module>
     </modules>
 
     <dependencies>

From 776a01429eb6b7ec0d1153f88097e2cc9915e599 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Sun, 12 Nov 2017 11:16:46 +0100
Subject: [PATCH 10/72] Group testing modules (#3014)

* move security content from spring-security-rest-full

* swagger update

* move query language to new module

* rename spring-security-rest-full to spring-rest-full

* group persistence modules

* group testing modules

* try fix conflict
---
 pom.xml                                       |  24 +++++++++---------
 .../gatling}/README.md                        |   0
 {gatling => testing-modules/gatling}/pom.xml  |   0
 .../gatling}/src/test/resources/gatling.conf  |   0
 .../gatling}/src/test/resources/logback.xml   |   0
 .../gatling}/src/test/resources/recorder.conf |   0
 .../gatling}/src/test/scala/Engine.scala      |   0
 .../src/test/scala/IDEPathHelper.scala        |   0
 .../gatling}/src/test/scala/Recorder.scala    |   0
 .../org/baeldung/RecordedSimulation.scala     |   0
 .../groovy-spock}/README.md                   |   0
 .../groovy-spock}/pom.xml                     |   1 +
 .../src/test/groovy/FirstSpecification.groovy |   0
 .../src/test/groovy/Notifier.groovy           |   0
 .../src/test/groovy/PaymentGateway.groovy     |   0
 {junit5 => testing-modules/junit-5}/README.md |   0
 {junit5 => testing-modules/junit-5}/pom.xml   |   5 ++--
 .../com/baeldung/junit5/mockito/User.java     |   0
 .../junit5/mockito/repository/MailClient.java |   0
 .../mockito/repository/SettingRepository.java |   0
 .../mockito/repository/UserRepository.java    |   0
 .../mockito/service/DefaultUserService.java   |   0
 .../junit5/mockito/service/Errors.java        |   0
 .../junit5/mockito/service/UserService.java   |   0
 .../java/com/baeldung/AssertionUnitTest.java  |   0
 .../java/com/baeldung/AssumptionUnitTest.java |   0
 .../com/baeldung/DynamicTestsExample.java     |   0
 .../test/java/com/baeldung/EmployeesTest.java |   0
 .../java/com/baeldung/ExceptionUnitTest.java  |   0
 .../test/java/com/baeldung/FirstUnitTest.java |   0
 .../baeldung/JUnit5NewFeaturesUnitTest.java   |   0
 .../src/test/java/com/baeldung/LiveTest.java  |   0
 .../java/com/baeldung/NestedUnitTest.java     |   0
 .../com/baeldung/RepeatedTestExample.java     |   0
 .../test/java/com/baeldung/StringUtils.java   |   0
 .../java/com/baeldung/TaggedUnitTest.java     |   0
 .../test/java/com/baeldung/TestLauncher.java  |   0
 .../EmployeeDaoParameterResolver.java         |   0
 .../EmployeeDatabaseSetupExtension.java       |   0
 .../extensions/EnvironmentExtension.java      |   0
 .../IgnoreFileNotFoundExceptionExtension.java |   0
 .../baeldung/extensions/LoggingExtension.java |   0
 .../java/com/baeldung/helpers/Employee.java   |   0
 .../com/baeldung/helpers/EmployeeDao.java     |   0
 .../com/baeldung/helpers/EmployeeJdbcDao.java |   0
 .../baeldung/helpers/JdbcConnectionUtil.java  |   0
 .../junit5/mockito/MockitoExtension.java      |   0
 .../junit5/mockito/UserServiceUnitTest.java   |   0
 .../junit4/AnnotationTestExampleTest.java     |   0
 .../junit4/AssertionsExampleTest.java         |   0
 .../migration/junit4/RuleExampleTest.java     |   0
 .../junit4/categories/Annotations.java        |   0
 .../junit4/categories/JUnit4Tests.java        |   0
 .../junit4/rules/TraceUnitTestRule.java       |   0
 .../junit5/AnnotationTestExampleTest.java     |   0
 .../junit5/AssertionsExampleTest.java         |   0
 .../migration/junit5/RuleExampleTest.java     |   0
 .../junit5/extensions/TraceUnitExtension.java |   0
 .../param/InvalidPersonParameterResolver.java |   0
 .../test/java/com/baeldung/param/Person.java  |   0
 .../com/baeldung/param/PersonValidator.java   |   0
 .../baeldung/param/PersonValidatorTest.java   |   0
 .../param/ValidPersonParameterResolver.java   |   0
 .../java/com/baeldung/suites/AllTests.java    |   0
 .../org.junit.jupiter.api.extension.Extension |   0
 .../extensions/application.properties         |   0
 .../com/baeldung/helpers/jdbc.properties      |   0
 .../mockito-2}/.gitignore                     |   0
 .../mockito-2}/README.md                      |   0
 .../mockito-2}/pom.xml                        |   3 ++-
 .../baeldung/mockito/java8/JobPosition.java   |   0
 .../baeldung/mockito/java8/JobService.java    |   0
 .../com/baeldung/mockito/java8/Person.java    |   0
 .../mockito/java8/UnemploymentService.java    |   0
 .../java8/UnemploymentServiceImpl.java        |   0
 .../ArgumentMatcherWithLambdaUnitTest.java    |   0
 .../ArgumentMatcherWithoutLambdaUnitTest.java |   0
 .../java8/CustomAnswerWithLambdaUnitTest.java |   0
 .../CustomAnswerWithoutLambdaUnitTest.java    |   0
 .../mockito/java8/JobServiceUnitTest.java     |   0
 .../UnemploymentServiceImplUnitTest.java      |   0
 .../mockito}/.gitignore                       |   0
 .../mockito}/README.md                        |   0
 {mockito => testing-modules/mockito}/pom.xml  |   1 +
 .../mockito}/src/main/resources/logback.xml   |   0
 .../CollaboratorForPartialMocking.java        |   0
 .../CollaboratorWithFinalMethods.java         |   0
 .../CollaboratorWithStaticMethods.java        |   0
 .../introduction/LuckyNumberGenerator.java    |   0
 .../LuckyNumberGeneratorTest.java             |   0
 .../PowerMockitoIntegrationTest.java          |   0
 .../MockitoAnnotationIntegrationTest.java     |   0
 .../MockitoConfigExamplesIntegrationTest.java |   0
 .../MockitoExceptionIntegrationTest.java      |   0
 .../mockito/MockitoMockIntegrationTest.java   |   0
 .../mockito/MockitoSpyIntegrationTest.java    |   0
 .../MockitoVerifyExamplesIntegrationTest.java |   0
 .../mockito/MockitoVoidMethodsTest.java       |   0
 .../org/baeldung/mockito/MyDictionary.java    |   0
 .../java/org/baeldung/mockito/MyList.java     |   0
 {mocks => testing-modules/mocks}/README.md    |   0
 .../mocks}/jmockit/README.md                  |   0
 .../mocks}/jmockit/pom.xml                    |   2 +-
 .../mocks/jmockit/AdvancedCollaborator.java   |   0
 .../baeldung/mocks/jmockit/Collaborator.java  |   0
 .../jmockit/ExpectationsCollaborator.java     |   0
 .../org/baeldung/mocks/jmockit/Model.java     |   0
 .../org/baeldung/mocks/jmockit/Performer.java |   0
 .../AdvancedCollaboratorIntegrationTest.java  |   0
 .../jmockit/ExpectationsIntegrationTest.java  |   0
 .../jmockit/PerformerIntegrationTest.java     |   0
 .../mocks/jmockit/ReusingIntegrationTest.java |   0
 .../mocks}/mock-comparisons/README.md         |   0
 .../mocks}/mock-comparisons/pom.xml           |   2 +-
 .../mocks/testCase/LoginController.java       |   0
 .../org/baeldung/mocks/testCase/LoginDao.java |   0
 .../baeldung/mocks/testCase/LoginService.java |   0
 .../org/baeldung/mocks/testCase/UserForm.java |   0
 .../LoginControllerIntegrationTest.java       |   0
 .../LoginControllerIntegrationTest.java       |   0
 .../LoginControllerIntegrationTest.java       |   0
 {mocks => testing-modules/mocks}/pom.xml      |   2 +-
 .../mockserver}/README.md                     |   0
 .../mockserver}/pom.xml                       |   0
 .../server/ExpectationCallbackHandler.java    |   0
 .../mock/server/MockServerLiveTest.java       |   0
 .../rest-assured}/.gitignore                  |   0
 .../rest-assured}/README.md                   |   0
 .../rest-assured}/pom.xml                     |   1 +
 .../RestAssured2IntegrationTest.java          |   0
 .../RestAssuredIntegrationTest.java           |   0
 .../RestAssuredXML2IntegrationTest.java       |   0
 .../RestAssuredXMLIntegrationTest.java        |   0
 .../java/com/baeldung/restassured/Util.java   |   0
 .../src/test/resources/employees.xml          |   0
 .../src/test/resources/event_0.json           |   0
 .../src/test/resources/logback.xml            |   0
 .../src/test/resources/odds.json              |   0
 .../src/test/resources/teachers.xml           |   0
 .../rest-testing}/.gitignore                  |   0
 .../rest-testing}/README.md                   |   0
 .../rest-testing}/pom.xml                     |   1 +
 .../main/resources/Feature/cucumber.feature   |  10 ++++++++
 .../src/main/resources/cucumber.json          |   0
 .../src/main/resources/logback.xml            |   0
 .../src/main/resources/wiremock_intro.json    |   0
 .../cucumber/CucumberIntegrationTest.java     |   0
 .../rest/cucumber/StepDefinition.java         |   0
 .../baeldung/rest/jbehave/AbstractStory.java  |   0
 .../rest/jbehave/GithubUserNotFoundSteps.java |   0
 .../GithubUserNotFoundStoryLiveTest.java      |   0
 .../GithubUserResponseMediaTypeSteps.java     |   0
 ...hubUserResponseMediaTypeStoryLiveTest.java |   0
 .../GithubUserResponsePayloadSteps.java       |   0
 ...ithubUserResponsePayloadStoryLiveTest.java |   0
 .../baeldung/rest/jbehave/IncreaseSteps.java  |   0
 .../rest/jbehave/IncreaseStoryLiveTest.java   |   0
 .../JUnitManagedIntegrationTest.java          |   0
 .../ProgrammaticallyManagedLiveTest.java      |   0
 .../java/org/baeldung/rest/GitHubUser.java    |   0
 .../baeldung/rest/GithubBasicLiveTest.java    |   0
 .../java/org/baeldung/rest/RetrieveUtil.java  |   0
 .../resources/github_user_not_found.story     |   0
 .../github_user_response_mediatype.story      |   0
 .../github_user_response_payload.story        |   0
 .../src/test/resources/increase.story         |   0
 .../selenium-junit-testng}/README.md          |   0
 .../selenium-junit-testng}/geckodriver.mac    | Bin
 .../selenium-junit-testng}/pom.xml            |   1 +
 .../baeldung/selenium/SeleniumExample.java    |   0
 .../selenium/config/SeleniumConfig.java       |   0
 .../selenium/models/BaeldungAbout.java        |   0
 .../selenium/pages/BaeldungAboutPage.java     |   0
 .../selenium/pages/BaeldungHomePage.java      |   0
 .../selenium/pages/StartHerePage.java         |   0
 .../junit/SeleniumPageObjectLiveTest.java     |   0
 .../junit/SeleniumWithJUnitLiveTest.java      |   0
 .../testng/SeleniumWithTestNGLiveTest.java    |   0
 .../testing}/README.md                        |   0
 {testing => testing-modules/testing}/pom.xml  |   1 +
 .../com/baeldung/cucumber/Calculator.java     |   0
 .../introductionjukito/Calculator.java        |   0
 .../ScientificCalculator.java                 |   0
 .../introductionjukito/SimpleCalculator.java  |   0
 .../java/com/baeldung/junit/Calculator.java   |   0
 .../junitparams/SafeAdditionUtil.java         |   0
 .../com/baeldung/lambdabehave/Calculator.java |   0
 .../com/baeldung/testing/assertj/Dog.java     |   0
 .../com/baeldung/testing/assertj/Person.java  |   0
 .../baeldung/testing/mutation/Palindrome.java |   0
 .../java/com/baeldung/testing/truth/User.java |   0
 .../baeldung/testing/truth/UserSubject.java   |   0
 .../introductionjukito/CalculatorTest.java    |   0
 .../java/com/baeldung/junit/AdditionTest.java |   0
 .../baeldung/junit/BlockingTestRunner.java    |   0
 .../com/baeldung/junit/CalculatorTest.java    |   0
 .../com/baeldung/junit/SubstractionTest.java  |   0
 .../java/com/baeldung/junit/SuiteTest.java    |   0
 .../java/com/baeldung/junit/TestRunner.java   |   0
 .../junitparams/SafeAdditionUtilTest.java     |   0
 .../junitparams/TestDataProvider.java         |   0
 .../baeldung/lambdabehave/CalculatorTest.java |   0
 .../mutation/test/PalindromeUnitTest.java     |   0
 .../testing/assertj/AssertJCoreUnitTest.java  |   0
 .../testing/assertj/AssertJGuavaUnitTest.java |   0
 .../testing/assertj/AssertJJava8UnitTest.java |   0
 .../calculator/CalculatorIntegrationTest.java |   0
 .../calculator/CalculatorRunSteps.java        |   0
 .../jgotesting/JGoTestingUnitTest.java        |   0
 .../shopping/ShoppingIntegrationTest.java     |   0
 .../testing/shopping/ShoppingStepsDef.java    |   0
 .../testing/truth/GoogleTruthUnitTest.java    |   0
 .../resources/JunitParamsTestParameters.csv   |   0
 .../calculator-scenario-outline.feature       |   0
 .../resources/features/calculator.feature     |   0
 .../test/resources/features/shopping.feature  |   0
 {testng => testing-modules/testng}/README.md  |   0
 {testng => testing-modules/testng}/pom.xml    |   1 +
 .../DependentLongRunningUnitTest.java         |   0
 .../com/baeldung/GroupIntegrationTest.java    |   0
 .../MultiThreadedIntegrationTest.java         |   0
 .../ParametrizedLongRunningUnitTest.java      |   0
 .../baeldung/PriorityLongRunningUnitTest.java |   0
 .../RegistrationLongRunningUnitTest.java      |   0
 .../baeldung/SignInLongRunningUnitTest.java   |   0
 .../baeldung/SimpleLongRunningUnitTest.java   |   0
 .../SummationServiceIntegrationTest.java      |   0
 .../com/baeldung/TimeOutIntegrationTest.java  |   0
 .../baeldung/reports/CustomisedListener.java  |   0
 .../baeldung/reports/CustomisedReports.java   |   0
 .../testng}/src/test/resources/logback.xml    |   0
 .../test/resources/parametrized_testng.xml    |   0
 .../src/test/resources/reportTemplate.html    |   0
 .../testng}/src/test/resources/test_group.xml |   0
 .../testng}/src/test/resources/test_setup.xml |   0
 .../testng}/src/test/resources/test_suite.xml |   0
 236 files changed, 37 insertions(+), 18 deletions(-)
 rename {gatling => testing-modules/gatling}/README.md (100%)
 rename {gatling => testing-modules/gatling}/pom.xml (100%)
 rename {gatling => testing-modules/gatling}/src/test/resources/gatling.conf (100%)
 rename {gatling => testing-modules/gatling}/src/test/resources/logback.xml (100%)
 rename {gatling => testing-modules/gatling}/src/test/resources/recorder.conf (100%)
 rename {gatling => testing-modules/gatling}/src/test/scala/Engine.scala (100%)
 rename {gatling => testing-modules/gatling}/src/test/scala/IDEPathHelper.scala (100%)
 rename {gatling => testing-modules/gatling}/src/test/scala/Recorder.scala (100%)
 rename {gatling => testing-modules/gatling}/src/test/scala/org/baeldung/RecordedSimulation.scala (100%)
 rename {groovy-spock => testing-modules/groovy-spock}/README.md (100%)
 rename {groovy-spock => testing-modules/groovy-spock}/pom.xml (97%)
 rename {groovy-spock => testing-modules/groovy-spock}/src/test/groovy/FirstSpecification.groovy (100%)
 rename {groovy-spock => testing-modules/groovy-spock}/src/test/groovy/Notifier.groovy (100%)
 rename {groovy-spock => testing-modules/groovy-spock}/src/test/groovy/PaymentGateway.groovy (100%)
 rename {junit5 => testing-modules/junit-5}/README.md (100%)
 rename {junit5 => testing-modules/junit-5}/pom.xml (97%)
 rename {junit5 => testing-modules/junit-5}/src/main/java/com/baeldung/junit5/mockito/User.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/main/java/com/baeldung/junit5/mockito/service/Errors.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/main/java/com/baeldung/junit5/mockito/service/UserService.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/AssertionUnitTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/AssumptionUnitTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/DynamicTestsExample.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/EmployeesTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/ExceptionUnitTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/FirstUnitTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/LiveTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/NestedUnitTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/RepeatedTestExample.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/StringUtils.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/TaggedUnitTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/TestLauncher.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/extensions/EmployeeDaoParameterResolver.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/extensions/EnvironmentExtension.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/extensions/IgnoreFileNotFoundExceptionExtension.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/extensions/LoggingExtension.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/helpers/Employee.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/helpers/EmployeeDao.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit4/AssertionsExampleTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit4/RuleExampleTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit4/categories/JUnit4Tests.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit5/AssertionsExampleTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit5/RuleExampleTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/param/InvalidPersonParameterResolver.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/param/Person.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/param/PersonValidator.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/param/PersonValidatorTest.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/param/ValidPersonParameterResolver.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/suites/AllTests.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/resources/com/baeldung/extensions/application.properties (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/resources/com/baeldung/helpers/jdbc.properties (100%)
 rename {mockito2 => testing-modules/mockito-2}/.gitignore (100%)
 rename {mockito2 => testing-modules/mockito-2}/README.md (100%)
 rename {mockito2 => testing-modules/mockito-2}/pom.xml (96%)
 rename {mockito2 => testing-modules/mockito-2}/src/main/java/com/baeldung/mockito/java8/JobPosition.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/main/java/com/baeldung/mockito/java8/JobService.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/main/java/com/baeldung/mockito/java8/Person.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/main/java/com/baeldung/mockito/java8/UnemploymentService.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/main/java/com/baeldung/mockito/java8/UnemploymentServiceImpl.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithLambdaUnitTest.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithoutLambdaUnitTest.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithLambdaUnitTest.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithoutLambdaUnitTest.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/test/java/com/baeldung/mockito/java8/JobServiceUnitTest.java (100%)
 rename {mockito2 => testing-modules/mockito-2}/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java (100%)
 rename {mockito => testing-modules/mockito}/.gitignore (100%)
 rename {mockito => testing-modules/mockito}/README.md (100%)
 rename {mockito => testing-modules/mockito}/pom.xml (98%)
 rename {mockito => testing-modules/mockito}/src/main/resources/logback.xml (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/org/baeldung/mockito/MockitoExceptionIntegrationTest.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/org/baeldung/mockito/MyDictionary.java (100%)
 rename {mockito => testing-modules/mockito}/src/test/java/org/baeldung/mockito/MyList.java (100%)
 rename {mocks => testing-modules/mocks}/README.md (100%)
 rename {mocks => testing-modules/mocks}/jmockit/README.md (100%)
 rename {mocks => testing-modules/mocks}/jmockit/pom.xml (95%)
 rename {mocks => testing-modules/mocks}/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java (100%)
 rename {mocks => testing-modules/mocks}/jmockit/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java (100%)
 rename {mocks => testing-modules/mocks}/jmockit/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java (100%)
 rename {mocks => testing-modules/mocks}/jmockit/src/main/java/org/baeldung/mocks/jmockit/Model.java (100%)
 rename {mocks => testing-modules/mocks}/jmockit/src/main/java/org/baeldung/mocks/jmockit/Performer.java (100%)
 rename {mocks => testing-modules/mocks}/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java (100%)
 rename {mocks => testing-modules/mocks}/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java (100%)
 rename {mocks => testing-modules/mocks}/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java (100%)
 rename {mocks => testing-modules/mocks}/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java (100%)
 rename {mocks => testing-modules/mocks}/mock-comparisons/README.md (100%)
 rename {mocks => testing-modules/mocks}/mock-comparisons/pom.xml (97%)
 rename {mocks => testing-modules/mocks}/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginController.java (100%)
 rename {mocks => testing-modules/mocks}/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginDao.java (100%)
 rename {mocks => testing-modules/mocks}/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginService.java (100%)
 rename {mocks => testing-modules/mocks}/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/UserForm.java (100%)
 rename {mocks => testing-modules/mocks}/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java (100%)
 rename {mocks => testing-modules/mocks}/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java (100%)
 rename {mocks => testing-modules/mocks}/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java (100%)
 rename {mocks => testing-modules/mocks}/pom.xml (92%)
 rename {mockserver => testing-modules/mockserver}/README.md (100%)
 rename {mockserver => testing-modules/mockserver}/pom.xml (100%)
 rename {mockserver => testing-modules/mockserver}/src/main/java/com/baeldung/mock/server/ExpectationCallbackHandler.java (100%)
 rename {mockserver => testing-modules/mockserver}/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java (100%)
 rename {rest-assured => testing-modules/rest-assured}/.gitignore (100%)
 rename {rest-assured => testing-modules/rest-assured}/README.md (100%)
 rename {rest-assured => testing-modules/rest-assured}/pom.xml (99%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java (100%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java (100%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java (100%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java (100%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/java/com/baeldung/restassured/Util.java (100%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/resources/employees.xml (100%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/resources/event_0.json (100%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/resources/logback.xml (100%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/resources/odds.json (100%)
 rename {rest-assured => testing-modules/rest-assured}/src/test/resources/teachers.xml (100%)
 rename {rest-testing => testing-modules/rest-testing}/.gitignore (100%)
 rename {rest-testing => testing-modules/rest-testing}/README.md (100%)
 rename {rest-testing => testing-modules/rest-testing}/pom.xml (99%)
 create mode 100644 testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature
 rename {rest-testing => testing-modules/rest-testing}/src/main/resources/cucumber.json (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/main/resources/logback.xml (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/main/resources/wiremock_intro.json (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/cucumber/CucumberIntegrationTest.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/cucumber/StepDefinition.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/jbehave/AbstractStory.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundSteps.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundStoryLiveTest.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeSteps.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeStoryLiveTest.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadStoryLiveTest.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/jbehave/IncreaseSteps.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/jbehave/IncreaseStoryLiveTest.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/wiremock/introduction/ProgrammaticallyManagedLiveTest.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/org/baeldung/rest/GitHubUser.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/org/baeldung/rest/GithubBasicLiveTest.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/org/baeldung/rest/RetrieveUtil.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/resources/github_user_not_found.story (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/resources/github_user_response_mediatype.story (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/resources/github_user_response_payload.story (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/resources/increase.story (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/README.md (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/geckodriver.mac (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/pom.xml (98%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/src/main/java/com/baeldung/selenium/SeleniumExample.java (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/src/main/java/com/baeldung/selenium/config/SeleniumConfig.java (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/src/main/java/com/baeldung/selenium/models/BaeldungAbout.java (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/src/main/java/com/baeldung/selenium/pages/BaeldungAboutPage.java (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/src/main/java/com/baeldung/selenium/pages/BaeldungHomePage.java (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/src/main/java/com/baeldung/selenium/pages/StartHerePage.java (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/src/test/java/com/baeldung/selenium/junit/SeleniumPageObjectLiveTest.java (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/src/test/java/com/baeldung/selenium/junit/SeleniumWithJUnitLiveTest.java (100%)
 rename {selenium-junit-testng => testing-modules/selenium-junit-testng}/src/test/java/com/baeldung/selenium/testng/SeleniumWithTestNGLiveTest.java (100%)
 rename {testing => testing-modules/testing}/README.md (100%)
 rename {testing => testing-modules/testing}/pom.xml (99%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/cucumber/Calculator.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/introductionjukito/Calculator.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/introductionjukito/ScientificCalculator.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/introductionjukito/SimpleCalculator.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/junit/Calculator.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/lambdabehave/Calculator.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/testing/assertj/Dog.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/testing/assertj/Person.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/testing/mutation/Palindrome.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/testing/truth/User.java (100%)
 rename {testing => testing-modules/testing}/src/main/java/com/baeldung/testing/truth/UserSubject.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/introductionjukito/CalculatorTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/junit/AdditionTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/junit/BlockingTestRunner.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/junit/CalculatorTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/junit/SubstractionTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/junit/SuiteTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/junit/TestRunner.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/junitparams/TestDataProvider.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/lambdabehave/CalculatorTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/testing/calculator/CalculatorIntegrationTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/testing/calculator/CalculatorRunSteps.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/testing/jgotesting/JGoTestingUnitTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/testing/shopping/ShoppingIntegrationTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/testing/shopping/ShoppingStepsDef.java (100%)
 rename {testing => testing-modules/testing}/src/test/java/com/baeldung/testing/truth/GoogleTruthUnitTest.java (100%)
 rename {testing => testing-modules/testing}/src/test/resources/JunitParamsTestParameters.csv (100%)
 rename {testing => testing-modules/testing}/src/test/resources/features/calculator-scenario-outline.feature (100%)
 rename {testing => testing-modules/testing}/src/test/resources/features/calculator.feature (100%)
 rename {testing => testing-modules/testing}/src/test/resources/features/shopping.feature (100%)
 rename {testng => testing-modules/testng}/README.md (100%)
 rename {testng => testing-modules/testng}/pom.xml (95%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/DependentLongRunningUnitTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/GroupIntegrationTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/MultiThreadedIntegrationTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/ParametrizedLongRunningUnitTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/PriorityLongRunningUnitTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/RegistrationLongRunningUnitTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/SignInLongRunningUnitTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/SimpleLongRunningUnitTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/SummationServiceIntegrationTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/TimeOutIntegrationTest.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/reports/CustomisedListener.java (100%)
 rename {testng => testing-modules/testng}/src/test/java/com/baeldung/reports/CustomisedReports.java (100%)
 rename {testng => testing-modules/testng}/src/test/resources/logback.xml (100%)
 rename {testng => testing-modules/testng}/src/test/resources/parametrized_testng.xml (100%)
 rename {testng => testing-modules/testng}/src/test/resources/reportTemplate.html (100%)
 rename {testng => testing-modules/testng}/src/test/resources/test_group.xml (100%)
 rename {testng => testing-modules/testng}/src/test/resources/test_setup.xml (100%)
 rename {testng => testing-modules/testng}/src/test/resources/test_suite.xml (100%)

diff --git a/pom.xml b/pom.xml
index bc8e35ba94..631a2c9b26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,10 +62,10 @@
         <module>feign</module>
         <module>flyway</module>
 
-        <!-- <module>gatling</module> --> <!-- not meant to run as part of the standard build -->
+        <!-- <module>testing-modules/gatling</module> --> <!-- not meant to run as part of the standard build -->
 
         <module>geotools</module>
-        <module>groovy-spock</module>
+        <module>testing-modules/groovy-spock</module>
         <module>gson</module>
         <module>guava</module>
         <module>guava18</module>
@@ -98,7 +98,7 @@
         <module>json-path</module>
         <module>json</module>
         <module>jsoup</module>
-        <module>junit5</module>
+        <module>testing-modules/junit-5</module>
         <module>jws</module>
 
         <module>libraries</module>
@@ -112,9 +112,9 @@
         <module>mapstruct</module>
         <module>metrics</module>
         <module>mesos-marathon</module>
-        <module>mockito</module>
-        <module>mockito2</module>
-        <module>mocks</module>
+        <module>testing-modules/mockito</module>
+        <module>testing-modules/mockito-2</module>
+        <module>testing-modules/mocks</module>
         <module>mustache</module>
         <module>noexception</module>
 
@@ -129,13 +129,13 @@
         <!-- <module>raml</module> -->
         <module>reactor-core</module>
         <module>persistence-modules/redis</module>
-        <module>rest-assured</module>
-        <module>rest-testing</module>
+        <module>testing-modules/rest-assured</module>
+        <module>testing-modules/rest-testing</module>
         <module>resteasy</module>
         <module>rxjava</module>
         <module>spring-swagger-codegen</module>
 
-        <module>selenium-junit-testng</module>
+        <module>testing-modules/selenium-junit-testng</module>
         <module>persistence-modules/solr</module>
         <module>spark-java</module>
       <!--  <module>spring-5</module>-->
@@ -235,8 +235,8 @@
 		<module>spring-rest-embedded-tomcat</module>
         
 
-        <module>testing</module>
-        <module>testng</module>
+        <module>testing-modules/testing</module>
+        <module>testing-modules/testng</module>
 
         <module>video-tutorials</module>
 
@@ -254,7 +254,7 @@
         <module>drools</module>
         <module>persistence-modules/liquibase</module>
         <module>spring-boot-property-exp</module>
-        <module>mockserver</module>
+        <module>testing-modules/mockserver</module>
         <module>undertow</module>
         <module>vertx-and-rxjava</module>
         <module>saas</module>
diff --git a/gatling/README.md b/testing-modules/gatling/README.md
similarity index 100%
rename from gatling/README.md
rename to testing-modules/gatling/README.md
diff --git a/gatling/pom.xml b/testing-modules/gatling/pom.xml
similarity index 100%
rename from gatling/pom.xml
rename to testing-modules/gatling/pom.xml
diff --git a/gatling/src/test/resources/gatling.conf b/testing-modules/gatling/src/test/resources/gatling.conf
similarity index 100%
rename from gatling/src/test/resources/gatling.conf
rename to testing-modules/gatling/src/test/resources/gatling.conf
diff --git a/gatling/src/test/resources/logback.xml b/testing-modules/gatling/src/test/resources/logback.xml
similarity index 100%
rename from gatling/src/test/resources/logback.xml
rename to testing-modules/gatling/src/test/resources/logback.xml
diff --git a/gatling/src/test/resources/recorder.conf b/testing-modules/gatling/src/test/resources/recorder.conf
similarity index 100%
rename from gatling/src/test/resources/recorder.conf
rename to testing-modules/gatling/src/test/resources/recorder.conf
diff --git a/gatling/src/test/scala/Engine.scala b/testing-modules/gatling/src/test/scala/Engine.scala
similarity index 100%
rename from gatling/src/test/scala/Engine.scala
rename to testing-modules/gatling/src/test/scala/Engine.scala
diff --git a/gatling/src/test/scala/IDEPathHelper.scala b/testing-modules/gatling/src/test/scala/IDEPathHelper.scala
similarity index 100%
rename from gatling/src/test/scala/IDEPathHelper.scala
rename to testing-modules/gatling/src/test/scala/IDEPathHelper.scala
diff --git a/gatling/src/test/scala/Recorder.scala b/testing-modules/gatling/src/test/scala/Recorder.scala
similarity index 100%
rename from gatling/src/test/scala/Recorder.scala
rename to testing-modules/gatling/src/test/scala/Recorder.scala
diff --git a/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala b/testing-modules/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala
similarity index 100%
rename from gatling/src/test/scala/org/baeldung/RecordedSimulation.scala
rename to testing-modules/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala
diff --git a/groovy-spock/README.md b/testing-modules/groovy-spock/README.md
similarity index 100%
rename from groovy-spock/README.md
rename to testing-modules/groovy-spock/README.md
diff --git a/groovy-spock/pom.xml b/testing-modules/groovy-spock/pom.xml
similarity index 97%
rename from groovy-spock/pom.xml
rename to testing-modules/groovy-spock/pom.xml
index d9b51c5e1a..f4e61e6786 100644
--- a/groovy-spock/pom.xml
+++ b/testing-modules/groovy-spock/pom.xml
@@ -17,6 +17,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <build>
diff --git a/groovy-spock/src/test/groovy/FirstSpecification.groovy b/testing-modules/groovy-spock/src/test/groovy/FirstSpecification.groovy
similarity index 100%
rename from groovy-spock/src/test/groovy/FirstSpecification.groovy
rename to testing-modules/groovy-spock/src/test/groovy/FirstSpecification.groovy
diff --git a/groovy-spock/src/test/groovy/Notifier.groovy b/testing-modules/groovy-spock/src/test/groovy/Notifier.groovy
similarity index 100%
rename from groovy-spock/src/test/groovy/Notifier.groovy
rename to testing-modules/groovy-spock/src/test/groovy/Notifier.groovy
diff --git a/groovy-spock/src/test/groovy/PaymentGateway.groovy b/testing-modules/groovy-spock/src/test/groovy/PaymentGateway.groovy
similarity index 100%
rename from groovy-spock/src/test/groovy/PaymentGateway.groovy
rename to testing-modules/groovy-spock/src/test/groovy/PaymentGateway.groovy
diff --git a/junit5/README.md b/testing-modules/junit-5/README.md
similarity index 100%
rename from junit5/README.md
rename to testing-modules/junit-5/README.md
diff --git a/junit5/pom.xml b/testing-modules/junit-5/pom.xml
similarity index 97%
rename from junit5/pom.xml
rename to testing-modules/junit-5/pom.xml
index b8a7622b3d..229703ccf5 100644
--- a/junit5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -4,16 +4,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <!-- NOT NEEDED - JSP <groupId>com.baeldung</groupId>-->
-    <artifactId>junit5</artifactId>
+    <artifactId>junit-5</artifactId>
     <version>1.0-SNAPSHOT</version>
 
-    <name>junit5</name>
+    <name>junit-5</name>
     <description>Intro to JUnit 5</description>
 	
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <properties>
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/User.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/User.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/User.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/User.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java
diff --git a/junit5/src/test/java/com/baeldung/AssertionUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/AssertionUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/AssumptionUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/AssumptionUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/AssumptionUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/AssumptionUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/DynamicTestsExample.java b/testing-modules/junit-5/src/test/java/com/baeldung/DynamicTestsExample.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/DynamicTestsExample.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/DynamicTestsExample.java
diff --git a/junit5/src/test/java/com/baeldung/EmployeesTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/EmployeesTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/EmployeesTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/EmployeesTest.java
diff --git a/junit5/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/ExceptionUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/ExceptionUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/ExceptionUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/FirstUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/FirstUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/FirstUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/FirstUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/LiveTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/LiveTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/LiveTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/LiveTest.java
diff --git a/junit5/src/test/java/com/baeldung/NestedUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/NestedUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/NestedUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/NestedUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/RepeatedTestExample.java b/testing-modules/junit-5/src/test/java/com/baeldung/RepeatedTestExample.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/RepeatedTestExample.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/RepeatedTestExample.java
diff --git a/junit5/src/test/java/com/baeldung/StringUtils.java b/testing-modules/junit-5/src/test/java/com/baeldung/StringUtils.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/StringUtils.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/StringUtils.java
diff --git a/junit5/src/test/java/com/baeldung/TaggedUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/TaggedUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/TaggedUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/TaggedUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/TestLauncher.java b/testing-modules/junit-5/src/test/java/com/baeldung/TestLauncher.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/TestLauncher.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/TestLauncher.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/EmployeeDaoParameterResolver.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/EmployeeDaoParameterResolver.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/EmployeeDaoParameterResolver.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/EmployeeDaoParameterResolver.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/EnvironmentExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/EnvironmentExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/EnvironmentExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/EnvironmentExtension.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/IgnoreFileNotFoundExceptionExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/IgnoreFileNotFoundExceptionExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/IgnoreFileNotFoundExceptionExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/IgnoreFileNotFoundExceptionExtension.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/LoggingExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/LoggingExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/LoggingExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/LoggingExtension.java
diff --git a/junit5/src/test/java/com/baeldung/helpers/Employee.java b/testing-modules/junit-5/src/test/java/com/baeldung/helpers/Employee.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/helpers/Employee.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/helpers/Employee.java
diff --git a/junit5/src/test/java/com/baeldung/helpers/EmployeeDao.java b/testing-modules/junit-5/src/test/java/com/baeldung/helpers/EmployeeDao.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/helpers/EmployeeDao.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/helpers/EmployeeDao.java
diff --git a/junit5/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java b/testing-modules/junit-5/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java
diff --git a/junit5/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java b/testing-modules/junit-5/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java
diff --git a/junit5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java
diff --git a/junit5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/RuleExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/RuleExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/RuleExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/RuleExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4Tests.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4Tests.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4Tests.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4Tests.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit5/RuleExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/RuleExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit5/RuleExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/RuleExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java
diff --git a/junit5/src/test/java/com/baeldung/param/InvalidPersonParameterResolver.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/InvalidPersonParameterResolver.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/InvalidPersonParameterResolver.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/InvalidPersonParameterResolver.java
diff --git a/junit5/src/test/java/com/baeldung/param/Person.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/Person.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/Person.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/Person.java
diff --git a/junit5/src/test/java/com/baeldung/param/PersonValidator.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/PersonValidator.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/PersonValidator.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/PersonValidator.java
diff --git a/junit5/src/test/java/com/baeldung/param/PersonValidatorTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/PersonValidatorTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/PersonValidatorTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/PersonValidatorTest.java
diff --git a/junit5/src/test/java/com/baeldung/param/ValidPersonParameterResolver.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/ValidPersonParameterResolver.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/ValidPersonParameterResolver.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/ValidPersonParameterResolver.java
diff --git a/junit5/src/test/java/com/baeldung/suites/AllTests.java b/testing-modules/junit-5/src/test/java/com/baeldung/suites/AllTests.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/suites/AllTests.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/suites/AllTests.java
diff --git a/junit5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/testing-modules/junit-5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
similarity index 100%
rename from junit5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
rename to testing-modules/junit-5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/junit5/src/test/resources/com/baeldung/extensions/application.properties b/testing-modules/junit-5/src/test/resources/com/baeldung/extensions/application.properties
similarity index 100%
rename from junit5/src/test/resources/com/baeldung/extensions/application.properties
rename to testing-modules/junit-5/src/test/resources/com/baeldung/extensions/application.properties
diff --git a/junit5/src/test/resources/com/baeldung/helpers/jdbc.properties b/testing-modules/junit-5/src/test/resources/com/baeldung/helpers/jdbc.properties
similarity index 100%
rename from junit5/src/test/resources/com/baeldung/helpers/jdbc.properties
rename to testing-modules/junit-5/src/test/resources/com/baeldung/helpers/jdbc.properties
diff --git a/mockito2/.gitignore b/testing-modules/mockito-2/.gitignore
similarity index 100%
rename from mockito2/.gitignore
rename to testing-modules/mockito-2/.gitignore
diff --git a/mockito2/README.md b/testing-modules/mockito-2/README.md
similarity index 100%
rename from mockito2/README.md
rename to testing-modules/mockito-2/README.md
diff --git a/mockito2/pom.xml b/testing-modules/mockito-2/pom.xml
similarity index 96%
rename from mockito2/pom.xml
rename to testing-modules/mockito-2/pom.xml
index a7c4683c30..0291ac4ec1 100644
--- a/mockito2/pom.xml
+++ b/testing-modules/mockito-2/pom.xml
@@ -3,7 +3,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>mockito2</artifactId>
+    <artifactId>mockito-2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>mockito-2-with-java8</name>
@@ -12,6 +12,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <profiles>
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/JobPosition.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/JobPosition.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/JobPosition.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/JobPosition.java
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/JobService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/JobService.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/JobService.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/JobService.java
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/Person.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/Person.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/Person.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/Person.java
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/UnemploymentService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/UnemploymentService.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/UnemploymentService.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/UnemploymentService.java
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/UnemploymentServiceImpl.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/UnemploymentServiceImpl.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/UnemploymentServiceImpl.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/UnemploymentServiceImpl.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithLambdaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithLambdaUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithLambdaUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithLambdaUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithoutLambdaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithoutLambdaUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithoutLambdaUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithoutLambdaUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithLambdaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithLambdaUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithLambdaUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithLambdaUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithoutLambdaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithoutLambdaUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithoutLambdaUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithoutLambdaUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/JobServiceUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/JobServiceUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/JobServiceUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/JobServiceUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java
diff --git a/mockito/.gitignore b/testing-modules/mockito/.gitignore
similarity index 100%
rename from mockito/.gitignore
rename to testing-modules/mockito/.gitignore
diff --git a/mockito/README.md b/testing-modules/mockito/README.md
similarity index 100%
rename from mockito/README.md
rename to testing-modules/mockito/README.md
diff --git a/mockito/pom.xml b/testing-modules/mockito/pom.xml
similarity index 98%
rename from mockito/pom.xml
rename to testing-modules/mockito/pom.xml
index 19dd2f6468..aa3dd9b20a 100644
--- a/mockito/pom.xml
+++ b/testing-modules/mockito/pom.xml
@@ -11,6 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/mockito/src/main/resources/logback.xml b/testing-modules/mockito/src/main/resources/logback.xml
similarity index 100%
rename from mockito/src/main/resources/logback.xml
rename to testing-modules/mockito/src/main/resources/logback.xml
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoExceptionIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoExceptionIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoExceptionIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoExceptionIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MyDictionary.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MyDictionary.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MyDictionary.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MyDictionary.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MyList.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MyList.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MyList.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MyList.java
diff --git a/mocks/README.md b/testing-modules/mocks/README.md
similarity index 100%
rename from mocks/README.md
rename to testing-modules/mocks/README.md
diff --git a/mocks/jmockit/README.md b/testing-modules/mocks/jmockit/README.md
similarity index 100%
rename from mocks/jmockit/README.md
rename to testing-modules/mocks/jmockit/README.md
diff --git a/mocks/jmockit/pom.xml b/testing-modules/mocks/jmockit/pom.xml
similarity index 95%
rename from mocks/jmockit/pom.xml
rename to testing-modules/mocks/jmockit/pom.xml
index 173a981e09..d998cb6918 100644
--- a/mocks/jmockit/pom.xml
+++ b/testing-modules/mocks/jmockit/pom.xml
@@ -6,7 +6,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>mocks</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>jmockit</artifactId>
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Model.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Model.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Model.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Model.java
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Performer.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Performer.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Performer.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Performer.java
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java b/testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
similarity index 100%
rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
rename to testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java b/testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
similarity index 100%
rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
rename to testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java b/testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
similarity index 100%
rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
rename to testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java b/testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
similarity index 100%
rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
rename to testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
diff --git a/mocks/mock-comparisons/README.md b/testing-modules/mocks/mock-comparisons/README.md
similarity index 100%
rename from mocks/mock-comparisons/README.md
rename to testing-modules/mocks/mock-comparisons/README.md
diff --git a/mocks/mock-comparisons/pom.xml b/testing-modules/mocks/mock-comparisons/pom.xml
similarity index 97%
rename from mocks/mock-comparisons/pom.xml
rename to testing-modules/mocks/mock-comparisons/pom.xml
index 11bc59d710..84f1d20401 100644
--- a/mocks/mock-comparisons/pom.xml
+++ b/testing-modules/mocks/mock-comparisons/pom.xml
@@ -6,7 +6,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>mocks</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>mock-comparisons</artifactId>
diff --git a/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginController.java b/testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginController.java
similarity index 100%
rename from mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginController.java
rename to testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginController.java
diff --git a/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginDao.java b/testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
similarity index 100%
rename from mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
rename to testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
diff --git a/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginService.java b/testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginService.java
similarity index 100%
rename from mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginService.java
rename to testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginService.java
diff --git a/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/UserForm.java b/testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/UserForm.java
similarity index 100%
rename from mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/UserForm.java
rename to testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/UserForm.java
diff --git a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java b/testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
similarity index 100%
rename from mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
diff --git a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java b/testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
similarity index 100%
rename from mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
diff --git a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java b/testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
similarity index 100%
rename from mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
diff --git a/mocks/pom.xml b/testing-modules/mocks/pom.xml
similarity index 92%
rename from mocks/pom.xml
rename to testing-modules/mocks/pom.xml
index 84243a25d2..959c1851d6 100644
--- a/mocks/pom.xml
+++ b/testing-modules/mocks/pom.xml
@@ -6,7 +6,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>mocks</artifactId>
diff --git a/mockserver/README.md b/testing-modules/mockserver/README.md
similarity index 100%
rename from mockserver/README.md
rename to testing-modules/mockserver/README.md
diff --git a/mockserver/pom.xml b/testing-modules/mockserver/pom.xml
similarity index 100%
rename from mockserver/pom.xml
rename to testing-modules/mockserver/pom.xml
diff --git a/mockserver/src/main/java/com/baeldung/mock/server/ExpectationCallbackHandler.java b/testing-modules/mockserver/src/main/java/com/baeldung/mock/server/ExpectationCallbackHandler.java
similarity index 100%
rename from mockserver/src/main/java/com/baeldung/mock/server/ExpectationCallbackHandler.java
rename to testing-modules/mockserver/src/main/java/com/baeldung/mock/server/ExpectationCallbackHandler.java
diff --git a/mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java b/testing-modules/mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java
similarity index 100%
rename from mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java
rename to testing-modules/mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java
diff --git a/rest-assured/.gitignore b/testing-modules/rest-assured/.gitignore
similarity index 100%
rename from rest-assured/.gitignore
rename to testing-modules/rest-assured/.gitignore
diff --git a/rest-assured/README.md b/testing-modules/rest-assured/README.md
similarity index 100%
rename from rest-assured/README.md
rename to testing-modules/rest-assured/README.md
diff --git a/rest-assured/pom.xml b/testing-modules/rest-assured/pom.xml
similarity index 99%
rename from rest-assured/pom.xml
rename to testing-modules/rest-assured/pom.xml
index 3fca54c80f..0c0826c5c3 100644
--- a/rest-assured/pom.xml
+++ b/testing-modules/rest-assured/pom.xml
@@ -10,6 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/Util.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/Util.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/Util.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/Util.java
diff --git a/rest-assured/src/test/resources/employees.xml b/testing-modules/rest-assured/src/test/resources/employees.xml
similarity index 100%
rename from rest-assured/src/test/resources/employees.xml
rename to testing-modules/rest-assured/src/test/resources/employees.xml
diff --git a/rest-assured/src/test/resources/event_0.json b/testing-modules/rest-assured/src/test/resources/event_0.json
similarity index 100%
rename from rest-assured/src/test/resources/event_0.json
rename to testing-modules/rest-assured/src/test/resources/event_0.json
diff --git a/rest-assured/src/test/resources/logback.xml b/testing-modules/rest-assured/src/test/resources/logback.xml
similarity index 100%
rename from rest-assured/src/test/resources/logback.xml
rename to testing-modules/rest-assured/src/test/resources/logback.xml
diff --git a/rest-assured/src/test/resources/odds.json b/testing-modules/rest-assured/src/test/resources/odds.json
similarity index 100%
rename from rest-assured/src/test/resources/odds.json
rename to testing-modules/rest-assured/src/test/resources/odds.json
diff --git a/rest-assured/src/test/resources/teachers.xml b/testing-modules/rest-assured/src/test/resources/teachers.xml
similarity index 100%
rename from rest-assured/src/test/resources/teachers.xml
rename to testing-modules/rest-assured/src/test/resources/teachers.xml
diff --git a/rest-testing/.gitignore b/testing-modules/rest-testing/.gitignore
similarity index 100%
rename from rest-testing/.gitignore
rename to testing-modules/rest-testing/.gitignore
diff --git a/rest-testing/README.md b/testing-modules/rest-testing/README.md
similarity index 100%
rename from rest-testing/README.md
rename to testing-modules/rest-testing/README.md
diff --git a/rest-testing/pom.xml b/testing-modules/rest-testing/pom.xml
similarity index 99%
rename from rest-testing/pom.xml
rename to testing-modules/rest-testing/pom.xml
index 74ea5760c4..4b838720da 100644
--- a/rest-testing/pom.xml
+++ b/testing-modules/rest-testing/pom.xml
@@ -11,6 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <dependencies>
diff --git a/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature b/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature
new file mode 100644
index 0000000000..99dd8249fe
--- /dev/null
+++ b/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature
@@ -0,0 +1,10 @@
+Feature: Testing a REST API
+  Users should be able to submit GET and POST requests to a web service, represented by WireMock
+
+  Scenario: Data Upload to a web service
+    When users upload data on a project
+    Then the server should handle it and return a success status
+
+  Scenario: Data retrieval from a web service
+    When users want to get information on the Cucumber project
+    Then the requested data is returned
\ No newline at end of file
diff --git a/rest-testing/src/main/resources/cucumber.json b/testing-modules/rest-testing/src/main/resources/cucumber.json
similarity index 100%
rename from rest-testing/src/main/resources/cucumber.json
rename to testing-modules/rest-testing/src/main/resources/cucumber.json
diff --git a/rest-testing/src/main/resources/logback.xml b/testing-modules/rest-testing/src/main/resources/logback.xml
similarity index 100%
rename from rest-testing/src/main/resources/logback.xml
rename to testing-modules/rest-testing/src/main/resources/logback.xml
diff --git a/rest-testing/src/main/resources/wiremock_intro.json b/testing-modules/rest-testing/src/main/resources/wiremock_intro.json
similarity index 100%
rename from rest-testing/src/main/resources/wiremock_intro.json
rename to testing-modules/rest-testing/src/main/resources/wiremock_intro.json
diff --git a/rest-testing/src/test/java/com/baeldung/rest/cucumber/CucumberIntegrationTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/cucumber/CucumberIntegrationTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/cucumber/CucumberIntegrationTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/cucumber/CucumberIntegrationTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/cucumber/StepDefinition.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/cucumber/StepDefinition.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/cucumber/StepDefinition.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/cucumber/StepDefinition.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/AbstractStory.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/AbstractStory.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/AbstractStory.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/AbstractStory.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundSteps.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundSteps.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundSteps.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundStoryLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundStoryLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundStoryLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundStoryLiveTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeSteps.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeSteps.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeSteps.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeStoryLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeStoryLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeStoryLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeStoryLiveTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadStoryLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadStoryLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadStoryLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadStoryLiveTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseSteps.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseSteps.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseSteps.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseStoryLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseStoryLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseStoryLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseStoryLiveTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/ProgrammaticallyManagedLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/ProgrammaticallyManagedLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/ProgrammaticallyManagedLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/ProgrammaticallyManagedLiveTest.java
diff --git a/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java b/testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
similarity index 100%
rename from rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
rename to testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
diff --git a/rest-testing/src/test/java/org/baeldung/rest/GithubBasicLiveTest.java b/testing-modules/rest-testing/src/test/java/org/baeldung/rest/GithubBasicLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/org/baeldung/rest/GithubBasicLiveTest.java
rename to testing-modules/rest-testing/src/test/java/org/baeldung/rest/GithubBasicLiveTest.java
diff --git a/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java b/testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
similarity index 100%
rename from rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
rename to testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
diff --git a/rest-testing/src/test/resources/github_user_not_found.story b/testing-modules/rest-testing/src/test/resources/github_user_not_found.story
similarity index 100%
rename from rest-testing/src/test/resources/github_user_not_found.story
rename to testing-modules/rest-testing/src/test/resources/github_user_not_found.story
diff --git a/rest-testing/src/test/resources/github_user_response_mediatype.story b/testing-modules/rest-testing/src/test/resources/github_user_response_mediatype.story
similarity index 100%
rename from rest-testing/src/test/resources/github_user_response_mediatype.story
rename to testing-modules/rest-testing/src/test/resources/github_user_response_mediatype.story
diff --git a/rest-testing/src/test/resources/github_user_response_payload.story b/testing-modules/rest-testing/src/test/resources/github_user_response_payload.story
similarity index 100%
rename from rest-testing/src/test/resources/github_user_response_payload.story
rename to testing-modules/rest-testing/src/test/resources/github_user_response_payload.story
diff --git a/rest-testing/src/test/resources/increase.story b/testing-modules/rest-testing/src/test/resources/increase.story
similarity index 100%
rename from rest-testing/src/test/resources/increase.story
rename to testing-modules/rest-testing/src/test/resources/increase.story
diff --git a/selenium-junit-testng/README.md b/testing-modules/selenium-junit-testng/README.md
similarity index 100%
rename from selenium-junit-testng/README.md
rename to testing-modules/selenium-junit-testng/README.md
diff --git a/selenium-junit-testng/geckodriver.mac b/testing-modules/selenium-junit-testng/geckodriver.mac
similarity index 100%
rename from selenium-junit-testng/geckodriver.mac
rename to testing-modules/selenium-junit-testng/geckodriver.mac
diff --git a/selenium-junit-testng/pom.xml b/testing-modules/selenium-junit-testng/pom.xml
similarity index 98%
rename from selenium-junit-testng/pom.xml
rename to testing-modules/selenium-junit-testng/pom.xml
index faad194b59..14169e5749 100644
--- a/selenium-junit-testng/pom.xml
+++ b/testing-modules/selenium-junit-testng/pom.xml
@@ -9,6 +9,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <build>
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/config/SeleniumConfig.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/config/SeleniumConfig.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/config/SeleniumConfig.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/config/SeleniumConfig.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/models/BaeldungAbout.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/models/BaeldungAbout.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/models/BaeldungAbout.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/models/BaeldungAbout.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungAboutPage.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungAboutPage.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungAboutPage.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungAboutPage.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungHomePage.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungHomePage.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungHomePage.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungHomePage.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/StartHerePage.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/StartHerePage.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/StartHerePage.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/StartHerePage.java
diff --git a/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumPageObjectLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumPageObjectLiveTest.java
similarity index 100%
rename from selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumPageObjectLiveTest.java
rename to testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumPageObjectLiveTest.java
diff --git a/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumWithJUnitLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumWithJUnitLiveTest.java
similarity index 100%
rename from selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumWithJUnitLiveTest.java
rename to testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumWithJUnitLiveTest.java
diff --git a/selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/SeleniumWithTestNGLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/SeleniumWithTestNGLiveTest.java
similarity index 100%
rename from selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/SeleniumWithTestNGLiveTest.java
rename to testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/SeleniumWithTestNGLiveTest.java
diff --git a/testing/README.md b/testing-modules/testing/README.md
similarity index 100%
rename from testing/README.md
rename to testing-modules/testing/README.md
diff --git a/testing/pom.xml b/testing-modules/testing/pom.xml
similarity index 99%
rename from testing/pom.xml
rename to testing-modules/testing/pom.xml
index 8f5c6ddb3d..3ad503558f 100644
--- a/testing/pom.xml
+++ b/testing-modules/testing/pom.xml
@@ -10,6 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/testing/src/main/java/com/baeldung/cucumber/Calculator.java b/testing-modules/testing/src/main/java/com/baeldung/cucumber/Calculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/cucumber/Calculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/cucumber/Calculator.java
diff --git a/testing/src/main/java/com/baeldung/introductionjukito/Calculator.java b/testing-modules/testing/src/main/java/com/baeldung/introductionjukito/Calculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/introductionjukito/Calculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/introductionjukito/Calculator.java
diff --git a/testing/src/main/java/com/baeldung/introductionjukito/ScientificCalculator.java b/testing-modules/testing/src/main/java/com/baeldung/introductionjukito/ScientificCalculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/introductionjukito/ScientificCalculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/introductionjukito/ScientificCalculator.java
diff --git a/testing/src/main/java/com/baeldung/introductionjukito/SimpleCalculator.java b/testing-modules/testing/src/main/java/com/baeldung/introductionjukito/SimpleCalculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/introductionjukito/SimpleCalculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/introductionjukito/SimpleCalculator.java
diff --git a/testing/src/main/java/com/baeldung/junit/Calculator.java b/testing-modules/testing/src/main/java/com/baeldung/junit/Calculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/junit/Calculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/junit/Calculator.java
diff --git a/testing/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java b/testing-modules/testing/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java
rename to testing-modules/testing/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java
diff --git a/testing/src/main/java/com/baeldung/lambdabehave/Calculator.java b/testing-modules/testing/src/main/java/com/baeldung/lambdabehave/Calculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/lambdabehave/Calculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/lambdabehave/Calculator.java
diff --git a/testing/src/main/java/com/baeldung/testing/assertj/Dog.java b/testing-modules/testing/src/main/java/com/baeldung/testing/assertj/Dog.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/assertj/Dog.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/assertj/Dog.java
diff --git a/testing/src/main/java/com/baeldung/testing/assertj/Person.java b/testing-modules/testing/src/main/java/com/baeldung/testing/assertj/Person.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/assertj/Person.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/assertj/Person.java
diff --git a/testing/src/main/java/com/baeldung/testing/mutation/Palindrome.java b/testing-modules/testing/src/main/java/com/baeldung/testing/mutation/Palindrome.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/mutation/Palindrome.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/mutation/Palindrome.java
diff --git a/testing/src/main/java/com/baeldung/testing/truth/User.java b/testing-modules/testing/src/main/java/com/baeldung/testing/truth/User.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/truth/User.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/truth/User.java
diff --git a/testing/src/main/java/com/baeldung/testing/truth/UserSubject.java b/testing-modules/testing/src/main/java/com/baeldung/testing/truth/UserSubject.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/truth/UserSubject.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/truth/UserSubject.java
diff --git a/testing/src/test/java/com/baeldung/introductionjukito/CalculatorTest.java b/testing-modules/testing/src/test/java/com/baeldung/introductionjukito/CalculatorTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/introductionjukito/CalculatorTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/introductionjukito/CalculatorTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/AdditionTest.java b/testing-modules/testing/src/test/java/com/baeldung/junit/AdditionTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/AdditionTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/AdditionTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/BlockingTestRunner.java b/testing-modules/testing/src/test/java/com/baeldung/junit/BlockingTestRunner.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/BlockingTestRunner.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/BlockingTestRunner.java
diff --git a/testing/src/test/java/com/baeldung/junit/CalculatorTest.java b/testing-modules/testing/src/test/java/com/baeldung/junit/CalculatorTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/CalculatorTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/CalculatorTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/SubstractionTest.java b/testing-modules/testing/src/test/java/com/baeldung/junit/SubstractionTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/SubstractionTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/SubstractionTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/SuiteTest.java b/testing-modules/testing/src/test/java/com/baeldung/junit/SuiteTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/SuiteTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/SuiteTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/TestRunner.java b/testing-modules/testing/src/test/java/com/baeldung/junit/TestRunner.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/TestRunner.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/TestRunner.java
diff --git a/testing/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java b/testing-modules/testing/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java
diff --git a/testing/src/test/java/com/baeldung/junitparams/TestDataProvider.java b/testing-modules/testing/src/test/java/com/baeldung/junitparams/TestDataProvider.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junitparams/TestDataProvider.java
rename to testing-modules/testing/src/test/java/com/baeldung/junitparams/TestDataProvider.java
diff --git a/testing/src/test/java/com/baeldung/lambdabehave/CalculatorTest.java b/testing-modules/testing/src/test/java/com/baeldung/lambdabehave/CalculatorTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/lambdabehave/CalculatorTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/lambdabehave/CalculatorTest.java
diff --git a/testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/calculator/CalculatorIntegrationTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/calculator/CalculatorIntegrationTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/calculator/CalculatorIntegrationTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/calculator/CalculatorIntegrationTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/calculator/CalculatorRunSteps.java b/testing-modules/testing/src/test/java/com/baeldung/testing/calculator/CalculatorRunSteps.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/calculator/CalculatorRunSteps.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/calculator/CalculatorRunSteps.java
diff --git a/testing/src/test/java/com/baeldung/testing/jgotesting/JGoTestingUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/jgotesting/JGoTestingUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/jgotesting/JGoTestingUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/jgotesting/JGoTestingUnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/shopping/ShoppingIntegrationTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/shopping/ShoppingIntegrationTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/shopping/ShoppingIntegrationTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/shopping/ShoppingIntegrationTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/shopping/ShoppingStepsDef.java b/testing-modules/testing/src/test/java/com/baeldung/testing/shopping/ShoppingStepsDef.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/shopping/ShoppingStepsDef.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/shopping/ShoppingStepsDef.java
diff --git a/testing/src/test/java/com/baeldung/testing/truth/GoogleTruthUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/truth/GoogleTruthUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/truth/GoogleTruthUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/truth/GoogleTruthUnitTest.java
diff --git a/testing/src/test/resources/JunitParamsTestParameters.csv b/testing-modules/testing/src/test/resources/JunitParamsTestParameters.csv
similarity index 100%
rename from testing/src/test/resources/JunitParamsTestParameters.csv
rename to testing-modules/testing/src/test/resources/JunitParamsTestParameters.csv
diff --git a/testing/src/test/resources/features/calculator-scenario-outline.feature b/testing-modules/testing/src/test/resources/features/calculator-scenario-outline.feature
similarity index 100%
rename from testing/src/test/resources/features/calculator-scenario-outline.feature
rename to testing-modules/testing/src/test/resources/features/calculator-scenario-outline.feature
diff --git a/testing/src/test/resources/features/calculator.feature b/testing-modules/testing/src/test/resources/features/calculator.feature
similarity index 100%
rename from testing/src/test/resources/features/calculator.feature
rename to testing-modules/testing/src/test/resources/features/calculator.feature
diff --git a/testing/src/test/resources/features/shopping.feature b/testing-modules/testing/src/test/resources/features/shopping.feature
similarity index 100%
rename from testing/src/test/resources/features/shopping.feature
rename to testing-modules/testing/src/test/resources/features/shopping.feature
diff --git a/testng/README.md b/testing-modules/testng/README.md
similarity index 100%
rename from testng/README.md
rename to testing-modules/testng/README.md
diff --git a/testng/pom.xml b/testing-modules/testng/pom.xml
similarity index 95%
rename from testng/pom.xml
rename to testing-modules/testng/pom.xml
index 0ca775a00c..f7a50954fc 100644
--- a/testng/pom.xml
+++ b/testing-modules/testng/pom.xml
@@ -11,6 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/testng/src/test/java/com/baeldung/DependentLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/DependentLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/DependentLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/DependentLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/GroupIntegrationTest.java b/testing-modules/testng/src/test/java/com/baeldung/GroupIntegrationTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/GroupIntegrationTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/GroupIntegrationTest.java
diff --git a/testng/src/test/java/com/baeldung/MultiThreadedIntegrationTest.java b/testing-modules/testng/src/test/java/com/baeldung/MultiThreadedIntegrationTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/MultiThreadedIntegrationTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/MultiThreadedIntegrationTest.java
diff --git a/testng/src/test/java/com/baeldung/ParametrizedLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/ParametrizedLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/ParametrizedLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/ParametrizedLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/PriorityLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/PriorityLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/PriorityLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/PriorityLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/RegistrationLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/RegistrationLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/RegistrationLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/RegistrationLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/SignInLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/SignInLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/SignInLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/SignInLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/SimpleLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/SimpleLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/SimpleLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/SimpleLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/SummationServiceIntegrationTest.java b/testing-modules/testng/src/test/java/com/baeldung/SummationServiceIntegrationTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/SummationServiceIntegrationTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/SummationServiceIntegrationTest.java
diff --git a/testng/src/test/java/com/baeldung/TimeOutIntegrationTest.java b/testing-modules/testng/src/test/java/com/baeldung/TimeOutIntegrationTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/TimeOutIntegrationTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/TimeOutIntegrationTest.java
diff --git a/testng/src/test/java/com/baeldung/reports/CustomisedListener.java b/testing-modules/testng/src/test/java/com/baeldung/reports/CustomisedListener.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/reports/CustomisedListener.java
rename to testing-modules/testng/src/test/java/com/baeldung/reports/CustomisedListener.java
diff --git a/testng/src/test/java/com/baeldung/reports/CustomisedReports.java b/testing-modules/testng/src/test/java/com/baeldung/reports/CustomisedReports.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/reports/CustomisedReports.java
rename to testing-modules/testng/src/test/java/com/baeldung/reports/CustomisedReports.java
diff --git a/testng/src/test/resources/logback.xml b/testing-modules/testng/src/test/resources/logback.xml
similarity index 100%
rename from testng/src/test/resources/logback.xml
rename to testing-modules/testng/src/test/resources/logback.xml
diff --git a/testng/src/test/resources/parametrized_testng.xml b/testing-modules/testng/src/test/resources/parametrized_testng.xml
similarity index 100%
rename from testng/src/test/resources/parametrized_testng.xml
rename to testing-modules/testng/src/test/resources/parametrized_testng.xml
diff --git a/testng/src/test/resources/reportTemplate.html b/testing-modules/testng/src/test/resources/reportTemplate.html
similarity index 100%
rename from testng/src/test/resources/reportTemplate.html
rename to testing-modules/testng/src/test/resources/reportTemplate.html
diff --git a/testng/src/test/resources/test_group.xml b/testing-modules/testng/src/test/resources/test_group.xml
similarity index 100%
rename from testng/src/test/resources/test_group.xml
rename to testing-modules/testng/src/test/resources/test_group.xml
diff --git a/testng/src/test/resources/test_setup.xml b/testing-modules/testng/src/test/resources/test_setup.xml
similarity index 100%
rename from testng/src/test/resources/test_setup.xml
rename to testing-modules/testng/src/test/resources/test_setup.xml
diff --git a/testng/src/test/resources/test_suite.xml b/testing-modules/testng/src/test/resources/test_suite.xml
similarity index 100%
rename from testng/src/test/resources/test_suite.xml
rename to testing-modules/testng/src/test/resources/test_suite.xml

From 1b31c3ffad6145056fc629787d661843435de548 Mon Sep 17 00:00:00 2001
From: linhvovn <linhvovn@users.noreply.github.com>
Date: Sun, 12 Nov 2017 19:21:05 +0800
Subject: [PATCH 11/72] [tlinh2110@gmail.com]Bael1313 Introduction to Spring
 ACL (#3007)

* [tlinh2110@gmail.com] [BAEL1313] Introduction Spring ACL

* [tlinh2110@gmail.com] BAEL 1313 - Update unit test

* [tlinh2110@gmail.com]BAEL1313- remove unused files from spring-core
---
 spring-security-mvc-boot/pom.xml              |  19 +++
 .../org/baeldung/acl/config/ACLContext.java   |  80 ++++++++++++
 .../AclMethodSecurityConfiguration.java       |  21 ++++
 .../acl/config/JPAPersistenceConfig.java      |  16 +++
 .../dao/NoticeMessageRepository.java          |  24 ++++
 .../acl/persistence/entity/NoticeMessage.java |  29 +++++
 .../src/main/resources/acl-data.sql           |  28 +++++
 .../src/main/resources/acl-schema.sql         |  58 +++++++++
 .../org.baeldung.acl.datasource.properties    |  12 ++
 .../java/org/baeldung/acl/SpringAclTest.java  | 119 ++++++++++++++++++
 10 files changed, 406 insertions(+)
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/ACLContext.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/AclMethodSecurityConfiguration.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/JPAPersistenceConfig.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/acl/persistence/dao/NoticeMessageRepository.java
 create mode 100644 spring-security-mvc-boot/src/main/java/org/baeldung/acl/persistence/entity/NoticeMessage.java
 create mode 100644 spring-security-mvc-boot/src/main/resources/acl-data.sql
 create mode 100644 spring-security-mvc-boot/src/main/resources/acl-schema.sql
 create mode 100644 spring-security-mvc-boot/src/main/resources/org.baeldung.acl.datasource.properties
 create mode 100644 spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclTest.java

diff --git a/spring-security-mvc-boot/pom.xml b/spring-security-mvc-boot/pom.xml
index 3a8bc1f3aa..6566c0eea6 100644
--- a/spring-security-mvc-boot/pom.xml
+++ b/spring-security-mvc-boot/pom.xml
@@ -122,6 +122,25 @@
             <artifactId>jstl-api</artifactId>
             <version>${jstl.version}</version>
         </dependency>
+        
+        <dependency>
+		    <groupId>org.springframework.security</groupId>
+		    <artifactId>spring-security-acl</artifactId>
+		</dependency>
+		<dependency>
+		    <groupId>org.springframework.security</groupId>
+		    <artifactId>spring-security-config</artifactId>
+		</dependency>
+		<dependency>
+		    <groupId>org.springframework</groupId>
+		    <artifactId>spring-context-support</artifactId>
+		</dependency>
+		<dependency>
+	        <groupId>net.sf.ehcache</groupId>
+	    	<artifactId>ehcache-core</artifactId>
+	    	<version>2.6.11</version>
+	    	<type>jar</type>
+        </dependency>
 
     </dependencies>
 
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/ACLContext.java b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/ACLContext.java
new file mode 100644
index 0000000000..63a4ea58ef
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/ACLContext.java
@@ -0,0 +1,80 @@
+package org.baeldung.acl.config;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cache.ehcache.EhCacheFactoryBean;
+import org.springframework.cache.ehcache.EhCacheManagerFactoryBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
+import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
+import org.springframework.security.acls.AclPermissionCacheOptimizer;
+import org.springframework.security.acls.AclPermissionEvaluator;
+import org.springframework.security.acls.domain.AclAuthorizationStrategy;
+import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl;
+import org.springframework.security.acls.domain.ConsoleAuditLogger;
+import org.springframework.security.acls.domain.DefaultPermissionGrantingStrategy;
+import org.springframework.security.acls.domain.EhCacheBasedAclCache;
+import org.springframework.security.acls.jdbc.BasicLookupStrategy;
+import org.springframework.security.acls.jdbc.JdbcMutableAclService;
+import org.springframework.security.acls.jdbc.LookupStrategy;
+import org.springframework.security.acls.model.PermissionGrantingStrategy;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+
+@Configuration
+@EnableAutoConfiguration
+public class ACLContext {
+
+    @Autowired
+    DataSource dataSource;
+
+    @Bean
+    public EhCacheBasedAclCache aclCache() {
+        return new EhCacheBasedAclCache(aclEhCacheFactoryBean().getObject(), permissionGrantingStrategy(), aclAuthorizationStrategy());
+    }
+
+    @Bean
+    public EhCacheFactoryBean aclEhCacheFactoryBean() {
+        EhCacheFactoryBean ehCacheFactoryBean = new EhCacheFactoryBean();
+        ehCacheFactoryBean.setCacheManager(aclCacheManager().getObject());
+        ehCacheFactoryBean.setCacheName("aclCache");
+        return ehCacheFactoryBean;
+    }
+
+    @Bean
+    public EhCacheManagerFactoryBean aclCacheManager() {
+        return new EhCacheManagerFactoryBean();
+    }
+
+    @Bean
+    public PermissionGrantingStrategy permissionGrantingStrategy() {
+        return new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger());
+    }
+
+    @Bean
+    public AclAuthorizationStrategy aclAuthorizationStrategy() {
+        return new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_ADMIN"));
+    }
+
+    @Bean
+    public MethodSecurityExpressionHandler defaultMethodSecurityExpressionHandler() {
+        DefaultMethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler();
+        AclPermissionEvaluator permissionEvaluator = new AclPermissionEvaluator(aclService());
+        expressionHandler.setPermissionEvaluator(permissionEvaluator);
+        expressionHandler.setPermissionCacheOptimizer(new AclPermissionCacheOptimizer(aclService()));
+        return expressionHandler;
+    }
+
+    @Bean
+    public LookupStrategy lookupStrategy() {
+        return new BasicLookupStrategy(dataSource, aclCache(), aclAuthorizationStrategy(), new ConsoleAuditLogger());
+    }
+
+    @Bean
+    public JdbcMutableAclService aclService() {
+        return new JdbcMutableAclService(dataSource, lookupStrategy(), aclCache());
+    }
+
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/AclMethodSecurityConfiguration.java b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/AclMethodSecurityConfiguration.java
new file mode 100644
index 0000000000..110c4a6d24
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/AclMethodSecurityConfiguration.java
@@ -0,0 +1,21 @@
+package org.baeldung.acl.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
+
+@Configuration
+@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
+public class AclMethodSecurityConfiguration extends GlobalMethodSecurityConfiguration {
+
+    @Autowired
+    MethodSecurityExpressionHandler defaultMethodSecurityExpressionHandler;
+
+    @Override
+    protected MethodSecurityExpressionHandler createExpressionHandler() {
+        return defaultMethodSecurityExpressionHandler;
+    }
+
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/JPAPersistenceConfig.java b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/JPAPersistenceConfig.java
new file mode 100644
index 0000000000..9b87efa92c
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/config/JPAPersistenceConfig.java
@@ -0,0 +1,16 @@
+package org.baeldung.acl.config;
+
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(basePackages = "org.baeldung.acl.persistence.dao")
+@PropertySource("classpath:org.baeldung.acl.datasource.properties")
+@EntityScan(basePackages={ "org.baeldung.acl.persistence.entity" })
+public class JPAPersistenceConfig {
+    
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/acl/persistence/dao/NoticeMessageRepository.java b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/persistence/dao/NoticeMessageRepository.java
new file mode 100644
index 0000000000..8662c88d6c
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/persistence/dao/NoticeMessageRepository.java
@@ -0,0 +1,24 @@
+package org.baeldung.acl.persistence.dao;
+
+import java.util.List;
+
+import org.baeldung.acl.persistence.entity.NoticeMessage;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.security.access.prepost.PostAuthorize;
+import org.springframework.security.access.prepost.PostFilter;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+public interface NoticeMessageRepository extends JpaRepository<NoticeMessage, Long>{
+    
+    @PostFilter("hasPermission(filterObject, 'READ')")
+    List<NoticeMessage> findAll();
+    
+    @PostAuthorize("hasPermission(returnObject, 'READ')")
+    NoticeMessage findById(Integer id);
+    
+    @SuppressWarnings("unchecked")
+    @PreAuthorize("hasPermission(#noticeMessage, 'WRITE')")
+    NoticeMessage save(@Param("noticeMessage")NoticeMessage noticeMessage);
+
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/acl/persistence/entity/NoticeMessage.java b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/persistence/entity/NoticeMessage.java
new file mode 100644
index 0000000000..23f01a8edb
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/java/org/baeldung/acl/persistence/entity/NoticeMessage.java
@@ -0,0 +1,29 @@
+package org.baeldung.acl.persistence.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="system_message")
+public class NoticeMessage {
+
+    @Id
+    @Column
+    private Integer id;
+    @Column
+    private String content;
+    public Integer getId() {
+        return id;
+    }
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public String getContent() {
+        return content;
+    }
+    public void setContent(String content) {
+        this.content = content;
+    }
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/resources/acl-data.sql b/spring-security-mvc-boot/src/main/resources/acl-data.sql
new file mode 100644
index 0000000000..6c01eaacc2
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/resources/acl-data.sql
@@ -0,0 +1,28 @@
+INSERT INTO system_message(id,content) VALUES (1,'First Level Message');
+INSERT INTO system_message(id,content) VALUES (2,'Second Level Message');
+INSERT INTO system_message(id,content) VALUES (3,'Third Level Message');
+
+INSERT INTO acl_class (id, class) VALUES
+(1, 'org.baeldung.acl.persistence.entity.NoticeMessage');
+
+INSERT INTO acl_sid (id, principal, sid) VALUES
+(1, 1, 'manager'),
+(2, 1, 'hr'),
+(3, 1, 'admin'),
+(4, 0, 'ROLE_EDITOR');
+
+INSERT INTO acl_object_identity (id, object_id_class, object_id_identity, parent_object, owner_sid, entries_inheriting) VALUES
+(1, 1, 1, NULL, 3, 0),
+(2, 1, 2, NULL, 3, 0),
+(3, 1, 3, NULL, 3, 0)
+;
+
+INSERT INTO acl_entry (id, acl_object_identity, ace_order, sid, mask, granting, audit_success, audit_failure) VALUES
+(1, 1, 1, 1, 1, 1, 1, 1),
+(2, 1, 2, 1, 2, 1, 1, 1),
+(3, 1, 3, 4, 1, 1, 1, 1),
+(4, 2, 1, 2, 1, 1, 1, 1),
+(5, 2, 2, 4, 1, 1, 1, 1),
+(6, 3, 1, 4, 1, 1, 1, 1),
+(7, 3, 2, 4, 2, 1, 1, 1)
+;
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/resources/acl-schema.sql b/spring-security-mvc-boot/src/main/resources/acl-schema.sql
new file mode 100644
index 0000000000..58e9394b2b
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/resources/acl-schema.sql
@@ -0,0 +1,58 @@
+create table system_message (id integer not null, content varchar(255), primary key (id));
+
+CREATE TABLE IF NOT EXISTS acl_sid (
+  id bigint(20) NOT NULL AUTO_INCREMENT,
+  principal tinyint(1) NOT NULL,
+  sid varchar(100) NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY unique_uk_1 (sid,principal)
+);
+
+CREATE TABLE IF NOT EXISTS acl_class (
+  id bigint(20) NOT NULL AUTO_INCREMENT,
+  class varchar(255) NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY unique_uk_2 (class)
+);
+ 
+CREATE TABLE IF NOT EXISTS acl_entry (
+  id bigint(20) NOT NULL AUTO_INCREMENT,
+  acl_object_identity bigint(20) NOT NULL,
+  ace_order int(11) NOT NULL,
+  sid bigint(20) NOT NULL,
+  mask int(11) NOT NULL,
+  granting tinyint(1) NOT NULL,
+  audit_success tinyint(1) NOT NULL,
+  audit_failure tinyint(1) NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY unique_uk_4 (acl_object_identity,ace_order)
+);
+ 
+CREATE TABLE IF NOT EXISTS acl_object_identity (
+  id bigint(20) NOT NULL AUTO_INCREMENT,
+  object_id_class bigint(20) NOT NULL,
+  object_id_identity bigint(20) NOT NULL,
+  parent_object bigint(20) DEFAULT NULL,
+  owner_sid bigint(20) DEFAULT NULL,
+  entries_inheriting tinyint(1) NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY unique_uk_3 (object_id_class,object_id_identity)
+);
+ 
+ALTER TABLE acl_entry
+ADD FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id);
+
+ALTER TABLE acl_entry
+ADD FOREIGN KEY (sid) REFERENCES acl_sid(id);
+ 
+--
+-- Constraints for table acl_object_identity
+--
+ALTER TABLE acl_object_identity
+ADD FOREIGN KEY (parent_object) REFERENCES acl_object_identity (id);
+
+ALTER TABLE acl_object_identity
+ADD FOREIGN KEY (object_id_class) REFERENCES acl_class (id);
+
+ALTER TABLE acl_object_identity
+ADD FOREIGN KEY (owner_sid) REFERENCES acl_sid (id);
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/resources/org.baeldung.acl.datasource.properties b/spring-security-mvc-boot/src/main/resources/org.baeldung.acl.datasource.properties
new file mode 100644
index 0000000000..739dd3f07c
--- /dev/null
+++ b/spring-security-mvc-boot/src/main/resources/org.baeldung.acl.datasource.properties
@@ -0,0 +1,12 @@
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.username=sa
+spring.datasource.password=
+spring.datasource.driverClassName=org.h2.Driver
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect
+
+spring.h2.console.path=/myconsole
+spring.h2.console.enabled=true
+spring.datasource.initialize=true
+spring.datasource.schema=classpath:acl-schema.sql
+spring.datasource.data=classpath:acl-data.sql
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclTest.java
new file mode 100644
index 0000000000..fd9069d9bc
--- /dev/null
+++ b/spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclTest.java
@@ -0,0 +1,119 @@
+package org.baeldung.acl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import org.baeldung.acl.persistence.dao.NoticeMessageRepository;
+import org.baeldung.acl.persistence.entity.NoticeMessage;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
+import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
+import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
+import org.springframework.test.context.web.ServletTestExecutionListener;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+@TestExecutionListeners(listeners={ServletTestExecutionListener.class,
+        DependencyInjectionTestExecutionListener.class,
+        DirtiesContextTestExecutionListener.class,
+        TransactionalTestExecutionListener.class,
+        WithSecurityContextTestExecutionListener.class})
+public class SpringAclTest extends AbstractJUnit4SpringContextTests{
+    
+    private static Integer FIRST_MESSAGE_ID = 1;
+    private static Integer SECOND_MESSAGE_ID = 2;
+    private static Integer THIRD_MESSAGE_ID = 3;
+    private static String EDITTED_CONTENT = "EDITED";
+    
+    @Configuration
+    @ComponentScan("org.baeldung.acl.*")
+    public static class SpringConfig {
+
+    }
+    
+    @Autowired
+    NoticeMessageRepository repo;
+    
+    @Test
+    @WithMockUser(username="manager")
+    public void givenUsernameManager_whenFindAllMessage_thenReturnFirstMessage(){
+        List<NoticeMessage> details = repo.findAll();
+        assertNotNull(details);
+        assertEquals(1,details.size());
+        assertEquals(FIRST_MESSAGE_ID,details.get(0).getId());
+    }
+    
+    @Test
+    @WithMockUser(username="manager")
+    public void givenUsernameManager_whenFindFirstMessageByIdAndUpdateFirstMessageContent_thenOK(){
+        NoticeMessage firstMessage = repo.findById(FIRST_MESSAGE_ID);
+        assertNotNull(firstMessage);
+        assertEquals(FIRST_MESSAGE_ID,firstMessage.getId());
+        
+        firstMessage.setContent(EDITTED_CONTENT);
+        repo.save(firstMessage);
+        
+        NoticeMessage editedFirstMessage = repo.findById(FIRST_MESSAGE_ID);
+        assertNotNull(editedFirstMessage);
+        assertEquals(FIRST_MESSAGE_ID,editedFirstMessage.getId());
+        assertEquals(EDITTED_CONTENT,editedFirstMessage.getContent());
+    }
+    
+    @Test
+    @WithMockUser(username="hr")
+    public void givenUsernameHr_whenFindMessageById2_thenOK(){
+        NoticeMessage secondMessage = repo.findById(SECOND_MESSAGE_ID);
+        assertNotNull(secondMessage);
+        assertEquals(SECOND_MESSAGE_ID,secondMessage.getId());
+    }
+    
+    @Test(expected=AccessDeniedException.class)
+    @WithMockUser(username="hr")
+    public void givenUsernameHr_whenUpdateMessageWithId2_thenFail(){
+        NoticeMessage secondMessage = new NoticeMessage();
+        secondMessage.setId(SECOND_MESSAGE_ID);
+        secondMessage.setContent(EDITTED_CONTENT);
+        repo.save(secondMessage);
+    }
+    
+    @Test
+    @WithMockUser(roles={"EDITOR"})
+    public void givenRoleEditor_whenFindAllMessage_thenReturnThreeMessage(){
+        List<NoticeMessage> details = repo.findAll();
+        assertNotNull(details);
+        assertEquals(3,details.size());
+    }
+    
+    @Test
+    @WithMockUser(roles={"EDITOR"})
+    public void givenRoleEditor_whenUpdateThirdMessage_thenOK(){
+        NoticeMessage thirdMessage = new NoticeMessage();
+        thirdMessage.setId(THIRD_MESSAGE_ID);
+        thirdMessage.setContent(EDITTED_CONTENT);
+        repo.save(thirdMessage);
+    }
+    
+    @Test(expected=AccessDeniedException.class)
+    @WithMockUser(roles={"EDITOR"})
+    public void givenRoleEditor_whenFindFirstMessageByIdAndUpdateFirstMessageContent_thenFail(){
+        NoticeMessage firstMessage = repo.findById(FIRST_MESSAGE_ID);
+        assertNotNull(firstMessage);
+        assertEquals(FIRST_MESSAGE_ID,firstMessage.getId());
+        firstMessage.setContent(EDITTED_CONTENT);
+        repo.save(firstMessage);
+    }
+}
+    
\ No newline at end of file

From 062b83fe179b27a60f9f46f5ae0b86d93457fbfc Mon Sep 17 00:00:00 2001
From: Mansi <mansi2392@users.noreply.github.com>
Date: Sun, 12 Nov 2017 17:21:03 +0530
Subject: [PATCH 12/72] BAEL-1237 String Formatter (#2912)

* Example Code For Evaluation Article

This is an example code for the evaluation article on "Different Types of Bean Injection in Spring"

* Added unit tests

* Minor changes to application context

* Removed code committed for evaluation article

* BAEL-944 Demonstrating the problems with new Url pattern matching in Spring 5

* BAEL-944 Demonstrating the problems with new Url pattern matching in Spring 5

* BAEL-944 Exploring the Spring MVC URL Matching Improvements

* BAEL-944 Exploring the Spring MVC URL Matching Improvements

* BAEL-944 Exploring the Spring MVC URL Matching Improvements

* BAEL-944 Code Formatting and solving build issue

* BAEL-944 Resolving build issue due to change in Spring version

* BAEL-944 Resolving build issue

* BAEL-944 Formatting code

* BAEL-944 Moving tests to correct package

* BAEL-944 Moving tests to correct package

* BAEL-944 Replacing @RequestMapping by @GetMapping

* BAEL-944 Remove unnecessary attribute name, "value" in annotations

* BAEL-79 Intro to Activiti with Spring

* BAEL-79 Intro to Activiti with Spring

* BAEL-79 Adding activiti module to the parent modules

* BAEL-79 Using latest version

* BAEL-79 Update Spring boot version that works with Activiti

* BAEL-79 Replace RequestMapping with GetMapping

* BAEL-79 Use Java 8 Syntax

* BAEL-79 Formatting

* BAEL-79 changed module name

* BAEL-378 A Guide to Activiti with Java

* BAEL-79 Fixed unit tests

* BAEL-79 Simplified the process

* BAEL-79 Fix test cases

* BAEL-1045 Lambda Behave

* BAEL-1045 Lambda Behave

* BAEL-1045 Lambda Behave

* BAEL-1090 Difference between compact and compressed strings in Java 9

* BAEL-1237 String Formatter

* BAEL-1237 String Formatter

* BAEL-1237 String Formatter

* BAEL-1237 String Formatter

* BAEL-1237 Guide to java.util.Formatter
---
 .../StringFormatterExampleTests.java          | 141 ++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 core-java/src/test/java/com/baeldung/string/formatter/StringFormatterExampleTests.java

diff --git a/core-java/src/test/java/com/baeldung/string/formatter/StringFormatterExampleTests.java b/core-java/src/test/java/com/baeldung/string/formatter/StringFormatterExampleTests.java
new file mode 100644
index 0000000000..5e8d2c4455
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/string/formatter/StringFormatterExampleTests.java
@@ -0,0 +1,141 @@
+package com.baeldung.string.formatter;
+
+import java.util.Calendar;
+import java.util.Formatter;
+import java.util.GregorianCalendar;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class StringFormatterExampleTests {
+
+    @Test
+    public void givenString_whenFormatSpecifierForCalendar_thenGotExpected() {
+        //Syntax of Format Specifiers for Date/Time Representation
+        Calendar c = new GregorianCalendar(2017, 11, 10);
+        String s = String.format("The date is: %1$tm %1$te,%1$tY", c);
+
+        assertEquals("The date is: 12 10,2017", s);
+    }
+
+    @Test
+    public void givenString_whenGeneralConversion_thenConvertedString() {
+        //General Conversions
+        String s = String.format("The correct answer is %s", false);
+        assertEquals("The correct answer is false", s);
+
+        s = String.format("The correct answer is %b", null);
+        assertEquals("The correct answer is false", s);
+
+        s = String.format("The correct answer is %B", true);
+        assertEquals("The correct answer is TRUE", s);
+    }
+    
+    @Test
+    public void givenString_whenCharConversion_thenConvertedString() {        
+        //Character Conversions
+        String s = String.format("The correct answer is %c", 'a');
+        assertEquals("The correct answer is a", s);
+
+        s = String.format("The correct answer is %c", null);
+        assertEquals("The correct answer is null", s);
+
+        s = String.format("The correct answer is %C", 'b');
+        assertEquals("The correct answer is B", s);
+        
+        s = String.format("The valid unicode character: %c", 0x0400);
+        assertTrue(Character.isValidCodePoint(0x0400));
+        assertEquals("The valid unicode character: Ѐ", s);
+    }
+    
+    @Test(expected = java.util.IllegalFormatCodePointException.class)
+    public void givenString_whenIllegalCodePointForConversion_thenError() {        
+        String s = String.format("The valid unicode character: %c", 0x11FFFF);
+        assertFalse(Character.isValidCodePoint(0x11FFFF));
+        assertEquals("The valid unicode character: Ā", s);
+    }
+    
+    @Test
+    public void givenString_whenNumericIntegralConversion_thenConvertedString() {
+        //Numeric Integral Conversions
+        String s = String.format("The number 25 in decimal = %d", 25);
+        assertEquals("The number 25 in decimal = 25", s);
+
+        s = String.format("The number 25 in octal = %o", 25);
+        assertEquals("The number 25 in octal = 31", s);
+
+        s = String.format("The number 25 in hexadecimal = %x", 25);
+        assertEquals("The number 25 in hexadecimal = 19", s);
+    }
+    
+    @Test
+    public void givenString_whenNumericFloatingConversion_thenConvertedString() {        
+        //Numeric Floating-point Conversions
+        String s = String.format("The computerized scientific format of 10000.00 "
+                + "= %e", 10000.00);
+        assertEquals("The computerized scientific format of 10000.00 = 1.000000e+04", s);
+
+        s = String.format("The decimal format of 10.019 = %f", 10.019);
+        assertEquals("The decimal format of 10.019 = 10.019000", s);
+    }
+    
+    @Test
+    public void givenString_whenLineSeparatorConversion_thenConvertedString() {        
+        //Line Separator Conversion
+        String s = String.format("First Line %nSecond Line");
+        assertEquals("First Line \n"
+                + "Second Line", s);
+    }
+
+    @Test
+    public void givenString_whenSpecifyFlag_thenGotFormattedString() {
+        //Without left-justified flag
+        String s = String.format("Without left justified flag: %5d", 25);
+        assertEquals("Without left justified flag:    25", s);
+
+        //Using left-justified flag
+        s = String.format("With left justified flag: %-5d", 25);
+        assertEquals("With left justified flag: 25   ", s);
+    }
+
+    @Test
+    public void givenString_whenSpecifyPrecision_thenGotExpected() {
+
+        //Precision
+        String s = String.format("Output of 25.09878 with Precision 2: %.2f", 25.09878);
+        assertEquals("Output of 25.09878 with Precision 2: 25.10", s);
+
+        s = String.format("Output of general conversion type with Precision 2: %.2b", true);
+        assertEquals("Output of general conversion type with Precision 2: tr", s);
+    }
+
+    @Test
+    public void givenString_whenSpecifyArgumentIndex_thenGotExpected() {
+        Calendar c = new GregorianCalendar(2017, 11, 10);
+        //Argument_Index
+        String s = String.format("The date is: %1$tm %1$te,%1$tY", c);
+        assertEquals("The date is: 12 10,2017", s);
+
+        s = String.format("The date is: %1$tm %<te,%<tY", c);
+        assertEquals("The date is: 12 10,2017", s);
+    }
+
+    @Test
+    public void givenAppendable_whenCreateFormatter_thenFormatterWorksOnAppendable() {
+        //Using String Formatter with Appendable
+        StringBuilder sb = new StringBuilder();
+        Formatter formatter = new Formatter(sb);
+        formatter.format("I am writting to a %1$s Instance.", sb.getClass());
+
+        assertEquals("I am writting to a class java.lang.StringBuilder Instance.", sb.toString());
+    }
+    
+    @Test
+    public void givenString_whenNoArguments_thenExpected() {
+        //Using String Formatter without arguments
+        String s = String.format("John scored 90%% in Fall semester");
+        assertEquals("John scored 90% in Fall semester", s);
+    }
+
+}

From 94f4dd1d77e534f9098b5f9e8e1b42c20a06ba46 Mon Sep 17 00:00:00 2001
From: Daniele Demichelis <danidemi@users.noreply.github.com>
Date: Sun, 12 Nov 2017 13:44:21 +0100
Subject: [PATCH 13/72] Bael 728 introduction to osgi (#3017)

* BAEL-728: first working geocoder example

* First steps with different geocoder

* Working plaing app

* Small step

* Maven project subdivided into components.

* <Export-Package> added

* CLient

* small step fwd

* Committing before resetting idea

* It does not compile!

* some other mod

* Works

* step

* Examples works

* removed unused code

* Removed empty folder
---
 osgi/osgi-intro-sample-activator/pom.xml      | 55 ++++++++++++
 .../osgi/sample/activator/HelloWorld.java     | 16 ++++
 osgi/osgi-intro-sample-client/pom.xml         | 49 +++++++++++
 .../baeldung/osgi/sample/client/Client.java   | 44 ++++++++++
 osgi/osgi-intro-sample-service/pom.xml        | 46 ++++++++++
 .../sample/service/definition/Greeter.java    |  7 ++
 .../service/implementation/GreeterImpl.java   | 30 +++++++
 osgi/pom.xml                                  | 87 +++++++++++++++++++
 8 files changed, 334 insertions(+)
 create mode 100644 osgi/osgi-intro-sample-activator/pom.xml
 create mode 100644 osgi/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java
 create mode 100644 osgi/osgi-intro-sample-client/pom.xml
 create mode 100644 osgi/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java
 create mode 100644 osgi/osgi-intro-sample-service/pom.xml
 create mode 100644 osgi/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java
 create mode 100644 osgi/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java
 create mode 100644 osgi/pom.xml

diff --git a/osgi/osgi-intro-sample-activator/pom.xml b/osgi/osgi-intro-sample-activator/pom.xml
new file mode 100644
index 0000000000..1584913627
--- /dev/null
+++ b/osgi/osgi-intro-sample-activator/pom.xml
@@ -0,0 +1,55 @@
+<?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">
+
+    <!-- com.baeldung/osgi-intro-sample-activator/1.0-SNAPSHOT -->
+    <parent>
+        <artifactId>osgi-intro</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- Please, note this is not the usual 'jar'. -->
+    <packaging>bundle</packaging>
+
+    <artifactId>osgi-intro-sample-activator</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+
+                        <!-- Qualified name of the class that exposes the activator iface. -->
+                        <Bundle-Activator>com.baeldung.osgi.sample.activator.HelloWorld</Bundle-Activator>
+
+                        <!-- One important thing to note:
+                        since you are not exporting the package "com.baeldung.osgi.sample.activator",
+                        you should at least add it to the Private-Package instruction.
+                        Otherwise, the classes inside the package will not be copied to your bundle,
+                        as the default value of this instruction is empty. -->
+
+                        <Private-Package>com.baeldung.osgi.sample.activator</Private-Package>
+
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/osgi/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java b/osgi/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java
new file mode 100644
index 0000000000..72fe624bac
--- /dev/null
+++ b/osgi/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java
@@ -0,0 +1,16 @@
+package com.baeldung.osgi.sample.activator;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class HelloWorld implements BundleActivator {
+
+    public void start(BundleContext ctx) {
+        System.out.println("Hello World.");
+    }
+
+    public void stop(BundleContext bundleContext) {
+        System.out.println("Goodbye World.");
+    }
+
+}
\ No newline at end of file
diff --git a/osgi/osgi-intro-sample-client/pom.xml b/osgi/osgi-intro-sample-client/pom.xml
new file mode 100644
index 0000000000..4096674d7d
--- /dev/null
+++ b/osgi/osgi-intro-sample-client/pom.xml
@@ -0,0 +1,49 @@
+<?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">
+    <parent>
+        <artifactId>osgi-intro</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- mvn:com.baeldung/osgi-intro-sample-client/1.0-SNAPSHOT -->
+    <artifactId>osgi-intro-sample-client</artifactId>
+
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.baeldung</groupId>
+            <artifactId>osgi-intro-sample-service</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-Activator>com.baeldung.osgi.sample.client.Client</Bundle-Activator>
+
+                        <Private-Package>com.baeldung.osgi.sample.client</Private-Package>
+
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/osgi/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java b/osgi/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java
new file mode 100644
index 0000000000..a82ed63fa7
--- /dev/null
+++ b/osgi/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java
@@ -0,0 +1,44 @@
+package com.baeldung.osgi.sample.client;
+
+import com.baeldung.osgi.sample.service.definition.Greeter;
+import org.osgi.framework.*;
+
+public class Client implements BundleActivator, ServiceListener {
+
+    private BundleContext ctx;
+    private ServiceReference serviceReference;
+
+    public void start(BundleContext ctx) {
+        this.ctx = ctx;
+        try {
+            ctx.addServiceListener(this, "(objectclass=" + Greeter.class.getName() + ")");
+        } catch (InvalidSyntaxException ise) {
+            ise.printStackTrace();
+        }
+    }
+
+    public void stop(BundleContext bundleContext) {
+        if (serviceReference != null) {
+            ctx.ungetService(serviceReference);
+        }
+        this.ctx = null;
+    }
+
+    public void serviceChanged(ServiceEvent serviceEvent) {
+        int type = serviceEvent.getType();
+        switch (type) {
+        case (ServiceEvent.REGISTERED):
+            System.out.println("Notification of service registered.");
+            serviceReference = serviceEvent.getServiceReference();
+            Greeter service = (Greeter) (ctx.getService(serviceReference));
+            System.out.println(service.sayHiTo("John"));
+            break;
+        case (ServiceEvent.UNREGISTERING):
+            System.out.println("Notification of service unregistered.");
+            ctx.ungetService(serviceEvent.getServiceReference());
+            break;
+        default:
+            break;
+        }
+    }
+}
diff --git a/osgi/osgi-intro-sample-service/pom.xml b/osgi/osgi-intro-sample-service/pom.xml
new file mode 100644
index 0000000000..cbc660bb74
--- /dev/null
+++ b/osgi/osgi-intro-sample-service/pom.xml
@@ -0,0 +1,46 @@
+<?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">
+
+    <!-- mvn:com.baeldung/osgi-intro-sample-service/1.0-SNAPSHOT -->
+    <parent>
+        <artifactId>osgi-intro</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>osgi-intro-sample-service</artifactId>
+
+    <!-- Please, note this is not the usual 'jar'. -->
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Bundle-Activator>com.baeldung.osgi.sample.service.implementation.GreeterImpl</Bundle-Activator>
+                        <Private-Package>com.baeldung.osgi.sample.service.implementation</Private-Package>
+                        <Export-Package>com.baeldung.osgi.sample.service.definition</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/osgi/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java b/osgi/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java
new file mode 100644
index 0000000000..f1e82a3465
--- /dev/null
+++ b/osgi/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java
@@ -0,0 +1,7 @@
+package com.baeldung.osgi.sample.service.definition;
+
+public interface Greeter {
+
+    public String sayHiTo(String name);
+
+}
diff --git a/osgi/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java b/osgi/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java
new file mode 100644
index 0000000000..48e26e3e6b
--- /dev/null
+++ b/osgi/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java
@@ -0,0 +1,30 @@
+package com.baeldung.osgi.sample.service.implementation;
+
+import com.baeldung.osgi.sample.service.definition.Greeter;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+
+import java.util.Hashtable;
+
+public class GreeterImpl implements Greeter, BundleActivator {
+
+    private ServiceReference<Greeter> reference;
+    private ServiceRegistration<Greeter> registration;
+
+    @Override public String sayHiTo(String name) {
+        return "Hello " + name;
+    }
+
+    @Override public void start(BundleContext context) throws Exception {
+        System.out.println("Registering service.");
+        registration = context.registerService(Greeter.class, new GreeterImpl(), new Hashtable<String, String>());
+        reference = registration.getReference();
+    }
+
+    @Override public void stop(BundleContext context) throws Exception {
+        System.out.println("Unregistering service.");
+        registration.unregister();
+    }
+}
diff --git a/osgi/pom.xml b/osgi/pom.xml
new file mode 100644
index 0000000000..4298a0d3eb
--- /dev/null
+++ b/osgi/pom.xml
@@ -0,0 +1,87 @@
+<?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>osgi-intro</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <modules>
+        <module>osgi-intro-sample-activator</module>
+        <module>osgi-intro-sample-service</module>
+        <module>osgi-intro-sample-client</module>
+    </modules>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>osgi-intro-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>osgi-intro-service</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>osgi-intro-gxyz</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>osgi-intro-mapquest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>3.9.0</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.json</groupId>
+                <artifactId>javax.json-api</artifactId>
+                <version>1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish</groupId>
+                <artifactId>javax.json</artifactId>
+                <version>1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>5.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>1.4.0</version>
+                    <extensions>true</extensions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>
\ No newline at end of file

From 179f545f0996855f379facce3fec38e728610da8 Mon Sep 17 00:00:00 2001
From: daoire <daoire@users.noreply.github.com>
Date: Sun, 12 Nov 2017 20:08:24 +0000
Subject: [PATCH 14/72] Update README.md

---
 hibernate5/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hibernate5/README.md b/hibernate5/README.md
index 9ef170a134..4690ebbe76 100644
--- a/hibernate5/README.md
+++ b/hibernate5/README.md
@@ -1,3 +1,4 @@
 ## Relevant articles:
 
 - [Dynamic Mapping with Hibernate](http://www.baeldung.com/hibernate-dynamic-mapping)
+- [An Overview of Identifiers in Hibernate](http://www.baeldung.com/hibernate-identifiers)

From 7c227841d62934b3c9452baa1fc114bc04857d7c Mon Sep 17 00:00:00 2001
From: daoire <daoire@users.noreply.github.com>
Date: Sun, 12 Nov 2017 20:10:47 +0000
Subject: [PATCH 15/72] Update README.md

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

diff --git a/spring-activiti/README.md b/spring-activiti/README.md
index 3580e29a52..5007b03ec7 100644
--- a/spring-activiti/README.md
+++ b/spring-activiti/README.md
@@ -2,4 +2,4 @@
 
 - [A Guide to Activiti with Java](http://www.baeldung.com/java-activiti)
 - [Introduction to Activiti with Spring](http://www.baeldung.com/spring-activiti)
-
+- [Activiti with Spring Security](http://www.baeldung.com/activiti-spring-security)

From 8e50444ba6a3161f3c18e5ba45764664a91539e7 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 12 Nov 2017 22:31:39 +0200
Subject: [PATCH 16/72] smaller methods

---
 .../com/baeldung/javac/SampleJavacPlugin.java | 113 +++++++++---------
 1 file changed, 56 insertions(+), 57 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/javac/SampleJavacPlugin.java b/core-java/src/main/java/com/baeldung/javac/SampleJavacPlugin.java
index c85b04f0cf..eb48d6a216 100644
--- a/core-java/src/main/java/com/baeldung/javac/SampleJavacPlugin.java
+++ b/core-java/src/main/java/com/baeldung/javac/SampleJavacPlugin.java
@@ -26,10 +26,9 @@ public class SampleJavacPlugin implements Plugin {
     public static final String NAME = "MyPlugin";
 
     private static Set<String> TARGET_TYPES = new HashSet<>(Arrays.asList(
-            // Use only primitive types for simplicity
-            byte.class.getName(), short.class.getName(), char.class.getName(), int.class.getName(),
-            long.class.getName(), float.class.getName(), double.class.getName()
-    ));
+        // Use only primitive types for simplicity
+        byte.class.getName(), short.class.getName(), char.class.getName(), 
+        int.class.getName(), long.class.getName(), float.class.getName(), double.class.getName()));
 
     @Override
     public String getName() {
@@ -49,34 +48,35 @@ public class SampleJavacPlugin implements Plugin {
                 if (e.getKind() != TaskEvent.Kind.PARSE) {
                     return;
                 }
-                e.getCompilationUnit().accept(new TreeScanner<Void, Void>() {
-                    @Override
-                    public Void visitMethod(MethodTree method, Void v) {
-                        List<VariableTree> parametersToInstrument = method.getParameters()
-                                                                        .stream()
-                                                                        .filter(SampleJavacPlugin.this::shouldInstrument)
-                                                                        .collect(Collectors.toList());
-                        if (!parametersToInstrument.isEmpty()) {
-                            // There is a possible case that more than one argument is marked by @Positive,
-                            // as the checks are added to the method's body beginning, we process parameters RTL
-                            // to ensure correct order.
-                            Collections.reverse(parametersToInstrument);
-                            parametersToInstrument.forEach(p -> addCheck(method, p, context));
+                e.getCompilationUnit()
+                    .accept(new TreeScanner<Void, Void>() {
+                        @Override
+                        public Void visitMethod(MethodTree method, Void v) {
+                            List<VariableTree> parametersToInstrument = method.getParameters()
+                                .stream()
+                                .filter(SampleJavacPlugin.this::shouldInstrument)
+                                .collect(Collectors.toList());
+                            if (!parametersToInstrument.isEmpty()) {
+                                // There is a possible case that more than one argument is marked by @Positive,
+                                // as the checks are added to the method's body beginning, we process parameters RTL
+                                // to ensure correct order.
+                                Collections.reverse(parametersToInstrument);
+                                parametersToInstrument.forEach(p -> addCheck(method, p, context));
+                            }
+                            // There is a possible case that there is a nested class declared in a method's body,
+                            // hence, we want to proceed with method body AST as well.
+                            return super.visitMethod(method, v);
                         }
-                        // There is a possible case that there is a nested class declared in a method's body,
-                        // hence, we want to proceed with method body AST as well.
-                        return super.visitMethod(method, v);
-                    }
-                }, null);
+                    }, null);
             }
         });
     }
 
     private boolean shouldInstrument(VariableTree parameter) {
         return TARGET_TYPES.contains(parameter.getType().toString())
-               && parameter.getModifiers().getAnnotations()
-                           .stream()
-                           .anyMatch(a -> Positive.class.getSimpleName().equals(a.getAnnotationType().toString()));
+          && parameter.getModifiers().getAnnotations()
+            .stream()
+            .anyMatch(a -> Positive.class.getSimpleName().equals(a.getAnnotationType().toString()));
     }
 
     private void addCheck(MethodTree method, VariableTree parameter, Context context) {
@@ -88,37 +88,36 @@ public class SampleJavacPlugin implements Plugin {
     private static JCTree.JCIf createCheck(VariableTree parameter, Context context) {
         TreeMaker factory = TreeMaker.instance(context);
         Names symbolsTable = Names.instance(context);
-        String parameterName = parameter.getName().toString();
-        String errorMessagePrefix = String.format("Argument '%s' of type %s is marked by @%s but got '",
-                                            parameterName, parameter.getType(), Positive.class.getSimpleName());
-        String errorMessageSuffix = "' for it";
-        Name parameterId = symbolsTable.fromString(parameterName);
-        return factory.at(((JCTree) parameter).pos).If(
-                factory.Parens(
-                        factory.Binary(
-                                JCTree.Tag.LE,
-                                factory.Ident(parameterId),
-                                factory.Literal(TypeTag.INT, 0))
-                ),
-                factory.Block(0, com.sun.tools.javac.util.List.of(
-                        factory.Throw(
-                                factory.NewClass(
-                                        null,
-                                        nil(),
-                                        factory.Ident(
-                                                symbolsTable.fromString(IllegalArgumentException.class.getSimpleName())
-                                        ),
-                                        com.sun.tools.javac.util.List.of(
-                                                factory.Binary(JCTree.Tag.PLUS,
-                                                               factory.Binary(JCTree.Tag.PLUS,
-                                                                              factory.Literal(TypeTag.CLASS, errorMessagePrefix),
-                                                                              factory.Ident(parameterId)),
-                                                               factory.Literal(TypeTag.CLASS, errorMessageSuffix))),
-                                        null
-                                )
-                        )
-                )),
-                null
-        );
+        
+        return factory.at(((JCTree) parameter).pos)
+          .If(factory.Parens(createIfCondition(factory, symbolsTable, parameter)),
+            createIfBlock(factory, symbolsTable, parameter),
+            null);
     }
+
+    private static JCTree.JCBinary createIfCondition(TreeMaker factory, Names symbolsTable, VariableTree parameter) {
+        Name parameterId = symbolsTable.fromString(parameter.getName().toString());
+        return factory.Binary(JCTree.Tag.LE, 
+          factory.Ident(parameterId), 
+          factory.Literal(TypeTag.INT, 0));
+    }
+
+    private static JCTree.JCBlock createIfBlock(TreeMaker factory, Names symbolsTable, VariableTree parameter) {
+        String parameterName = parameter.getName().toString();
+        Name parameterId = symbolsTable.fromString(parameterName);
+        
+        String errorMessagePrefix = String.format("Argument '%s' of type %s is marked by @%s but got '", 
+          parameterName, parameter.getType(), Positive.class.getSimpleName());
+        String errorMessageSuffix = "' for it";
+        
+        return factory.Block(0, com.sun.tools.javac.util.List.of(
+          factory.Throw(
+            factory.NewClass(null, nil(), 
+              factory.Ident(symbolsTable.fromString(IllegalArgumentException.class.getSimpleName())),
+                com.sun.tools.javac.util.List.of(factory.Binary(JCTree.Tag.PLUS, 
+                  factory.Binary(JCTree.Tag.PLUS, factory.Literal(TypeTag.CLASS, errorMessagePrefix), 
+                    factory.Ident(parameterId)), 
+                    factory.Literal(TypeTag.CLASS, errorMessageSuffix))), null))));
+    }
+
 }

From 2c8205f5caef328baeb82b7d8486a4873c4cf42e Mon Sep 17 00:00:00 2001
From: hgomez <hugo.gomez@evolutionfinance.com>
Date: Mon, 13 Nov 2017 00:00:07 -0500
Subject: [PATCH 17/72] Changed to github api Example

---
 ...yMotionExample.java => GitHubExample.java} | 57 +++++++-------
 .../{DailyMotionUrl.java => GitHubUrl.java}   | 15 ++--
 .../baeldung/googlehttpclientguide/User.java  | 77 +++++++++++++++++++
 .../baeldung/googlehttpclientguide/Video.java | 20 -----
 .../googlehttpclientguide/VideoFeed.java      | 13 ----
 5 files changed, 112 insertions(+), 70 deletions(-)
 rename libraries/src/main/java/com/baeldung/googlehttpclientguide/{DailyMotionExample.java => GitHubExample.java} (58%)
 rename libraries/src/main/java/com/baeldung/googlehttpclientguide/{DailyMotionUrl.java => GitHubUrl.java} (50%)
 create mode 100644 libraries/src/main/java/com/baeldung/googlehttpclientguide/User.java
 delete mode 100644 libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java
 delete mode 100644 libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java

diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubExample.java
similarity index 58%
rename from libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java
rename to libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubExample.java
index dc0fb1e1c5..0618a7294d 100644
--- a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionExample.java
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubExample.java
@@ -3,17 +3,25 @@ package com.baeldung.googlehttpclientguide;
 import com.google.api.client.http.HttpBackOffUnsuccessfulResponseHandler;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestFactory;
+import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.apache.ApacheHttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.client.util.ExponentialBackOff;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
-public class DailyMotionExample {
-
+public class GitHubExample {
     static final HttpTransport HTTP_TRANSPORT = new NetHttpTransport();
+    //static final HttpTransport HTTP_TRANSPORT = new ApacheHttpTransport();
     static final JsonFactory JSON_FACTORY = new JacksonFactory();
     //static final JsonFactory JSON_FACTORY = new GsonFactory();
 
@@ -23,8 +31,9 @@ public class DailyMotionExample {
                         (HttpRequest request) -> {
                             request.setParser(new JsonObjectParser(JSON_FACTORY));
                         });
-        DailyMotionUrl url = new DailyMotionUrl("https://api.dailymotion.com/videos/");
-        url.fields = "id,tags,title,url";
+        GitHubUrl url = new GitHubUrl("https://api.github.com/users");
+        url.per_page = 10;
+        url.page = 1;
         HttpRequest request = requestFactory.buildGetRequest(url);
         ExponentialBackOff backoff = new ExponentialBackOff.Builder()
                 .setInitialIntervalMillis(500)
@@ -34,37 +43,23 @@ public class DailyMotionExample {
                 .setRandomizationFactor(0.5)
                 .build();
         request.setUnsuccessfulResponseHandler(new HttpBackOffUnsuccessfulResponseHandler(backoff));
-        VideoFeed videoFeed = request.execute().parseAs(VideoFeed.class);
-        if (videoFeed.list.isEmpty()) {
-            System.out.println("No videos found.");
-        } else {
-            if (videoFeed.hasMore) {
-                System.out.print("First ");
-            }
-            System.out.println(videoFeed.list.size() + " videos found:");
-            for (Video video : videoFeed.list) {
-                System.out.println();
-                System.out.println("-----------------------------------------------");
-                System.out.println("ID: " + video.id);
-                System.out.println("Title: " + video.title);
-                System.out.println("Tags: " + video.tags);
-                System.out.println("URL: " + video.url);
-            }
-        }
+        Type type = new TypeToken<List<User>>() {}.getType();
+        List<User> users = (List<User>)request.execute().parseAs(type);
+        System.out.println(users);
+        url.appendRawPath("/eugenp");
+        request = requestFactory.buildGetRequest(url);
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        Future<HttpResponse> responseFuture = request.executeAsync(executor);
+        User eugen = responseFuture.get().parseAs(User.class);
+        System.out.println(eugen);
+        executor.shutdown();
     }
 
     public static void main(String[] args) {
         try {
-            try {
-                run();
-                return;
-            } catch (HttpResponseException e) {
-                System.err.println(e.getMessage());
-            }
-        } catch (Throwable t) {
-            t.printStackTrace();
+            run();
+        } catch (Exception e) {
+            System.err.println(e.getMessage());
         }
-        System.exit(1);
     }
-
 }
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubUrl.java
similarity index 50%
rename from libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java
rename to libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubUrl.java
index ebfc63d492..c44de1e145 100644
--- a/libraries/src/main/java/com/baeldung/googlehttpclientguide/DailyMotionUrl.java
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubUrl.java
@@ -3,13 +3,16 @@ package com.baeldung.googlehttpclientguide;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.util.Key;
 
+public class GitHubUrl extends GenericUrl{
 
-public class DailyMotionUrl extends GenericUrl {
-
-    public DailyMotionUrl(String encodedUrl) {
+    public GitHubUrl(String encodedUrl) {
         super(encodedUrl);
-    }
-
+    }    
+    
     @Key
-    public String fields;
+    public int per_page;
+    
+    @Key
+    public int page;
+    
 }
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/User.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/User.java
new file mode 100644
index 0000000000..bf4ee96b25
--- /dev/null
+++ b/libraries/src/main/java/com/baeldung/googlehttpclientguide/User.java
@@ -0,0 +1,77 @@
+package com.baeldung.googlehttpclientguide;
+
+import com.google.api.client.json.GenericJson;
+import com.google.api.client.util.Key;
+
+public class User extends GenericJson {
+    @Key
+    private String login;
+    @Key
+    private long id;
+    @Key
+    private String url;
+    @Key
+    private String company;
+    @Key
+    private String blog;
+    @Key
+    private String email;
+    
+    @Key("subscriptions_url")
+    private String subscriptionsUrl;
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getBlog() {
+        return blog;
+    }
+
+    public void setBlog(String blog) {
+        this.blog = blog;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" + "login=" + login + ", id=" + id + ", url=" + url + ", company=" + company + ", blog=" + blog + ", email=" + email + '}';
+    }    
+     
+    
+}
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java
deleted file mode 100644
index 4d2515b202..0000000000
--- a/libraries/src/main/java/com/baeldung/googlehttpclientguide/Video.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.baeldung.googlehttpclientguide;
-
-import com.google.api.client.json.GenericJson;
-import com.google.api.client.util.Key;
-import java.util.List;
-
-public class Video extends GenericJson {
-
-    @Key
-    public String id;
-
-    @Key
-    public List<String> tags;
-
-    @Key
-    public String title;
-
-    @Key
-    public String url;
-}
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java b/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java
deleted file mode 100644
index c24f528ba7..0000000000
--- a/libraries/src/main/java/com/baeldung/googlehttpclientguide/VideoFeed.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.baeldung.googlehttpclientguide;
-
-import com.google.api.client.util.Key;
-import java.util.List;
-
-public class VideoFeed {
-
-    @Key
-    public List<Video> list;
-
-    @Key("has_more")
-    public boolean hasMore;
-}

From 7d41efdab1092d2141c30d6af64d759038d537ab Mon Sep 17 00:00:00 2001
From: Doha2012 <dohae243@gmail.com>
Date: Mon, 13 Nov 2017 09:06:06 +0200
Subject: [PATCH 18/72] group testing modules (#2914)

* move security content from spring-security-rest-full

* swagger update

* move query language to new module

* rename spring-security-rest-full to spring-rest-full

* group persistence modules

* group testing modules

* try fix conflict

* cleanup
---
 .../src/main/java/com/baeldung/junit5/Greetings.java   |  0
 .../src/test/java/com/baeldung/GreetingsTest.java      |  2 +-
 .../baeldung/junit5/spring/GreetingsSpringTest.java    |  2 +-
 .../junit5/spring/SpringTestConfiguration.java         |  0
 .../src/main/resources/Feature/cucumber.feature        | 10 ----------
 .../src/main/resources/karate/cucumber.feature         |  0
 .../java/com/baeldung/rest/karate/KarateUnitTest.java  |  0
 .../src/test/resources/karate/user.feature             |  0
 8 files changed, 2 insertions(+), 12 deletions(-)
 rename {junit5 => testing-modules/junit-5}/src/main/java/com/baeldung/junit5/Greetings.java (100%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/GreetingsTest.java (99%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java (99%)
 rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java (100%)
 delete mode 100644 testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature
 rename {rest-testing => testing-modules/rest-testing}/src/main/resources/karate/cucumber.feature (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java (100%)
 rename {rest-testing => testing-modules/rest-testing}/src/test/resources/karate/user.feature (100%)

diff --git a/junit5/src/main/java/com/baeldung/junit5/Greetings.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/Greetings.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/Greetings.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/Greetings.java
diff --git a/junit5/src/test/java/com/baeldung/GreetingsTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/GreetingsTest.java
similarity index 99%
rename from junit5/src/test/java/com/baeldung/GreetingsTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/GreetingsTest.java
index e894d5857c..efde4e7404 100644
--- a/junit5/src/test/java/com/baeldung/GreetingsTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/GreetingsTest.java
@@ -16,4 +16,4 @@ public class GreetingsTest {
         assertTrue("Hello".equals(Greetings.sayHello()));
     }
 
-}
+}
\ No newline at end of file
diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
similarity index 99%
rename from junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
index e7a8a1c1e7..3b89508c88 100644
--- a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java
@@ -18,4 +18,4 @@ public class GreetingsSpringTest {
         assertTrue("Hello".equals(Greetings.sayHello()));
     }
 
-}
+}
\ No newline at end of file
diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java
diff --git a/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature b/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature
deleted file mode 100644
index 99dd8249fe..0000000000
--- a/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature
+++ /dev/null
@@ -1,10 +0,0 @@
-Feature: Testing a REST API
-  Users should be able to submit GET and POST requests to a web service, represented by WireMock
-
-  Scenario: Data Upload to a web service
-    When users upload data on a project
-    Then the server should handle it and return a success status
-
-  Scenario: Data retrieval from a web service
-    When users want to get information on the Cucumber project
-    Then the requested data is returned
\ No newline at end of file
diff --git a/rest-testing/src/main/resources/karate/cucumber.feature b/testing-modules/rest-testing/src/main/resources/karate/cucumber.feature
similarity index 100%
rename from rest-testing/src/main/resources/karate/cucumber.feature
rename to testing-modules/rest-testing/src/main/resources/karate/cucumber.feature
diff --git a/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java
diff --git a/rest-testing/src/test/resources/karate/user.feature b/testing-modules/rest-testing/src/test/resources/karate/user.feature
similarity index 100%
rename from rest-testing/src/test/resources/karate/user.feature
rename to testing-modules/rest-testing/src/test/resources/karate/user.feature

From 294a055ce56bf61abc8697c624aef38aba79c7fb Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Mon, 13 Nov 2017 08:23:17 +0100
Subject: [PATCH 19/72] Update README.md (#3016)

---
 testing-modules/selenium-junit-testng/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing-modules/selenium-junit-testng/README.md b/testing-modules/selenium-junit-testng/README.md
index 29393b956b..0137212290 100644
--- a/testing-modules/selenium-junit-testng/README.md
+++ b/testing-modules/selenium-junit-testng/README.md
@@ -1,4 +1,3 @@
 ### Relevant Articles:
 - [Guide to Selenium with JUnit / TestNG](http://www.baeldung.com/java-selenium-with-junit-and-testng)
-- [Testing a Site with Selenium / Webdriver](http://www.baeldung.com)
 - [Testing with Selenium/WebDriver and the Page Object Pattern](http://www.baeldung.com/selenium-webdriver-page-object)

From 10ea5fa78459d078066f6568980fa33890d5c843 Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <electricalweb@yahoo.com.ar>
Date: Mon, 13 Nov 2017 04:42:26 -0300
Subject: [PATCH 20/72] Implemeting the template method pattern in Java  -
 BAEL-1289 (#3012)

* Initial Commit

* Delete domain classes
---
 .../application/Application.java              | 11 ++-
 .../templatemethodpattern/model/Computer.java | 22 +++---
 .../model/ComputerBuilder.java                | 37 +++++++++
 .../model/HighEndComputerBuilder.java         | 21 +++++
 .../model/StandardComputerBuilder.java        | 21 +++++
 .../TemplateMethodPatternTest.java            | 77 +++++++++++--------
 6 files changed, 145 insertions(+), 44 deletions(-)
 create mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
 create mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
 create mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java

diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java
index 581c774f52..5570c2e1dd 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java
@@ -1,18 +1,21 @@
 package com.baeldung.templatemethodpattern.application;
 
 import com.baeldung.templatemethodpattern.model.Computer;
+import com.baeldung.templatemethodpattern.model.ComputerBuilder;
+import com.baeldung.templatemethodpattern.model.HighEndComputerBuilder;
+import com.baeldung.templatemethodpattern.model.StandardComputerBuilder;
 import com.baeldung.templatemethodpattern.model.HighEndComputer;
 import com.baeldung.templatemethodpattern.model.StandardComputer;
 
 public class Application {
     
     public static void main(String[] args) {
-        Computer standardComputer = new StandardComputer();
-        standardComputer.buildComputer();
+        ComputerBuilder standardComputerBuilder = new StandardComputerBuilder();
+        Computer standardComputer = standardComputerBuilder.buildComputer();
         standardComputer.getComputerParts().forEach((k, v) -> System.out.println("Part : " + k + " Value : " + v));
         
-        Computer highEndComputer = new HighEndComputer();
-        highEndComputer.buildComputer();
+        ComputerBuilder highEndComputerBuilder = new HighEndComputerBuilder();
+        Computer highEndComputer = highEndComputerBuilder.buildComputer();
         highEndComputer.getComputerParts().forEach((k, v) -> System.out.println("Part : " + k + " Value : " + v));
     }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
index f18485428f..d422204b82 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
@@ -1,20 +1,20 @@
 package com.baeldung.templatemethodpattern.model;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 
-public abstract class Computer {
+public abstract class ComputerBuilder {
     
     protected Map<String, String> computerParts = new HashMap<>();
     protected List<String> moterboardSetupStatus = new ArrayList<>();
     
-    public final void buildComputer() {
-         addMotherboard();
-         setupMotherboard();
-         addProcessor();
+    public final Computer buildComputer() {
+        addMotherboard();
+        setupMotherboard();
+        addProcessor();
+        return getComputer();
     }
     
     public abstract void addMotherboard();
@@ -29,5 +29,9 @@ public abstract class Computer {
         
     public Map<String, String> getComputerParts() {
         return computerParts;
-    }   
+    }
+     
+    private Computer getComputer() {
+        return new Computer(computerParts);
+    }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
new file mode 100644
index 0000000000..f264d33215
--- /dev/null
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
@@ -0,0 +1,37 @@
+package com.baeldung.templatemethodpattern.model;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class ComputerBuilder {
+
+    protected Map<String, String> computerParts = new HashMap<>();
+    protected List<String> moterboardSetupStatus = new ArrayList<>();
+    
+    public final Computer buildComputer() {
+        addMotherboard();
+        setupMotherboard();
+        addProcessor();
+        return getComputer();
+    }
+    
+    public abstract void addMotherboard();
+
+    public abstract void setupMotherboard();
+
+    public abstract void addProcessor();
+
+    public List<String> getMotherboardSetupStatus() {
+        return moterboardSetupStatus;
+    }
+
+    public Map<String, String> getComputerParts() {
+        return computerParts;
+    }
+    
+    private Computer getComputer() {
+        return new Computer(computerParts);
+    }
+}
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
new file mode 100644
index 0000000000..cf53a2ae6c
--- /dev/null
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
@@ -0,0 +1,21 @@
+package com.baeldung.templatemethodpattern.model;
+
+public class HighEndComputerBuilder extends ComputerBuilder {
+
+    @Override
+    public void addMotherboard() {
+        computerParts.put("Motherboard", "High-end Motherboard");
+    }
+    
+    @Override
+    public void setupMotherboard() {
+        moterboardSetupStatus.add("Screwing the high-end motherboard to the case.");
+        moterboardSetupStatus.add("Pluging in the power supply connectors.");
+        moterboardSetupStatus.forEach(step -> System.out.println(step));
+    }
+    
+    @Override
+    public void addProcessor() {
+         computerParts.put("Processor", "High-end Processor");
+    }
+}
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
new file mode 100644
index 0000000000..1d9bd0e00f
--- /dev/null
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
@@ -0,0 +1,21 @@
+package com.baeldung.templatemethodpattern.model;
+ 
+public class StandardComputerBuilder extends ComputerBuilder {
+
+    @Override
+    public void addMotherboard() {
+        computerParts.put("Motherboard", "Standard Motherboard");
+    }
+    
+    @Override
+    public void setupMotherboard() {
+        moterboardSetupStatus.add("Screwing the standard motherboard to the case.");
+        moterboardSetupStatus.add("Pluging in the power supply connectors.");
+        moterboardSetupStatus.forEach(step -> System.out.println(step));
+    }
+    
+    @Override
+    public void addProcessor() {
+        computerParts.put("Processor", "Standard Processor");
+    }
+}
diff --git a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
index 526873c4f2..df5751fb03 100644
--- a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
+++ b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
@@ -1,25 +1,30 @@
 package com.baeldung.templatemethodpatterntest;
 
+import com.baeldung.templatemethodpattern.model.Computer;
+import com.baeldung.templatemethodpattern.model.HighEndComputerBuilder;
+import com.baeldung.templatemethodpattern.model.StandardComputerBuilder;
 import com.baeldung.templatemethodpattern.model.HighEndComputer;
 import com.baeldung.templatemethodpattern.model.StandardComputer;
 import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertThat;
 
 public class TemplateMethodPatternTest {
 
-    private static StandardComputer standardComputer;
-    private static HighEndComputer highEndComputer;
-    
+    private static StandardComputerBuilder standardComputerBuilder;
+    private static HighEndComputerBuilder highEndComputerBuilder;
+
     @BeforeClass
-    public static void setUpStandardComputerInstance() {
-        standardComputer = new StandardComputer();
+    public static void setUpStandardComputerBuilderInstance() {
+        standardComputerBuilder = new StandardComputerBuilder();
     }
-    
+
     @BeforeClass
-    public static void setUpHighEndComputerInstance() {
-        highEndComputer = new HighEndComputer();
+    public static void setUpHighEndComputerBuilderInstance() {
+        highEndComputerBuilder = new HighEndComputerBuilder();
     }
 
     @Test
@@ -30,45 +35,55 @@ public class TemplateMethodPatternTest {
 
     @Test
     public void givenStandardMotheroboard_whenSetup_thenTwoEqualAssertions() {
-        standardComputer.setupMotherboard();
-        assertEquals("Screwing the standard motherboard to the case.", standardComputer.getMotherboardSetupStatus().get(0));
-        assertEquals("Plugin in the power supply connectors.",  standardComputer.getMotherboardSetupStatus().get(1));
+        standardComputerBuilder.setupMotherboard();
+        assertEquals("Screwing the standard motherboard to the case.", standardComputerBuilder.getMotherboardSetupStatus().get(0));
+        assertEquals("Pluging in the power supply connectors.", standardComputerBuilder.getMotherboardSetupStatus().get(1));
     }
-    
+
     @Test
     public void givenStandardProcessor_whenAddingProcessor_thenEqualAssertion() {
-        standardComputer.addProcessor();
-        assertEquals("Standard Processor", standardComputer.getComputerParts().get("Processor"));
+        standardComputerBuilder.addProcessor();
+        assertEquals("Standard Processor", standardComputerBuilder.getComputerParts().get("Processor"));
     }
 
     @Test
     public void givenAllStandardParts_whenBuildingComputer_thenTwoParts() {
-        standardComputer.buildComputer();
-        assertEquals(2, standardComputer.getComputerParts().size());
+        standardComputerBuilder.buildComputer();
+        assertEquals(2, standardComputerBuilder.getComputerParts().size());
+    }
+    
+    @Test
+    public void givenAllStandardParts_whenComputerisBuilt_thenComputerInstance() {
+        assertThat(standardComputerBuilder.buildComputer(), instanceOf(Computer.class));
+    }
+    
+    @Test
+    public void givenHighEnddMotherBoard_whenAddingMotherBoard_thenEqualAssertion() {
+        highEndComputerBuilder.addMotherboard();
+        Assert.assertEquals("High-end Motherboard", highEndComputerBuilder.getComputerParts().get("Motherboard"));
     }
 
-    @Test
-    public void givenHighEnddMotherBoard_whenAddingMotherBoard_thenEqualAssertion() {
-        highEndComputer.addMotherboard();
-        Assert.assertEquals("High-end Motherboard", highEndComputer.getComputerParts().get("Motherboard"));
-    }
-    
     @Test
     public void givenHighEnddMotheroboard_whenSetup_thenTwoEqualAssertions() {
-        highEndComputer.setupMotherboard();
-        assertEquals("Screwing the high-end motherboard to the case.", highEndComputer.getMotherboardSetupStatus().get(0));
-        assertEquals("Plugin in the power supply connectors.", highEndComputer.getMotherboardSetupStatus().get(1));
+        highEndComputerBuilder.setupMotherboard();
+        assertEquals("Screwing the high-end motherboard to the case.", highEndComputerBuilder.getMotherboardSetupStatus().get(0));
+        assertEquals("Pluging in the power supply connectors.", highEndComputerBuilder.getMotherboardSetupStatus().get(1));
     }
-    
+
     @Test
     public void givenHightEndProcessor_whenAddingProcessor_thenEqualAssertion() {
-        highEndComputer.addProcessor();
-        Assert.assertEquals("High-end Processor", highEndComputer.getComputerParts().get("Processor"));
+        highEndComputerBuilder.addProcessor();
+        assertEquals("High-end Processor", highEndComputerBuilder.getComputerParts().get("Processor"));
     }
     
     @Test
     public void givenAllHighEnddParts_whenBuildingComputer_thenTwoParts() {
-        highEndComputer.buildComputer();
-        assertEquals(2, highEndComputer.getComputerParts().size());
-    }  
+        highEndComputerBuilder.buildComputer();
+        assertEquals(2, highEndComputerBuilder.getComputerParts().size());
+    }
+    
+    @Test
+    public void givenAllHighEndParts_whenComputerisBuilt_thenComputerInstance() {
+        assertThat(standardComputerBuilder.buildComputer(), instanceOf(Computer.class));
+    }
 }

From 82337c59cf3e43e38015b09cdbf2a21dc2f6eb52 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Mon, 13 Nov 2017 08:52:28 +0100
Subject: [PATCH 21/72] OSGi cleanup (#3018)

---
 .../intro/osgi-intro-sample-activator/pom.xml | 55 ------------
 .../osgi/sample/activator/HelloWorld.java     | 16 ----
 osgi/intro/osgi-intro-sample-client/pom.xml   | 49 -----------
 .../baeldung/osgi/sample/client/Client.java   | 44 ----------
 osgi/intro/osgi-intro-sample-service/pom.xml  | 46 ----------
 .../sample/service/definition/Greeter.java    |  7 --
 .../service/implementation/GreeterImpl.java   | 30 -------
 osgi/intro/pom.xml                            | 87 -------------------
 osgi/{intro => }/readme.md                    |  0
 pom.xml                                       |  1 +
 10 files changed, 1 insertion(+), 334 deletions(-)
 delete mode 100644 osgi/intro/osgi-intro-sample-activator/pom.xml
 delete mode 100644 osgi/intro/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java
 delete mode 100644 osgi/intro/osgi-intro-sample-client/pom.xml
 delete mode 100644 osgi/intro/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java
 delete mode 100644 osgi/intro/osgi-intro-sample-service/pom.xml
 delete mode 100644 osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java
 delete mode 100644 osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java
 delete mode 100644 osgi/intro/pom.xml
 rename osgi/{intro => }/readme.md (100%)

diff --git a/osgi/intro/osgi-intro-sample-activator/pom.xml b/osgi/intro/osgi-intro-sample-activator/pom.xml
deleted file mode 100644
index 1584913627..0000000000
--- a/osgi/intro/osgi-intro-sample-activator/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">
-
-    <!-- com.baeldung/osgi-intro-sample-activator/1.0-SNAPSHOT -->
-    <parent>
-        <artifactId>osgi-intro</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <!-- Please, note this is not the usual 'jar'. -->
-    <packaging>bundle</packaging>
-
-    <artifactId>osgi-intro-sample-activator</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${project.version}</Bundle-Version>
-
-                        <!-- Qualified name of the class that exposes the activator iface. -->
-                        <Bundle-Activator>com.baeldung.osgi.sample.activator.HelloWorld</Bundle-Activator>
-
-                        <!-- One important thing to note:
-                        since you are not exporting the package "com.baeldung.osgi.sample.activator",
-                        you should at least add it to the Private-Package instruction.
-                        Otherwise, the classes inside the package will not be copied to your bundle,
-                        as the default value of this instruction is empty. -->
-
-                        <Private-Package>com.baeldung.osgi.sample.activator</Private-Package>
-
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/osgi/intro/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java b/osgi/intro/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java
deleted file mode 100644
index 72fe624bac..0000000000
--- a/osgi/intro/osgi-intro-sample-activator/src/main/java/com/baeldung/osgi/sample/activator/HelloWorld.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.baeldung.osgi.sample.activator;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class HelloWorld implements BundleActivator {
-
-    public void start(BundleContext ctx) {
-        System.out.println("Hello World.");
-    }
-
-    public void stop(BundleContext bundleContext) {
-        System.out.println("Goodbye World.");
-    }
-
-}
\ No newline at end of file
diff --git a/osgi/intro/osgi-intro-sample-client/pom.xml b/osgi/intro/osgi-intro-sample-client/pom.xml
deleted file mode 100644
index 4096674d7d..0000000000
--- a/osgi/intro/osgi-intro-sample-client/pom.xml
+++ /dev/null
@@ -1,49 +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">
-    <parent>
-        <artifactId>osgi-intro</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <!-- mvn:com.baeldung/osgi-intro-sample-client/1.0-SNAPSHOT -->
-    <artifactId>osgi-intro-sample-client</artifactId>
-
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.baeldung</groupId>
-            <artifactId>osgi-intro-sample-service</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${project.version}</Bundle-Version>
-                        <Bundle-Activator>com.baeldung.osgi.sample.client.Client</Bundle-Activator>
-
-                        <Private-Package>com.baeldung.osgi.sample.client</Private-Package>
-
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/osgi/intro/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java b/osgi/intro/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java
deleted file mode 100644
index a82ed63fa7..0000000000
--- a/osgi/intro/osgi-intro-sample-client/src/main/java/com/baeldung/osgi/sample/client/Client.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.baeldung.osgi.sample.client;
-
-import com.baeldung.osgi.sample.service.definition.Greeter;
-import org.osgi.framework.*;
-
-public class Client implements BundleActivator, ServiceListener {
-
-    private BundleContext ctx;
-    private ServiceReference serviceReference;
-
-    public void start(BundleContext ctx) {
-        this.ctx = ctx;
-        try {
-            ctx.addServiceListener(this, "(objectclass=" + Greeter.class.getName() + ")");
-        } catch (InvalidSyntaxException ise) {
-            ise.printStackTrace();
-        }
-    }
-
-    public void stop(BundleContext bundleContext) {
-        if (serviceReference != null) {
-            ctx.ungetService(serviceReference);
-        }
-        this.ctx = null;
-    }
-
-    public void serviceChanged(ServiceEvent serviceEvent) {
-        int type = serviceEvent.getType();
-        switch (type) {
-        case (ServiceEvent.REGISTERED):
-            System.out.println("Notification of service registered.");
-            serviceReference = serviceEvent.getServiceReference();
-            Greeter service = (Greeter) (ctx.getService(serviceReference));
-            System.out.println(service.sayHiTo("John"));
-            break;
-        case (ServiceEvent.UNREGISTERING):
-            System.out.println("Notification of service unregistered.");
-            ctx.ungetService(serviceEvent.getServiceReference());
-            break;
-        default:
-            break;
-        }
-    }
-}
diff --git a/osgi/intro/osgi-intro-sample-service/pom.xml b/osgi/intro/osgi-intro-sample-service/pom.xml
deleted file mode 100644
index cbc660bb74..0000000000
--- a/osgi/intro/osgi-intro-sample-service/pom.xml
+++ /dev/null
@@ -1,46 +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">
-
-    <!-- mvn:com.baeldung/osgi-intro-sample-service/1.0-SNAPSHOT -->
-    <parent>
-        <artifactId>osgi-intro</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>osgi-intro-sample-service</artifactId>
-
-    <!-- Please, note this is not the usual 'jar'. -->
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${project.version}</Bundle-Version>
-                        <Bundle-Activator>com.baeldung.osgi.sample.service.implementation.GreeterImpl</Bundle-Activator>
-                        <Private-Package>com.baeldung.osgi.sample.service.implementation</Private-Package>
-                        <Export-Package>com.baeldung.osgi.sample.service.definition</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java b/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java
deleted file mode 100644
index f1e82a3465..0000000000
--- a/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/definition/Greeter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.baeldung.osgi.sample.service.definition;
-
-public interface Greeter {
-
-    public String sayHiTo(String name);
-
-}
diff --git a/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java b/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java
deleted file mode 100644
index 48e26e3e6b..0000000000
--- a/osgi/intro/osgi-intro-sample-service/src/main/java/com/baeldung/osgi/sample/service/implementation/GreeterImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.baeldung.osgi.sample.service.implementation;
-
-import com.baeldung.osgi.sample.service.definition.Greeter;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-
-import java.util.Hashtable;
-
-public class GreeterImpl implements Greeter, BundleActivator {
-
-    private ServiceReference<Greeter> reference;
-    private ServiceRegistration<Greeter> registration;
-
-    @Override public String sayHiTo(String name) {
-        return "Hello " + name;
-    }
-
-    @Override public void start(BundleContext context) throws Exception {
-        System.out.println("Registering service.");
-        registration = context.registerService(Greeter.class, new GreeterImpl(), new Hashtable<String, String>());
-        reference = registration.getReference();
-    }
-
-    @Override public void stop(BundleContext context) throws Exception {
-        System.out.println("Unregistering service.");
-        registration.unregister();
-    }
-}
diff --git a/osgi/intro/pom.xml b/osgi/intro/pom.xml
deleted file mode 100644
index 83db90d19e..0000000000
--- a/osgi/intro/pom.xml
+++ /dev/null
@@ -1,87 +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>
-
-    <artifactId>osgi-intro</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <modules>
-        <module>osgi-intro-sample-activator</module>
-        <module>osgi-intro-sample-service</module>
-        <module>osgi-intro-sample-client</module>
-    </modules>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
-    </parent>
-
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>osgi-intro-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>osgi-intro-service</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>osgi-intro-gxyz</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>osgi-intro-mapquest</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>okhttp</artifactId>
-                <version>3.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.json</groupId>
-                <artifactId>javax.json-api</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish</groupId>
-                <artifactId>javax.json</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>5.0.0</version>
-                <scope>provided</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>1.4.0</version>
-                    <extensions>true</extensions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/osgi/intro/readme.md b/osgi/readme.md
similarity index 100%
rename from osgi/intro/readme.md
rename to osgi/readme.md
diff --git a/pom.xml b/pom.xml
index 631a2c9b26..5af1dab012 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,7 @@
         <module>mustache</module>
         <module>noexception</module>
 
+        <module>osgi</module>
         <module>orika</module>
 
         <module>patterns</module>

From 7cf3a763aab143410c5b1c0c80de51f974bc6bad Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Mon, 13 Nov 2017 14:40:00 +0200
Subject: [PATCH 22/72] Update README.md

---
 testing-modules/junit-5/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing-modules/junit-5/README.md b/testing-modules/junit-5/README.md
index d0fa19bd83..20ecb1eeab 100644
--- a/testing-modules/junit-5/README.md
+++ b/testing-modules/junit-5/README.md
@@ -7,3 +7,4 @@
 - [A Guied to JUnit 5 Extensions](http://www.baeldung.com/junit-5-extensions)
 - [Inject Parameters into JUnit Jupiter Unit Tests](http://www.baeldung.com/junit-5-parameters)
 - [Mockito and JUnit 5 – Using ExtendWith](http://www.baeldung.com/mockito-junit-5-extension)
+- [JUnit 5 – @RunWith](http://www.baeldung.com/junit-5-runwith)

From 06985d5b0ec30ff9cb0a06c15188898387d6a963 Mon Sep 17 00:00:00 2001
From: hgomez <hugo.gomez@evolutionfinance.com>
Date: Mon, 13 Nov 2017 08:48:57 -0500
Subject: [PATCH 23/72] chnaged client version to property

---
 libraries/pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 9384f58493..546fe8a6d8 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -625,17 +625,17 @@
         <dependency>
             <groupId>com.google.http-client</groupId>
             <artifactId>google-http-client</artifactId>
-            <version>1.23.0</version>
+            <version>${googleclient.version}</version>
         </dependency>
         <dependency>
           <groupId>com.google.http-client</groupId>
           <artifactId>google-http-client-jackson2</artifactId>
-            <version>1.23.0</version>
+            <version>${googleclient.version}</version>
         </dependency>
         <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-gson</artifactId>
-        <version>1.23.0</version>
+        <version>${googleclient.version}</version>
       </dependency>
     </dependencies>
     <repositories>
@@ -654,6 +654,7 @@
         </repository>
     </repositories>
     <properties>
+        <googleclient.version>1.23.0</googleclient.version>
         <crdt.version>0.1.0</crdt.version>
         <multiverse.version>0.7.0</multiverse.version>
         <cglib.version>3.2.4</cglib.version>

From 2e5531edd04ce4fdc16876e11bb61b221ea06f55 Mon Sep 17 00:00:00 2001
From: Doha2012 <dohae243@gmail.com>
Date: Mon, 13 Nov 2017 17:45:26 +0200
Subject: [PATCH 24/72] group and cleanup (#3027)

* move security content from spring-security-rest-full

* swagger update

* move query language to new module

* rename spring-security-rest-full to spring-rest-full

* group persistence modules

* group testing modules

* try fix conflict

* cleanup

* group and cleanup
---
 {guava18 => guava-modules/guava-18}/README.md |   0
 {guava18 => guava-modules/guava-18}/pom.xml   |   3 ++-
 .../baeldung/guava/entity/Administrator.java  |   0
 .../com/baeldung/guava/entity/Player.java     |   0
 .../java/com/baeldung/guava/entity/User.java  |   0
 .../guava/FluentIterableUnitTest.java         |   0
 .../baeldung/guava/GuavaMiscUtilsTest.java    |   0
 .../baeldung/guava/MoreExecutorsUnitTest.java |   0
 .../baeldung/guava/MoreObjectsUnitTest.java   |   0
 {guava19 => guava-modules/guava-19}/README.md |   0
 {guava19 => guava-modules/guava-19}/pom.xml   |   3 ++-
 .../java/com/baeldung/guava/entity/User.java  |   0
 .../baeldung/guava/CharMatcherUnitTest.java   |   0
 .../baeldung/guava/GuavaMiscUtilsTest.java    |   0
 .../com/baeldung/guava/HashingUnitTest.java   |   0
 .../com/baeldung/guava/TypeTokenUnitTest.java |   0
 {guava21 => guava-modules/guava-21}/README.md |   0
 {guava21 => guava-modules/guava-21}/pom.xml   |   3 ++-
 .../tutorial/AtomicLongMapTutorials.java      |   0
 .../guava/tutorial/ComparatorsExamples.java   |   0
 .../guava/tutorial/ConcatStreams.java         |   0
 .../tutorial/InternerBuilderExample.java      |   0
 .../guava/tutorial/MonitorExample.java        |   0
 .../guava/tutorial/MoreCollectorsExample.java |   0
 .../guava/tutorial/StreamsUtility.java        |   0
 .../ZipCollectionTest.java                    |   0
 .../AtomicLongMapIntegrationTest.java         |   0
 .../guava/tutorial/ComparatorsUnitTest.java   |   0
 .../guava/tutorial/GuavaStreamsUnitTest.java  |   0
 .../guava/tutorial/InternBuilderUnitTest.java |   0
 .../guava/tutorial/MonitorUnitTest.java       |   0
 .../tutorial/MoreCollectorsUnitTest.java      |   0
 .../guava/tutorial/StreamUtility.java         |   0
 {jee7 => jee-7}/.gitignore                    |   0
 {jee7 => jee-7}/README.md                     |   0
 {jee7 => jee-7}/pom.xml                       |   2 +-
 .../baeldung/arquillian/CapsConvertor.java    |   0
 .../com/baeldung/arquillian/CapsService.java  |   0
 .../java/com/baeldung/arquillian/Car.java     |   0
 .../java/com/baeldung/arquillian/CarEJB.java  |   0
 .../com/baeldung/arquillian/Component.java    |   0
 .../arquillian/ConvertToLowerCase.java        |   0
 .../com/baeldung/convListVal/ConvListVal.java |   0
 .../com/baeldung/convListVal/MyListener.java  |   0
 .../JavaEEAnnotationsSample/README.txt        |   0
 .../JavaEEAnnotationsSample/pom.xml           |   0
 .../javaeeannotations/AccountServlet.java     |   0
 .../BankAppServletContextListener.java        |   0
 .../javaeeannotations/LogInFilter.java        |   0
 .../UploadCustomerDocumentsServlet.java       |   0
 .../src/main/webapp/WEB-INF/web.xml           |   0
 .../src/main/webapp/index.jsp                 |   0
 .../src/main/webapp/login.jsp                 |   0
 .../src/main/webapp/upload.jsp                |   0
 .../baeldung/jaxws/client/AddEmployee.java    |   0
 .../jaxws/client/AddEmployeeResponse.java     |   0
 .../baeldung/jaxws/client/CountEmployees.java |   0
 .../jaxws/client/CountEmployeesResponse.java  |   0
 .../baeldung/jaxws/client/DeleteEmployee.java |   0
 .../jaxws/client/DeleteEmployeeResponse.java  |   0
 .../com/baeldung/jaxws/client/Employee.java   |   0
 .../jaxws/client/EmployeeAlreadyExists.java   |   0
 .../EmployeeAlreadyExists_Exception.java      |   0
 .../jaxws/client/EmployeeNotFound.java        |   0
 .../client/EmployeeNotFound_Exception.java    |   0
 .../jaxws/client/EmployeeService.java         |   0
 .../jaxws/client/EmployeeServiceClient.java   |   0
 .../jaxws/client/EmployeeService_Service.java |   0
 .../jaxws/client/GetAllEmployees.java         |   0
 .../jaxws/client/GetAllEmployeesResponse.java |   0
 .../baeldung/jaxws/client/GetEmployee.java    |   0
 .../jaxws/client/GetEmployeeResponse.java     |   0
 .../baeldung/jaxws/client/ObjectFactory.java  |   0
 .../baeldung/jaxws/client/UpdateEmployee.java |   0
 .../jaxws/client/UpdateEmployeeResponse.java  |   0
 .../baeldung/jaxws/client/package-info.java   |   0
 .../server/bottomup/EmployeeService.java      |   0
 .../server/bottomup/EmployeeServiceImpl.java  |   0
 .../exception/EmployeeAlreadyExists.java      |   0
 .../bottomup/exception/EmployeeNotFound.java  |   0
 .../jaxws/server/bottomup/model/Employee.java |   0
 .../config/EmployeeServicePublisher.java      |   0
 .../server/repository/EmployeeRepository.java |   0
 .../repository/EmployeeRepositoryImpl.java    |   0
 .../topdown/EmployeeServiceTopDown.java       |   0
 .../topdown/EmployeeServiceTopDownImpl.java   |   0
 .../EmployeeServiceTopDown_Service.java       |   0
 .../jaxws/server/topdown/ObjectFactory.java   |   0
 .../jaxws/wsdl/employeeservicetopdown.wsdl    |   0
 .../main/java/com/baeldung/json/Person.java   |   0
 .../java/com/baeldung/json/PersonBuilder.java |   0
 .../java/com/baeldung/json/PersonWriter.java  |   0
 .../springSecurity/ApplicationConfig.java     |   0
 .../SecurityWebApplicationInitializer.java    |   0
 .../springSecurity/SpringSecurityConfig.java  |   0
 .../controller/HomeController.java            |   0
 .../controller/LoginController.java           |   0
 .../baeldung/timer/AutomaticTimerBean.java    |   0
 .../baeldung/timer/FixedDelayTimerBean.java   |   0
 .../ProgrammaticAtFixedRateTimerBean.java     |   0
 .../baeldung/timer/ProgrammaticTimerBean.java |   0
 ...ammaticWithInitialFixedDelayTimerBean.java |   0
 .../com/baeldung/timer/ScheduleTimerBean.java |   0
 .../java/com/baeldung/timer/TimerEvent.java   |   0
 .../baeldung/timer/TimerEventListener.java    |   0
 .../java/com/baeldung/timer/WorkerBean.java   |   0
 .../main/resources/META-INF/persistence.xml   |   0
 .../src/main/webapp/ConvListVal.xhtml         |   0
 .../src/main/webapp/WEB-INF/beans.xml         |   0
 .../src/main/webapp/WEB-INF/faces-config.xml  |   0
 .../main/webapp/WEB-INF/spring/security.xml   |   0
 .../src/main/webapp/WEB-INF/views/admin.jsp   |   0
 .../src/main/webapp/WEB-INF/views/home.jsp    |   0
 .../src/main/webapp/WEB-INF/views/login.jsp   |   0
 .../src/main/webapp/WEB-INF/views/user.jsp    |   0
 .../src/main/webapp/WEB-INF/web.xml           |   0
 {jee7 => jee-7}/src/main/webapp/index.jsp     |   0
 {jee7 => jee-7}/src/main/webapp/secure.jsp    |   0
 .../java/com/baeldug/json/JsonUnitTest.java   |   0
 .../arquillan/ArquillianLiveTest.java         |   0
 .../ConvListValIntegrationTest.java           |   0
 .../jaxws/EmployeeServiceLiveTest.java        |   0
 .../AutomaticTimerBeanIntegrationTest.java    |   0
 ...icAtFixedRateTimerBeanIntegrationTest.java |   0
 .../ProgrammaticTimerBeanIntegrationTest.java |   0
 ...ithFixedDelayTimerBeanIntegrationTest.java |   0
 .../ScheduleTimerBeanIntegrationTest.java     |   0
 .../baeldung/timer/WithinWindowMatcher.java   |   0
 .../test/resources/META-INF/persistence.xml   |   0
 libraries-data/file.dat                       | Bin 0 -> 87 bytes
 .../log-mdc}/README.md                        |   0
 {log-mdc => logging-modules/log-mdc}/pom.xml  |   1 +
 .../com/baeldung/config/AppConfiguration.java |   0
 .../com/baeldung/config/AppInitializer.java   |   0
 .../com/baeldung/mdc/TransactionFactory.java  |   0
 .../main/java/com/baeldung/mdc/Transfer.java  |   0
 .../java/com/baeldung/mdc/TransferDemo.java   |   0
 .../com/baeldung/mdc/TransferService.java     |   0
 .../com/baeldung/mdc/log4j/Log4JRunnable.java |   0
 .../mdc/log4j/Log4JTransferService.java       |   0
 .../baeldung/mdc/log4j2/Log4J2Runnable.java   |   0
 .../mdc/log4j2/Log4J2TransferService.java     |   0
 .../mdc/slf4j/Slf4TransferService.java        |   0
 .../com/baeldung/mdc/slf4j/Slf4jRunnable.java |   0
 .../java/com/baeldung/ndc/Investment.java     |   0
 .../controller/JBossLoggingController.java    |   0
 .../ndc/controller/Log4J2Controller.java      |   0
 .../ndc/controller/Log4JController.java       |   0
 .../ndc/service/InvestmentService.java        |   0
 .../JBossLoggingInvestmentService.java        |   0
 .../ndc/service/Log4J2InvestmentService.java  |   0
 .../ndc/service/Log4JInvestmentService.java   |   0
 .../src/main/resources/log4j.properties       |   0
 .../log-mdc}/src/main/resources/log4j2.xml    |   0
 .../log-mdc}/src/main/resources/logback.xml   |   0
 .../mdc/log4j/DemoIntegrationTest.java        |   0
 .../mdc/log4j2/DemoIntegrationTest.java       |   0
 .../mdc/slf4j/DemoIntegrationTest.java        |   0
 .../baeldung/ndc/NDCLogIntegrationTest.java   |   0
 {log4j => logging-modules/log4j}/README.md    |   0
 {log4j => logging-modules/log4j}/pom.xml      |   1 +
 .../java/com/baeldung/log4j/Log4jExample.java |   0
 .../baeldung/log4j/Log4jRollingExample.java   |   0
 .../com/baeldung/log4j2/Log4j2Example.java    |   0
 .../baeldung/log4j2/Log4j2RollingExample.java |   0
 .../com/baeldung/logback/LogbackExample.java  |   0
 .../logback/LogbackRollingExample.java        |   0
 .../java/com/baeldung/slf4j/Slf4jExample.java |   0
 .../baeldung/slf4j/Slf4jRollingExample.java   |   0
 .../log4j}/src/main/resources/log4j.xml       |   0
 .../log4j}/src/main/resources/log4j2.xml      |   0
 .../log4j}/src/main/resources/logback.xml     |   0
 {log4j2 => logging-modules/log4j2}/README.md  |   0
 {log4j2 => logging-modules/log4j2}/pom.xml    |   2 +-
 .../tests/CustomLoggingIntegrationTest.java   |   0
 .../LambdaExpressionsIntegrationTest.java     |   0
 .../log4j2/tests/jdbc/ConnectionFactory.java  |   0
 ...onsole-appender_pattern-layout_colored.xml |   0
 .../log4j2}/src/test/resources/log4j2.xml     |   0
 pom.xml                                       |  18 +++++++++---------
 {struts2 => struts-2}/README.md               |   0
 .../WebContent/WEB-INF/web.xml                |   0
 {struts2 => struts-2}/WebContent/input.jsp    |   0
 {struts2 => struts-2}/WebContent/result.jsp   |   0
 {struts2 => struts-2}/pom.xml                 |   0
 .../java/com/baeldung/struts/CarAction.java   |   0
 .../baeldung/struts/CarMessageService.java    |   0
 .../baeldung/struts/test/CarActionTest.java   |   0
 {xmlunit2 => xmlunit-2}/README.md             |   0
 {xmlunit2 => xmlunit-2}/pom.xml               |   2 +-
 .../IgnoreAttributeDifferenceEvaluator.java   |   0
 .../com/baeldung/xmlunit/XMLUnitTest.java     |   0
 .../src/test/resources/control.xml            |   0
 .../src/test/resources/students.xml           |   0
 .../src/test/resources/students.xsd           |   0
 .../test/resources/students_with_error.xml    |   0
 .../src/test/resources/teachers.xml           |   0
 .../src/test/resources/test.xml               |   0
 198 files changed, 20 insertions(+), 15 deletions(-)
 rename {guava18 => guava-modules/guava-18}/README.md (100%)
 rename {guava18 => guava-modules/guava-18}/pom.xml (90%)
 rename {guava18 => guava-modules/guava-18}/src/main/java/com/baeldung/guava/entity/Administrator.java (100%)
 rename {guava18 => guava-modules/guava-18}/src/main/java/com/baeldung/guava/entity/Player.java (100%)
 rename {guava18 => guava-modules/guava-18}/src/main/java/com/baeldung/guava/entity/User.java (100%)
 rename {guava18 => guava-modules/guava-18}/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java (100%)
 rename {guava18 => guava-modules/guava-18}/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java (100%)
 rename {guava18 => guava-modules/guava-18}/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java (100%)
 rename {guava18 => guava-modules/guava-18}/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java (100%)
 rename {guava19 => guava-modules/guava-19}/README.md (100%)
 rename {guava19 => guava-modules/guava-19}/pom.xml (91%)
 rename {guava19 => guava-modules/guava-19}/src/main/java/com/baeldung/guava/entity/User.java (100%)
 rename {guava19 => guava-modules/guava-19}/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java (100%)
 rename {guava19 => guava-modules/guava-19}/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java (100%)
 rename {guava19 => guava-modules/guava-19}/src/test/java/com/baeldung/guava/HashingUnitTest.java (100%)
 rename {guava19 => guava-modules/guava-19}/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java (100%)
 rename {guava21 => guava-modules/guava-21}/README.md (100%)
 rename {guava21 => guava-modules/guava-21}/pom.xml (91%)
 rename {guava21 => guava-modules/guava-21}/src/main/java/com/baeldung/guava/tutorial/AtomicLongMapTutorials.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/main/java/com/baeldung/guava/tutorial/ComparatorsExamples.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/main/java/com/baeldung/guava/tutorial/ConcatStreams.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/main/java/com/baeldung/guava/tutorial/InternerBuilderExample.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/main/java/com/baeldung/guava/tutorial/MonitorExample.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/main/java/com/baeldung/guava/tutorial/MoreCollectorsExample.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/main/java/com/baeldung/guava/tutorial/StreamsUtility.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/test/java/com.baeldung.guava.zip/ZipCollectionTest.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/test/java/com/baeldung/guava/tutorial/AtomicLongMapIntegrationTest.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/test/java/com/baeldung/guava/tutorial/ComparatorsUnitTest.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/test/java/com/baeldung/guava/tutorial/GuavaStreamsUnitTest.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/test/java/com/baeldung/guava/tutorial/InternBuilderUnitTest.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/test/java/com/baeldung/guava/tutorial/MonitorUnitTest.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/test/java/com/baeldung/guava/tutorial/MoreCollectorsUnitTest.java (100%)
 rename {guava21 => guava-modules/guava-21}/src/test/java/com/baeldung/guava/tutorial/StreamUtility.java (100%)
 rename {jee7 => jee-7}/.gitignore (100%)
 rename {jee7 => jee-7}/README.md (100%)
 rename {jee7 => jee-7}/pom.xml (99%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/arquillian/CapsConvertor.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/arquillian/CapsService.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/arquillian/Car.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/arquillian/CarEJB.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/arquillian/Component.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/arquillian/ConvertToLowerCase.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/convListVal/ConvListVal.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/convListVal/MyListener.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/README.txt (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/pom.xml (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/LogInFilter.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/WEB-INF/web.xml (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/index.jsp (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/login.jsp (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/upload.jsp (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/AddEmployee.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/AddEmployeeResponse.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/CountEmployees.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/CountEmployeesResponse.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/DeleteEmployee.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/DeleteEmployeeResponse.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/Employee.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists_Exception.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound_Exception.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/EmployeeService.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/EmployeeServiceClient.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/EmployeeService_Service.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/GetAllEmployees.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/GetAllEmployeesResponse.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/GetEmployee.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/GetEmployeeResponse.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/ObjectFactory.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/UpdateEmployee.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/UpdateEmployeeResponse.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/client/package-info.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeService.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeServiceImpl.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeAlreadyExists.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeNotFound.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/bottomup/model/Employee.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/config/EmployeeServicePublisher.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepository.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepositoryImpl.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDownImpl.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown_Service.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/server/topdown/ObjectFactory.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/jaxws/wsdl/employeeservicetopdown.wsdl (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/json/Person.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/json/PersonBuilder.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/json/PersonWriter.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/springSecurity/ApplicationConfig.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/springSecurity/SecurityWebApplicationInitializer.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/springSecurity/SpringSecurityConfig.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/springSecurity/controller/HomeController.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/springSecurity/controller/LoginController.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/timer/AutomaticTimerBean.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/timer/ScheduleTimerBean.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/timer/TimerEvent.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/timer/TimerEventListener.java (100%)
 rename {jee7 => jee-7}/src/main/java/com/baeldung/timer/WorkerBean.java (100%)
 rename {jee7 => jee-7}/src/main/resources/META-INF/persistence.xml (100%)
 rename {jee7 => jee-7}/src/main/webapp/ConvListVal.xhtml (100%)
 rename {jee7 => jee-7}/src/main/webapp/WEB-INF/beans.xml (100%)
 rename {jee7 => jee-7}/src/main/webapp/WEB-INF/faces-config.xml (100%)
 rename {jee7 => jee-7}/src/main/webapp/WEB-INF/spring/security.xml (100%)
 rename {jee7 => jee-7}/src/main/webapp/WEB-INF/views/admin.jsp (100%)
 rename {jee7 => jee-7}/src/main/webapp/WEB-INF/views/home.jsp (100%)
 rename {jee7 => jee-7}/src/main/webapp/WEB-INF/views/login.jsp (100%)
 rename {jee7 => jee-7}/src/main/webapp/WEB-INF/views/user.jsp (100%)
 rename {jee7 => jee-7}/src/main/webapp/WEB-INF/web.xml (100%)
 rename {jee7 => jee-7}/src/main/webapp/index.jsp (100%)
 rename {jee7 => jee-7}/src/main/webapp/secure.jsp (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldug/json/JsonUnitTest.java (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldung/arquillan/ArquillianLiveTest.java (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldung/timer/AutomaticTimerBeanIntegrationTest.java (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanIntegrationTest.java (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanIntegrationTest.java (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanIntegrationTest.java (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldung/timer/ScheduleTimerBeanIntegrationTest.java (100%)
 rename {jee7 => jee-7}/src/test/java/com/baeldung/timer/WithinWindowMatcher.java (100%)
 rename {jee7 => jee-7}/src/test/resources/META-INF/persistence.xml (100%)
 create mode 100644 libraries-data/file.dat
 rename {log-mdc => logging-modules/log-mdc}/README.md (100%)
 rename {log-mdc => logging-modules/log-mdc}/pom.xml (98%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/config/AppConfiguration.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/config/AppInitializer.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/TransactionFactory.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/Transfer.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/TransferDemo.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/TransferService.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/log4j/Log4JRunnable.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/log4j/Log4JTransferService.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/log4j2/Log4J2Runnable.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/log4j2/Log4J2TransferService.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/slf4j/Slf4TransferService.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/mdc/slf4j/Slf4jRunnable.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/ndc/Investment.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/ndc/controller/JBossLoggingController.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/ndc/controller/Log4J2Controller.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/ndc/controller/Log4JController.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/ndc/service/InvestmentService.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/ndc/service/JBossLoggingInvestmentService.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/ndc/service/Log4J2InvestmentService.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/java/com/baeldung/ndc/service/Log4JInvestmentService.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/resources/log4j.properties (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/resources/log4j2.xml (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/main/resources/logback.xml (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java (100%)
 rename {log-mdc => logging-modules/log-mdc}/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java (100%)
 rename {log4j => logging-modules/log4j}/README.md (100%)
 rename {log4j => logging-modules/log4j}/pom.xml (97%)
 rename {log4j => logging-modules/log4j}/src/main/java/com/baeldung/log4j/Log4jExample.java (100%)
 rename {log4j => logging-modules/log4j}/src/main/java/com/baeldung/log4j/Log4jRollingExample.java (100%)
 rename {log4j => logging-modules/log4j}/src/main/java/com/baeldung/log4j2/Log4j2Example.java (100%)
 rename {log4j => logging-modules/log4j}/src/main/java/com/baeldung/log4j2/Log4j2RollingExample.java (100%)
 rename {log4j => logging-modules/log4j}/src/main/java/com/baeldung/logback/LogbackExample.java (100%)
 rename {log4j => logging-modules/log4j}/src/main/java/com/baeldung/logback/LogbackRollingExample.java (100%)
 rename {log4j => logging-modules/log4j}/src/main/java/com/baeldung/slf4j/Slf4jExample.java (100%)
 rename {log4j => logging-modules/log4j}/src/main/java/com/baeldung/slf4j/Slf4jRollingExample.java (100%)
 rename {log4j => logging-modules/log4j}/src/main/resources/log4j.xml (100%)
 rename {log4j => logging-modules/log4j}/src/main/resources/log4j2.xml (100%)
 rename {log4j => logging-modules/log4j}/src/main/resources/logback.xml (100%)
 rename {log4j2 => logging-modules/log4j2}/README.md (100%)
 rename {log4j2 => logging-modules/log4j2}/pom.xml (98%)
 rename {log4j2 => logging-modules/log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java (100%)
 rename {log4j2 => logging-modules/log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/LambdaExpressionsIntegrationTest.java (100%)
 rename {log4j2 => logging-modules/log4j2}/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java (100%)
 rename {log4j2 => logging-modules/log4j2}/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml (100%)
 rename {log4j2 => logging-modules/log4j2}/src/test/resources/log4j2.xml (100%)
 rename {struts2 => struts-2}/README.md (100%)
 rename {struts2 => struts-2}/WebContent/WEB-INF/web.xml (100%)
 rename {struts2 => struts-2}/WebContent/input.jsp (100%)
 rename {struts2 => struts-2}/WebContent/result.jsp (100%)
 rename {struts2 => struts-2}/pom.xml (100%)
 rename {struts2 => struts-2}/src/main/java/com/baeldung/struts/CarAction.java (100%)
 rename {struts2 => struts-2}/src/main/java/com/baeldung/struts/CarMessageService.java (100%)
 rename {struts2 => struts-2}/src/test/java/com/baeldung/struts/test/CarActionTest.java (100%)
 rename {xmlunit2 => xmlunit-2}/README.md (100%)
 rename {xmlunit2 => xmlunit-2}/pom.xml (96%)
 rename {xmlunit2 => xmlunit-2}/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java (100%)
 rename {xmlunit2 => xmlunit-2}/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java (100%)
 rename {xmlunit2 => xmlunit-2}/src/test/resources/control.xml (100%)
 rename {xmlunit2 => xmlunit-2}/src/test/resources/students.xml (100%)
 rename {xmlunit2 => xmlunit-2}/src/test/resources/students.xsd (100%)
 rename {xmlunit2 => xmlunit-2}/src/test/resources/students_with_error.xml (100%)
 rename {xmlunit2 => xmlunit-2}/src/test/resources/teachers.xml (100%)
 rename {xmlunit2 => xmlunit-2}/src/test/resources/test.xml (100%)

diff --git a/guava18/README.md b/guava-modules/guava-18/README.md
similarity index 100%
rename from guava18/README.md
rename to guava-modules/guava-18/README.md
diff --git a/guava18/pom.xml b/guava-modules/guava-18/pom.xml
similarity index 90%
rename from guava18/pom.xml
rename to guava-modules/guava-18/pom.xml
index 0b96918171..a9aba47f12 100644
--- a/guava18/pom.xml
+++ b/guava-modules/guava-18/pom.xml
@@ -4,13 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.baeldung</groupId>
-    <artifactId>guava18</artifactId>
+    <artifactId>guava-18</artifactId>
     <version>0.1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <dependencies>
diff --git a/guava18/src/main/java/com/baeldung/guava/entity/Administrator.java b/guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/Administrator.java
similarity index 100%
rename from guava18/src/main/java/com/baeldung/guava/entity/Administrator.java
rename to guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/Administrator.java
diff --git a/guava18/src/main/java/com/baeldung/guava/entity/Player.java b/guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/Player.java
similarity index 100%
rename from guava18/src/main/java/com/baeldung/guava/entity/Player.java
rename to guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/Player.java
diff --git a/guava18/src/main/java/com/baeldung/guava/entity/User.java b/guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/User.java
similarity index 100%
rename from guava18/src/main/java/com/baeldung/guava/entity/User.java
rename to guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/User.java
diff --git a/guava18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java b/guava-modules/guava-18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java
similarity index 100%
rename from guava18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java
rename to guava-modules/guava-18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java
diff --git a/guava18/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java b/guava-modules/guava-18/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
similarity index 100%
rename from guava18/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
rename to guava-modules/guava-18/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
diff --git a/guava18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java b/guava-modules/guava-18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java
similarity index 100%
rename from guava18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java
rename to guava-modules/guava-18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java
diff --git a/guava18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java b/guava-modules/guava-18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java
similarity index 100%
rename from guava18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java
rename to guava-modules/guava-18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java
diff --git a/guava19/README.md b/guava-modules/guava-19/README.md
similarity index 100%
rename from guava19/README.md
rename to guava-modules/guava-19/README.md
diff --git a/guava19/pom.xml b/guava-modules/guava-19/pom.xml
similarity index 91%
rename from guava19/pom.xml
rename to guava-modules/guava-19/pom.xml
index af9bc51eb9..2345212eba 100644
--- a/guava19/pom.xml
+++ b/guava-modules/guava-19/pom.xml
@@ -4,13 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.baeldung</groupId>
-    <artifactId>guava19</artifactId>
+    <artifactId>guava-19</artifactId>
     <version>0.1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/guava19/src/main/java/com/baeldung/guava/entity/User.java b/guava-modules/guava-19/src/main/java/com/baeldung/guava/entity/User.java
similarity index 100%
rename from guava19/src/main/java/com/baeldung/guava/entity/User.java
rename to guava-modules/guava-19/src/main/java/com/baeldung/guava/entity/User.java
diff --git a/guava19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java b/guava-modules/guava-19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java
similarity index 100%
rename from guava19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java
rename to guava-modules/guava-19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java
diff --git a/guava19/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java b/guava-modules/guava-19/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
similarity index 100%
rename from guava19/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
rename to guava-modules/guava-19/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
diff --git a/guava19/src/test/java/com/baeldung/guava/HashingUnitTest.java b/guava-modules/guava-19/src/test/java/com/baeldung/guava/HashingUnitTest.java
similarity index 100%
rename from guava19/src/test/java/com/baeldung/guava/HashingUnitTest.java
rename to guava-modules/guava-19/src/test/java/com/baeldung/guava/HashingUnitTest.java
diff --git a/guava19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java b/guava-modules/guava-19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java
similarity index 100%
rename from guava19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java
rename to guava-modules/guava-19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java
diff --git a/guava21/README.md b/guava-modules/guava-21/README.md
similarity index 100%
rename from guava21/README.md
rename to guava-modules/guava-21/README.md
diff --git a/guava21/pom.xml b/guava-modules/guava-21/pom.xml
similarity index 91%
rename from guava21/pom.xml
rename to guava-modules/guava-21/pom.xml
index 930def2a67..94bb66e76a 100644
--- a/guava21/pom.xml
+++ b/guava-modules/guava-21/pom.xml
@@ -4,13 +4,14 @@
          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>guava21</artifactId>
+    <artifactId>guava-21</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
      </parent>
 
     <dependencies>
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/AtomicLongMapTutorials.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/AtomicLongMapTutorials.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/AtomicLongMapTutorials.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/AtomicLongMapTutorials.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/ComparatorsExamples.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/ComparatorsExamples.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/ComparatorsExamples.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/ComparatorsExamples.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/ConcatStreams.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/ConcatStreams.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/ConcatStreams.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/ConcatStreams.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/InternerBuilderExample.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/InternerBuilderExample.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/InternerBuilderExample.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/InternerBuilderExample.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/MonitorExample.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/MonitorExample.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/MonitorExample.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/MonitorExample.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/MoreCollectorsExample.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/MoreCollectorsExample.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/MoreCollectorsExample.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/MoreCollectorsExample.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/StreamsUtility.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/StreamsUtility.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/StreamsUtility.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/StreamsUtility.java
diff --git a/guava21/src/test/java/com.baeldung.guava.zip/ZipCollectionTest.java b/guava-modules/guava-21/src/test/java/com.baeldung.guava.zip/ZipCollectionTest.java
similarity index 100%
rename from guava21/src/test/java/com.baeldung.guava.zip/ZipCollectionTest.java
rename to guava-modules/guava-21/src/test/java/com.baeldung.guava.zip/ZipCollectionTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/AtomicLongMapIntegrationTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/AtomicLongMapIntegrationTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/AtomicLongMapIntegrationTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/AtomicLongMapIntegrationTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/ComparatorsUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/ComparatorsUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/ComparatorsUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/ComparatorsUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/GuavaStreamsUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/GuavaStreamsUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/GuavaStreamsUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/GuavaStreamsUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/InternBuilderUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/InternBuilderUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/InternBuilderUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/InternBuilderUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/MonitorUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/MonitorUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/MonitorUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/MonitorUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/MoreCollectorsUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/MoreCollectorsUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/MoreCollectorsUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/MoreCollectorsUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/StreamUtility.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/StreamUtility.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/StreamUtility.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/StreamUtility.java
diff --git a/jee7/.gitignore b/jee-7/.gitignore
similarity index 100%
rename from jee7/.gitignore
rename to jee-7/.gitignore
diff --git a/jee7/README.md b/jee-7/README.md
similarity index 100%
rename from jee7/README.md
rename to jee-7/README.md
diff --git a/jee7/pom.xml b/jee-7/pom.xml
similarity index 99%
rename from jee7/pom.xml
rename to jee-7/pom.xml
index 6858a05d17..f1d50f55c6 100644
--- a/jee7/pom.xml
+++ b/jee-7/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.baeldung</groupId>
-	<artifactId>jee7</artifactId>
+	<artifactId>jee-7</artifactId>
 	<version>1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<description>JavaEE 7 Arquillian Archetype Sample</description>
diff --git a/jee7/src/main/java/com/baeldung/arquillian/CapsConvertor.java b/jee-7/src/main/java/com/baeldung/arquillian/CapsConvertor.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/CapsConvertor.java
rename to jee-7/src/main/java/com/baeldung/arquillian/CapsConvertor.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/CapsService.java b/jee-7/src/main/java/com/baeldung/arquillian/CapsService.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/CapsService.java
rename to jee-7/src/main/java/com/baeldung/arquillian/CapsService.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/Car.java b/jee-7/src/main/java/com/baeldung/arquillian/Car.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/Car.java
rename to jee-7/src/main/java/com/baeldung/arquillian/Car.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/CarEJB.java b/jee-7/src/main/java/com/baeldung/arquillian/CarEJB.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/CarEJB.java
rename to jee-7/src/main/java/com/baeldung/arquillian/CarEJB.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/Component.java b/jee-7/src/main/java/com/baeldung/arquillian/Component.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/Component.java
rename to jee-7/src/main/java/com/baeldung/arquillian/Component.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/ConvertToLowerCase.java b/jee-7/src/main/java/com/baeldung/arquillian/ConvertToLowerCase.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/ConvertToLowerCase.java
rename to jee-7/src/main/java/com/baeldung/arquillian/ConvertToLowerCase.java
diff --git a/jee7/src/main/java/com/baeldung/convListVal/ConvListVal.java b/jee-7/src/main/java/com/baeldung/convListVal/ConvListVal.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/convListVal/ConvListVal.java
rename to jee-7/src/main/java/com/baeldung/convListVal/ConvListVal.java
diff --git a/jee7/src/main/java/com/baeldung/convListVal/MyListener.java b/jee-7/src/main/java/com/baeldung/convListVal/MyListener.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/convListVal/MyListener.java
rename to jee-7/src/main/java/com/baeldung/convListVal/MyListener.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/README.txt b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/README.txt
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/README.txt
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/README.txt
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/pom.xml b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/pom.xml
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/pom.xml
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/pom.xml
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/LogInFilter.java b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/LogInFilter.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/LogInFilter.java
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/LogInFilter.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/WEB-INF/web.xml b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/WEB-INF/web.xml
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/WEB-INF/web.xml
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/index.jsp b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/index.jsp
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/index.jsp
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/index.jsp
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/login.jsp b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/login.jsp
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/login.jsp
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/login.jsp
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/upload.jsp b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/upload.jsp
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/upload.jsp
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/upload.jsp
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/AddEmployee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/AddEmployee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/AddEmployee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/AddEmployee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/AddEmployeeResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/AddEmployeeResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/AddEmployeeResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/AddEmployeeResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/CountEmployees.java b/jee-7/src/main/java/com/baeldung/jaxws/client/CountEmployees.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/CountEmployees.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/CountEmployees.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/CountEmployeesResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/CountEmployeesResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/CountEmployeesResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/CountEmployeesResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/DeleteEmployee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/DeleteEmployee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/DeleteEmployee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/DeleteEmployee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/DeleteEmployeeResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/DeleteEmployeeResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/DeleteEmployeeResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/DeleteEmployeeResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/Employee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/Employee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/Employee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/Employee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists_Exception.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists_Exception.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists_Exception.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists_Exception.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound_Exception.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound_Exception.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound_Exception.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound_Exception.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeService.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeService.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeService.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeService.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeServiceClient.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeServiceClient.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeServiceClient.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeServiceClient.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeService_Service.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeService_Service.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeService_Service.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeService_Service.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/GetAllEmployees.java b/jee-7/src/main/java/com/baeldung/jaxws/client/GetAllEmployees.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/GetAllEmployees.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/GetAllEmployees.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/GetAllEmployeesResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/GetAllEmployeesResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/GetAllEmployeesResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/GetAllEmployeesResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/GetEmployee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/GetEmployee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/GetEmployee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/GetEmployee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/GetEmployeeResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/GetEmployeeResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/GetEmployeeResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/GetEmployeeResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/ObjectFactory.java b/jee-7/src/main/java/com/baeldung/jaxws/client/ObjectFactory.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/ObjectFactory.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/ObjectFactory.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/UpdateEmployee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/UpdateEmployee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/UpdateEmployee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/UpdateEmployee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/UpdateEmployeeResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/UpdateEmployeeResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/UpdateEmployeeResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/UpdateEmployeeResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/package-info.java b/jee-7/src/main/java/com/baeldung/jaxws/client/package-info.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/package-info.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/package-info.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeService.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeService.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeService.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeService.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeServiceImpl.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeServiceImpl.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeServiceImpl.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeServiceImpl.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeAlreadyExists.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeAlreadyExists.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeAlreadyExists.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeAlreadyExists.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeNotFound.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeNotFound.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeNotFound.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeNotFound.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/model/Employee.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/model/Employee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/model/Employee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/model/Employee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/config/EmployeeServicePublisher.java b/jee-7/src/main/java/com/baeldung/jaxws/server/config/EmployeeServicePublisher.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/config/EmployeeServicePublisher.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/config/EmployeeServicePublisher.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepository.java b/jee-7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepository.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepository.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepository.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepositoryImpl.java b/jee-7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepositoryImpl.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepositoryImpl.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepositoryImpl.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown.java b/jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDownImpl.java b/jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDownImpl.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDownImpl.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDownImpl.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown_Service.java b/jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown_Service.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown_Service.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown_Service.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/topdown/ObjectFactory.java b/jee-7/src/main/java/com/baeldung/jaxws/server/topdown/ObjectFactory.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/topdown/ObjectFactory.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/topdown/ObjectFactory.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/wsdl/employeeservicetopdown.wsdl b/jee-7/src/main/java/com/baeldung/jaxws/wsdl/employeeservicetopdown.wsdl
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/wsdl/employeeservicetopdown.wsdl
rename to jee-7/src/main/java/com/baeldung/jaxws/wsdl/employeeservicetopdown.wsdl
diff --git a/jee7/src/main/java/com/baeldung/json/Person.java b/jee-7/src/main/java/com/baeldung/json/Person.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/json/Person.java
rename to jee-7/src/main/java/com/baeldung/json/Person.java
diff --git a/jee7/src/main/java/com/baeldung/json/PersonBuilder.java b/jee-7/src/main/java/com/baeldung/json/PersonBuilder.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/json/PersonBuilder.java
rename to jee-7/src/main/java/com/baeldung/json/PersonBuilder.java
diff --git a/jee7/src/main/java/com/baeldung/json/PersonWriter.java b/jee-7/src/main/java/com/baeldung/json/PersonWriter.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/json/PersonWriter.java
rename to jee-7/src/main/java/com/baeldung/json/PersonWriter.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/ApplicationConfig.java b/jee-7/src/main/java/com/baeldung/springSecurity/ApplicationConfig.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/ApplicationConfig.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/ApplicationConfig.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/SecurityWebApplicationInitializer.java b/jee-7/src/main/java/com/baeldung/springSecurity/SecurityWebApplicationInitializer.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/SecurityWebApplicationInitializer.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/SecurityWebApplicationInitializer.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/SpringSecurityConfig.java b/jee-7/src/main/java/com/baeldung/springSecurity/SpringSecurityConfig.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/SpringSecurityConfig.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/SpringSecurityConfig.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/controller/HomeController.java b/jee-7/src/main/java/com/baeldung/springSecurity/controller/HomeController.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/controller/HomeController.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/controller/HomeController.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/controller/LoginController.java b/jee-7/src/main/java/com/baeldung/springSecurity/controller/LoginController.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/controller/LoginController.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/controller/LoginController.java
diff --git a/jee7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/TimerEvent.java b/jee-7/src/main/java/com/baeldung/timer/TimerEvent.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/TimerEvent.java
rename to jee-7/src/main/java/com/baeldung/timer/TimerEvent.java
diff --git a/jee7/src/main/java/com/baeldung/timer/TimerEventListener.java b/jee-7/src/main/java/com/baeldung/timer/TimerEventListener.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/TimerEventListener.java
rename to jee-7/src/main/java/com/baeldung/timer/TimerEventListener.java
diff --git a/jee7/src/main/java/com/baeldung/timer/WorkerBean.java b/jee-7/src/main/java/com/baeldung/timer/WorkerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/WorkerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/WorkerBean.java
diff --git a/jee7/src/main/resources/META-INF/persistence.xml b/jee-7/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from jee7/src/main/resources/META-INF/persistence.xml
rename to jee-7/src/main/resources/META-INF/persistence.xml
diff --git a/jee7/src/main/webapp/ConvListVal.xhtml b/jee-7/src/main/webapp/ConvListVal.xhtml
similarity index 100%
rename from jee7/src/main/webapp/ConvListVal.xhtml
rename to jee-7/src/main/webapp/ConvListVal.xhtml
diff --git a/jee7/src/main/webapp/WEB-INF/beans.xml b/jee-7/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/beans.xml
rename to jee-7/src/main/webapp/WEB-INF/beans.xml
diff --git a/jee7/src/main/webapp/WEB-INF/faces-config.xml b/jee-7/src/main/webapp/WEB-INF/faces-config.xml
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/faces-config.xml
rename to jee-7/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/jee7/src/main/webapp/WEB-INF/spring/security.xml b/jee-7/src/main/webapp/WEB-INF/spring/security.xml
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/spring/security.xml
rename to jee-7/src/main/webapp/WEB-INF/spring/security.xml
diff --git a/jee7/src/main/webapp/WEB-INF/views/admin.jsp b/jee-7/src/main/webapp/WEB-INF/views/admin.jsp
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/views/admin.jsp
rename to jee-7/src/main/webapp/WEB-INF/views/admin.jsp
diff --git a/jee7/src/main/webapp/WEB-INF/views/home.jsp b/jee-7/src/main/webapp/WEB-INF/views/home.jsp
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/views/home.jsp
rename to jee-7/src/main/webapp/WEB-INF/views/home.jsp
diff --git a/jee7/src/main/webapp/WEB-INF/views/login.jsp b/jee-7/src/main/webapp/WEB-INF/views/login.jsp
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/views/login.jsp
rename to jee-7/src/main/webapp/WEB-INF/views/login.jsp
diff --git a/jee7/src/main/webapp/WEB-INF/views/user.jsp b/jee-7/src/main/webapp/WEB-INF/views/user.jsp
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/views/user.jsp
rename to jee-7/src/main/webapp/WEB-INF/views/user.jsp
diff --git a/jee7/src/main/webapp/WEB-INF/web.xml b/jee-7/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/web.xml
rename to jee-7/src/main/webapp/WEB-INF/web.xml
diff --git a/jee7/src/main/webapp/index.jsp b/jee-7/src/main/webapp/index.jsp
similarity index 100%
rename from jee7/src/main/webapp/index.jsp
rename to jee-7/src/main/webapp/index.jsp
diff --git a/jee7/src/main/webapp/secure.jsp b/jee-7/src/main/webapp/secure.jsp
similarity index 100%
rename from jee7/src/main/webapp/secure.jsp
rename to jee-7/src/main/webapp/secure.jsp
diff --git a/jee7/src/test/java/com/baeldug/json/JsonUnitTest.java b/jee-7/src/test/java/com/baeldug/json/JsonUnitTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldug/json/JsonUnitTest.java
rename to jee-7/src/test/java/com/baeldug/json/JsonUnitTest.java
diff --git a/jee7/src/test/java/com/baeldung/arquillan/ArquillianLiveTest.java b/jee-7/src/test/java/com/baeldung/arquillan/ArquillianLiveTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/arquillan/ArquillianLiveTest.java
rename to jee-7/src/test/java/com/baeldung/arquillan/ArquillianLiveTest.java
diff --git a/jee7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java b/jee-7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java b/jee-7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java
rename to jee-7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/AutomaticTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/AutomaticTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/AutomaticTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/AutomaticTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/ScheduleTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/ScheduleTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/ScheduleTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/ScheduleTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java b/jee-7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java
rename to jee-7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java
diff --git a/jee7/src/test/resources/META-INF/persistence.xml b/jee-7/src/test/resources/META-INF/persistence.xml
similarity index 100%
rename from jee7/src/test/resources/META-INF/persistence.xml
rename to jee-7/src/test/resources/META-INF/persistence.xml
diff --git a/libraries-data/file.dat b/libraries-data/file.dat
new file mode 100644
index 0000000000000000000000000000000000000000..70177cef976ad64b5517006b8abb7acc41f58b6e
GIT binary patch
literal 87
zcmZQv^Ok|NxQIb6IX_n~DKRxCr8F;HFT1ERU(Y!|w;(6A!Z|0gxR?P17#}$>F);ct
nu;eA?rj{@W`D7)QCF<uS=B4WgmlS2@rCV1NlrXS30Zjn_#T*+_

literal 0
HcmV?d00001

diff --git a/log-mdc/README.md b/logging-modules/log-mdc/README.md
similarity index 100%
rename from log-mdc/README.md
rename to logging-modules/log-mdc/README.md
diff --git a/log-mdc/pom.xml b/logging-modules/log-mdc/pom.xml
similarity index 98%
rename from log-mdc/pom.xml
rename to logging-modules/log-mdc/pom.xml
index e91d4e231e..918e052a15 100644
--- a/log-mdc/pom.xml
+++ b/logging-modules/log-mdc/pom.xml
@@ -12,6 +12,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <dependencies>
diff --git a/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java b/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java
diff --git a/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java b/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/config/AppInitializer.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/TransactionFactory.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransactionFactory.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/TransactionFactory.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransactionFactory.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/Transfer.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/Transfer.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/Transfer.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/Transfer.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/TransferDemo.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransferDemo.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/TransferDemo.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransferDemo.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/TransferService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransferService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/TransferService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransferService.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JRunnable.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JRunnable.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JRunnable.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JRunnable.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JTransferService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JTransferService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JTransferService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JTransferService.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2Runnable.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2Runnable.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2Runnable.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2Runnable.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2TransferService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2TransferService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2TransferService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2TransferService.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4TransferService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4TransferService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4TransferService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4TransferService.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4jRunnable.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4jRunnable.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4jRunnable.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4jRunnable.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/Investment.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/Investment.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/Investment.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/Investment.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/controller/JBossLoggingController.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/JBossLoggingController.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/controller/JBossLoggingController.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/JBossLoggingController.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4J2Controller.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4J2Controller.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/controller/Log4J2Controller.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4J2Controller.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4JController.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4JController.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/controller/Log4JController.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4JController.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/service/InvestmentService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/InvestmentService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/service/InvestmentService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/InvestmentService.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/service/JBossLoggingInvestmentService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/JBossLoggingInvestmentService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/service/JBossLoggingInvestmentService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/JBossLoggingInvestmentService.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/service/Log4J2InvestmentService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/Log4J2InvestmentService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/service/Log4J2InvestmentService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/Log4J2InvestmentService.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/service/Log4JInvestmentService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/Log4JInvestmentService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/service/Log4JInvestmentService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/Log4JInvestmentService.java
diff --git a/log-mdc/src/main/resources/log4j.properties b/logging-modules/log-mdc/src/main/resources/log4j.properties
similarity index 100%
rename from log-mdc/src/main/resources/log4j.properties
rename to logging-modules/log-mdc/src/main/resources/log4j.properties
diff --git a/log-mdc/src/main/resources/log4j2.xml b/logging-modules/log-mdc/src/main/resources/log4j2.xml
similarity index 100%
rename from log-mdc/src/main/resources/log4j2.xml
rename to logging-modules/log-mdc/src/main/resources/log4j2.xml
diff --git a/log-mdc/src/main/resources/logback.xml b/logging-modules/log-mdc/src/main/resources/logback.xml
similarity index 100%
rename from log-mdc/src/main/resources/logback.xml
rename to logging-modules/log-mdc/src/main/resources/logback.xml
diff --git a/log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java b/logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java
similarity index 100%
rename from log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java
rename to logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java
diff --git a/log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java b/logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java
similarity index 100%
rename from log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java
rename to logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java
diff --git a/log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java b/logging-modules/log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java
similarity index 100%
rename from log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java
rename to logging-modules/log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java
diff --git a/log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java b/logging-modules/log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java
similarity index 100%
rename from log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java
rename to logging-modules/log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java
diff --git a/log4j/README.md b/logging-modules/log4j/README.md
similarity index 100%
rename from log4j/README.md
rename to logging-modules/log4j/README.md
diff --git a/log4j/pom.xml b/logging-modules/log4j/pom.xml
similarity index 97%
rename from log4j/pom.xml
rename to logging-modules/log4j/pom.xml
index 20906c4c05..a3bfb0a33a 100644
--- a/log4j/pom.xml
+++ b/logging-modules/log4j/pom.xml
@@ -11,6 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <dependencies>
diff --git a/log4j/src/main/java/com/baeldung/log4j/Log4jExample.java b/logging-modules/log4j/src/main/java/com/baeldung/log4j/Log4jExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/log4j/Log4jExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/log4j/Log4jExample.java
diff --git a/log4j/src/main/java/com/baeldung/log4j/Log4jRollingExample.java b/logging-modules/log4j/src/main/java/com/baeldung/log4j/Log4jRollingExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/log4j/Log4jRollingExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/log4j/Log4jRollingExample.java
diff --git a/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java b/logging-modules/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
rename to logging-modules/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
diff --git a/log4j/src/main/java/com/baeldung/log4j2/Log4j2RollingExample.java b/logging-modules/log4j/src/main/java/com/baeldung/log4j2/Log4j2RollingExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/log4j2/Log4j2RollingExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/log4j2/Log4j2RollingExample.java
diff --git a/log4j/src/main/java/com/baeldung/logback/LogbackExample.java b/logging-modules/log4j/src/main/java/com/baeldung/logback/LogbackExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/logback/LogbackExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/logback/LogbackExample.java
diff --git a/log4j/src/main/java/com/baeldung/logback/LogbackRollingExample.java b/logging-modules/log4j/src/main/java/com/baeldung/logback/LogbackRollingExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/logback/LogbackRollingExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/logback/LogbackRollingExample.java
diff --git a/log4j/src/main/java/com/baeldung/slf4j/Slf4jExample.java b/logging-modules/log4j/src/main/java/com/baeldung/slf4j/Slf4jExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/slf4j/Slf4jExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/slf4j/Slf4jExample.java
diff --git a/log4j/src/main/java/com/baeldung/slf4j/Slf4jRollingExample.java b/logging-modules/log4j/src/main/java/com/baeldung/slf4j/Slf4jRollingExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/slf4j/Slf4jRollingExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/slf4j/Slf4jRollingExample.java
diff --git a/log4j/src/main/resources/log4j.xml b/logging-modules/log4j/src/main/resources/log4j.xml
similarity index 100%
rename from log4j/src/main/resources/log4j.xml
rename to logging-modules/log4j/src/main/resources/log4j.xml
diff --git a/log4j/src/main/resources/log4j2.xml b/logging-modules/log4j/src/main/resources/log4j2.xml
similarity index 100%
rename from log4j/src/main/resources/log4j2.xml
rename to logging-modules/log4j/src/main/resources/log4j2.xml
diff --git a/log4j/src/main/resources/logback.xml b/logging-modules/log4j/src/main/resources/logback.xml
similarity index 100%
rename from log4j/src/main/resources/logback.xml
rename to logging-modules/log4j/src/main/resources/logback.xml
diff --git a/log4j2/README.md b/logging-modules/log4j2/README.md
similarity index 100%
rename from log4j2/README.md
rename to logging-modules/log4j2/README.md
diff --git a/log4j2/pom.xml b/logging-modules/log4j2/pom.xml
similarity index 98%
rename from log4j2/pom.xml
rename to logging-modules/log4j2/pom.xml
index ea398af845..58bc4b74e7 100644
--- a/log4j2/pom.xml
+++ b/logging-modules/log4j2/pom.xml
@@ -9,7 +9,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java b/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java
similarity index 100%
rename from log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java
rename to logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java
diff --git a/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/LambdaExpressionsIntegrationTest.java b/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/LambdaExpressionsIntegrationTest.java
similarity index 100%
rename from log4j2/src/test/java/com/baeldung/logging/log4j2/tests/LambdaExpressionsIntegrationTest.java
rename to logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/LambdaExpressionsIntegrationTest.java
diff --git a/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java b/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java
similarity index 100%
rename from log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java
rename to logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java
diff --git a/log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml b/logging-modules/log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml
similarity index 100%
rename from log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml
rename to logging-modules/log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml
diff --git a/log4j2/src/test/resources/log4j2.xml b/logging-modules/log4j2/src/test/resources/log4j2.xml
similarity index 100%
rename from log4j2/src/test/resources/log4j2.xml
rename to logging-modules/log4j2/src/test/resources/log4j2.xml
diff --git a/pom.xml b/pom.xml
index 5af1dab012..b9186f9304 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,9 +68,9 @@
         <module>testing-modules/groovy-spock</module>
         <module>gson</module>
         <module>guava</module>
-        <module>guava18</module>
-        <module>guava19</module>
-        <module>guava21</module>
+        <module>guava-modules/guava-18</module>
+        <module>guava-modules/guava-19</module>
+        <module>guava-modules/guava-21</module>
         <module>guice</module>
         <module>disruptor</module>
 
@@ -90,7 +90,7 @@
         <module>javax-servlets</module>
         <module>javaxval</module>
         <module>jaxb</module>
-        <module>jee7</module>
+        <module>jee-7</module>
         <!-- <module>jhipster/jhipster-monolithic</module> -->
         <module>jjwt</module>
         <module>jpa-storedprocedure</module>
@@ -104,9 +104,9 @@
         <module>libraries</module>
         <module>libraries-data</module>
         <module>linkrest</module>        
-        <module>log-mdc</module>
-        <module>log4j</module>
-        <module>log4j2</module>
+        <module>logging-modules/log-mdc</module>
+        <module>logging-modules/log4j</module>
+        <module>logging-modules/log4j2</module>
         <module>lombok</module>
        <!-- <module>kotlin</module>-->
         <module>mapstruct</module>
@@ -242,8 +242,8 @@
         <module>video-tutorials</module>
 
         <module>xml</module>
-        <module>xmlunit2</module>
-        <module>struts2</module>
+        <module>xmlunit-2</module>
+        <module>struts-2</module>
         <module>apache-velocity</module>
         <module>apache-solrj</module>
 
diff --git a/struts2/README.md b/struts-2/README.md
similarity index 100%
rename from struts2/README.md
rename to struts-2/README.md
diff --git a/struts2/WebContent/WEB-INF/web.xml b/struts-2/WebContent/WEB-INF/web.xml
similarity index 100%
rename from struts2/WebContent/WEB-INF/web.xml
rename to struts-2/WebContent/WEB-INF/web.xml
diff --git a/struts2/WebContent/input.jsp b/struts-2/WebContent/input.jsp
similarity index 100%
rename from struts2/WebContent/input.jsp
rename to struts-2/WebContent/input.jsp
diff --git a/struts2/WebContent/result.jsp b/struts-2/WebContent/result.jsp
similarity index 100%
rename from struts2/WebContent/result.jsp
rename to struts-2/WebContent/result.jsp
diff --git a/struts2/pom.xml b/struts-2/pom.xml
similarity index 100%
rename from struts2/pom.xml
rename to struts-2/pom.xml
diff --git a/struts2/src/main/java/com/baeldung/struts/CarAction.java b/struts-2/src/main/java/com/baeldung/struts/CarAction.java
similarity index 100%
rename from struts2/src/main/java/com/baeldung/struts/CarAction.java
rename to struts-2/src/main/java/com/baeldung/struts/CarAction.java
diff --git a/struts2/src/main/java/com/baeldung/struts/CarMessageService.java b/struts-2/src/main/java/com/baeldung/struts/CarMessageService.java
similarity index 100%
rename from struts2/src/main/java/com/baeldung/struts/CarMessageService.java
rename to struts-2/src/main/java/com/baeldung/struts/CarMessageService.java
diff --git a/struts2/src/test/java/com/baeldung/struts/test/CarActionTest.java b/struts-2/src/test/java/com/baeldung/struts/test/CarActionTest.java
similarity index 100%
rename from struts2/src/test/java/com/baeldung/struts/test/CarActionTest.java
rename to struts-2/src/test/java/com/baeldung/struts/test/CarActionTest.java
diff --git a/xmlunit2/README.md b/xmlunit-2/README.md
similarity index 100%
rename from xmlunit2/README.md
rename to xmlunit-2/README.md
diff --git a/xmlunit2/pom.xml b/xmlunit-2/pom.xml
similarity index 96%
rename from xmlunit2/pom.xml
rename to xmlunit-2/pom.xml
index dd9fe9ac27..591cb70ec8 100644
--- a/xmlunit2/pom.xml
+++ b/xmlunit-2/pom.xml
@@ -2,7 +2,7 @@
     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.baeldung</groupId>
-    <artifactId>xmlunit2</artifactId>
+    <artifactId>xmlunit-2</artifactId>
     <version>1.0</version>
     <name>XMLUnit-2</name>
 
diff --git a/xmlunit2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java b/xmlunit-2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java
similarity index 100%
rename from xmlunit2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java
rename to xmlunit-2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java
diff --git a/xmlunit2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java b/xmlunit-2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
similarity index 100%
rename from xmlunit2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
rename to xmlunit-2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
diff --git a/xmlunit2/src/test/resources/control.xml b/xmlunit-2/src/test/resources/control.xml
similarity index 100%
rename from xmlunit2/src/test/resources/control.xml
rename to xmlunit-2/src/test/resources/control.xml
diff --git a/xmlunit2/src/test/resources/students.xml b/xmlunit-2/src/test/resources/students.xml
similarity index 100%
rename from xmlunit2/src/test/resources/students.xml
rename to xmlunit-2/src/test/resources/students.xml
diff --git a/xmlunit2/src/test/resources/students.xsd b/xmlunit-2/src/test/resources/students.xsd
similarity index 100%
rename from xmlunit2/src/test/resources/students.xsd
rename to xmlunit-2/src/test/resources/students.xsd
diff --git a/xmlunit2/src/test/resources/students_with_error.xml b/xmlunit-2/src/test/resources/students_with_error.xml
similarity index 100%
rename from xmlunit2/src/test/resources/students_with_error.xml
rename to xmlunit-2/src/test/resources/students_with_error.xml
diff --git a/xmlunit2/src/test/resources/teachers.xml b/xmlunit-2/src/test/resources/teachers.xml
similarity index 100%
rename from xmlunit2/src/test/resources/teachers.xml
rename to xmlunit-2/src/test/resources/teachers.xml
diff --git a/xmlunit2/src/test/resources/test.xml b/xmlunit-2/src/test/resources/test.xml
similarity index 100%
rename from xmlunit2/src/test/resources/test.xml
rename to xmlunit-2/src/test/resources/test.xml

From 25fe85d849980ed941917a4fb82c41783bef3303 Mon Sep 17 00:00:00 2001
From: chrisoberle <chrisoberle@users.noreply.github.com>
Date: Mon, 13 Nov 2017 11:36:30 -0500
Subject: [PATCH 25/72] rename client databases and switch from 3 to 2 of them
 (#3028)

---
 .../baeldung/dsrouting/ClientDatabase.java    |  2 +-
 .../DataSourceRoutingTestConfiguration.java   | 29 ++++++-------------
 .../dsrouting/DataSourceRoutingTests.java     | 29 +++++++------------
 3 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabase.java b/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabase.java
index 6c87cb3dde..619b8707d8 100644
--- a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabase.java
+++ b/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabase.java
@@ -2,6 +2,6 @@ package org.baeldung.dsrouting;
 
 public enum ClientDatabase {
 
-    ACME_WIDGETS, WIDGETS_ARE_US, WIDGET_DEPOT
+    CLIENT_A, CLIENT_B
 
 }
diff --git a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java b/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
index 09382c4ca0..595ad6ce0d 100644
--- a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
+++ b/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
@@ -22,41 +22,30 @@ public class DataSourceRoutingTestConfiguration {
     @Bean
     public DataSource clientDatasource() {
         Map<Object, Object> targetDataSources = new HashMap<>();
-        DataSource acmeWidgetsDatasource = acmeWidgetsDatasource();
-        DataSource widgetsAreUsDatasource = widgetsAreUsDatasource();
-        DataSource widgetsDepotDatasource = widgetsDepotDatasource();
-        targetDataSources.put(ClientDatabase.ACME_WIDGETS, acmeWidgetsDatasource);
-        targetDataSources.put(ClientDatabase.WIDGETS_ARE_US, widgetsAreUsDatasource);
-        targetDataSources.put(ClientDatabase.WIDGET_DEPOT, widgetsDepotDatasource);
+        DataSource clientADatasource = clientADatasource();
+        DataSource clientBDatasource = clientBDatasource();
+        targetDataSources.put(ClientDatabase.CLIENT_A, clientADatasource);
+        targetDataSources.put(ClientDatabase.CLIENT_B, clientBDatasource);
 
         ClientDataSourceRouter clientRoutingDatasource = new ClientDataSourceRouter();
         clientRoutingDatasource.setTargetDataSources(targetDataSources);
-        clientRoutingDatasource.setDefaultTargetDataSource(acmeWidgetsDatasource);
+        clientRoutingDatasource.setDefaultTargetDataSource(clientADatasource);
         return clientRoutingDatasource;
     }
 
-    private DataSource acmeWidgetsDatasource() {
+    private DataSource clientADatasource() {
         EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder();
         EmbeddedDatabase embeddedDb = dbBuilder.setType(EmbeddedDatabaseType.H2)
-            .setName("ACMEWIDGETS")
+            .setName("CLIENT_A")
             .addScript("classpath:dsrouting-db.sql")
             .build();
         return embeddedDb;
     }
 
-    private DataSource widgetsAreUsDatasource() {
+    private DataSource clientBDatasource() {
         EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder();
         EmbeddedDatabase embeddedDb = dbBuilder.setType(EmbeddedDatabaseType.H2)
-            .setName("WIDGETSAREUS")
-            .addScript("classpath:dsrouting-db.sql")
-            .build();
-        return embeddedDb;
-    }
-
-    private DataSource widgetsDepotDatasource() {
-        EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder();
-        EmbeddedDatabase embeddedDb = dbBuilder.setType(EmbeddedDatabaseType.H2)
-            .setName("WIDGETDEPOT")
+            .setName("CLIENT_B")
             .addScript("classpath:dsrouting-db.sql")
             .build();
         return embeddedDb;
diff --git a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTests.java b/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTests.java
index f19871702e..88a142fcde 100644
--- a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTests.java
+++ b/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTests.java
@@ -24,23 +24,18 @@ public class DataSourceRoutingTests {
 
     @Before
     public void setup() {
-        final String SQL_ACME_WIDGETS = "insert into client (id, name) values (1, 'ACME WIDGETS')";
-        final String SQL_WIDGETS_ARE_US = "insert into client (id, name) values (2, 'WIDGETS ARE US')";
-        final String SQL_WIDGET_DEPOT = "insert into client (id, name) values (3, 'WIDGET DEPOT')";
+        final String SQL_CLIENT_A = "insert into client (id, name) values (1, 'CLIENT A')";
+        final String SQL_CLIENT_B = "insert into client (id, name) values (2, 'CLIENT B')";
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate();
         jdbcTemplate.setDataSource(routingDatasource);
 
-        ClientDatabaseContextHolder.set(ClientDatabase.ACME_WIDGETS);
-        jdbcTemplate.execute(SQL_ACME_WIDGETS);
+        ClientDatabaseContextHolder.set(ClientDatabase.CLIENT_A);
+        jdbcTemplate.execute(SQL_CLIENT_A);
         ClientDatabaseContextHolder.clear();
 
-        ClientDatabaseContextHolder.set(ClientDatabase.WIDGETS_ARE_US);
-        jdbcTemplate.execute(SQL_WIDGETS_ARE_US);
-        ClientDatabaseContextHolder.clear();
-
-        ClientDatabaseContextHolder.set(ClientDatabase.WIDGET_DEPOT);
-        jdbcTemplate.execute(SQL_WIDGET_DEPOT);
+        ClientDatabaseContextHolder.set(ClientDatabase.CLIENT_B);
+        jdbcTemplate.execute(SQL_CLIENT_B);
         ClientDatabaseContextHolder.clear();
     }
 
@@ -48,15 +43,11 @@ public class DataSourceRoutingTests {
     public void givenClientDbs_whenContextsSwitch_thenRouteToCorrectDatabase() throws Exception {
 
         // test ACME WIDGETS
-        String clientName = clientService.getClientName(ClientDatabase.ACME_WIDGETS);
-        assertEquals(clientName, "ACME WIDGETS");
+        String clientName = clientService.getClientName(ClientDatabase.CLIENT_A);
+        assertEquals(clientName, "CLIENT A");
 
         // test WIDGETS_ARE_US
-        clientName = clientService.getClientName(ClientDatabase.WIDGETS_ARE_US);
-        assertEquals(clientName, "WIDGETS ARE US");
-
-        // test WIDGET_DEPOT
-        clientName = clientService.getClientName(ClientDatabase.WIDGET_DEPOT);
-        assertEquals(clientName, "WIDGET DEPOT");
+        clientName = clientService.getClientName(ClientDatabase.CLIENT_B);
+        assertEquals(clientName, "CLIENT B");
     }
 }

From 00282dd43e29a907cc63ce2c5cc57a79d9c50f43 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Mon, 13 Nov 2017 18:10:14 +0100
Subject: [PATCH 26/72] Build fix (#3033)

---
 ...eadTest.java => RunnableVsThreadLiveTest.java} | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
 rename core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/{RunnableVsThreadTest.java => RunnableVsThreadLiveTest.java} (87%)

diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadLiveTest.java
similarity index 87%
rename from core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java
rename to core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadLiveTest.java
index 4bd4848905..2a51f83e2b 100644
--- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java
+++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadLiveTest.java
@@ -1,24 +1,21 @@
 package com.baeldung.concurrent.runnable;
 
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 import org.apache.commons.lang3.RandomUtils;
-import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RunnableVsThreadTest {
+public class RunnableVsThreadLiveTest {
 
 	private static Logger log = 
-	  LoggerFactory.getLogger(RunnableVsThreadTest.class);
+	  LoggerFactory.getLogger(RunnableVsThreadLiveTest.class);
 
 	private static ExecutorService executorService;
 	
@@ -77,9 +74,7 @@ public class RunnableVsThreadTest {
 	public void givenACallableAsLambda_whenSubmitToES_thenResult() 
 	  throws Exception {
 		
-		Future<Integer> future = executorService.submit(() -> {
-		  return RandomUtils.nextInt(0, 100);
-		});
+		Future<Integer> future = executorService.submit(() -> RandomUtils.nextInt(0, 100));
 		
 		log.info("Result from callable: {}", future.get());
 	}
@@ -99,7 +94,7 @@ class SimpleThread extends Thread{
 	
 	private String message;
 	
-	public SimpleThread(String message) {
+	SimpleThread(String message) {
 		this.message = message;
 	}
 	
@@ -116,7 +111,7 @@ class SimpleRunnable implements Runnable {
 	
 	private String message;
 	
-	public SimpleRunnable(String message) {
+	SimpleRunnable(String message) {
 		this.message = message;
 	}
 	

From 503fd2d24f09b2b5fbc7759f71d0f69a1f79fdd3 Mon Sep 17 00:00:00 2001
From: felipeazv <felipeazv@users.noreply.github.com>
Date: Mon, 13 Nov 2017 19:41:00 +0100
Subject: [PATCH 27/72] BAEL-803: Backward Chaining with Drools - changefix
 (#3020)

---
 drools/backward-chaining/pom.xml              |  35 ------
 .../com/baeldung/BackwardChainingBeatles.java |  28 -----
 .../main/java/com/baeldung/model/Beatle.java  |  33 -----
 .../src/main/resources/META-INF/kmodule.xml   |   6 -
 .../resources/META-INF/maven/pom.properties   |   3 -
 .../resources/backward_chaining/Beatles.drl   |  44 -------
 .../resources/backward_chaining/rules.drl     |  34 -----
 .../baeldung/test/BackwardChainingTest.java   |  54 --------
 drools/pom.xml                                | 119 +++++++++---------
 .../backward_chaining}/BackwardChaining.java  |  15 ++-
 .../drools/config/DroolsBeanFactory.java      |   7 +-
 .../java/com/baeldung/drools/model/Fact.java  |   0
 .../com/baeldung/drools/model/Result.java     |   0
 .../drools/rules/BackwardChaining.drl}        |   2 +-
 .../BackwardChainingTest.java                 |  36 ++++++
 15 files changed, 105 insertions(+), 311 deletions(-)
 delete mode 100644 drools/backward-chaining/pom.xml
 delete mode 100644 drools/backward-chaining/src/main/java/com/baeldung/BackwardChainingBeatles.java
 delete mode 100644 drools/backward-chaining/src/main/java/com/baeldung/model/Beatle.java
 delete mode 100644 drools/backward-chaining/src/main/resources/META-INF/kmodule.xml
 delete mode 100644 drools/backward-chaining/src/main/resources/META-INF/maven/pom.properties
 delete mode 100644 drools/backward-chaining/src/main/resources/backward_chaining/Beatles.drl
 delete mode 100644 drools/backward-chaining/src/main/resources/backward_chaining/rules.drl
 delete mode 100644 drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java
 rename drools/{backward-chaining/src/main/java/com/baeldung/drools => src/main/java/com/baeldung/drools/backward_chaining}/BackwardChaining.java (59%)
 rename drools/{backward-chaining => }/src/main/java/com/baeldung/drools/model/Fact.java (100%)
 rename drools/{backward-chaining => }/src/main/java/com/baeldung/drools/model/Result.java (100%)
 rename drools/{backward-chaining/src/main/resources/com/baeldung/drools/backward_chaining/rules.drl => src/main/resources/com/baeldung/drools/rules/BackwardChaining.drl} (94%)
 create mode 100644 drools/src/test/java/com/baeldung/drools/backward_chaining/BackwardChainingTest.java

diff --git a/drools/backward-chaining/pom.xml b/drools/backward-chaining/pom.xml
deleted file mode 100644
index 1cf8f008af..0000000000
--- a/drools/backward-chaining/pom.xml
+++ /dev/null
@@ -1,35 +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>
-
-	<artifactId>drools-backward-chaining</artifactId>
-	<version>1.0</version>
-	<name>drools-backward-chaining</name>
-
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-modules</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-
-	<properties>
-		<runtime.version>6.4.0.Final</runtime.version>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.kie</groupId>
-			<artifactId>kie-api</artifactId>
-			<version>${runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.drools</groupId>
-			<version>${runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.drools</groupId>
-			<artifactId>drools-decisiontables</artifactId>
-			<version>${runtime.version}</version>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/drools/backward-chaining/src/main/java/com/baeldung/BackwardChainingBeatles.java b/drools/backward-chaining/src/main/java/com/baeldung/BackwardChainingBeatles.java
deleted file mode 100644
index 7fc5bd3685..0000000000
--- a/drools/backward-chaining/src/main/java/com/baeldung/BackwardChainingBeatles.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.baeldung;
-
-import org.kie.api.KieServices;
-import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.KieSession;
-
-import com.baeldung.model.Beatle;
-
-public class BackwardChainingBeatles {
-    public static void main(String[] args) {
-        
-            KieServices ks = KieServices.Factory.get();
-            KieContainer kContainer = ks.getKieClasspathContainer();
-            KieSession kSession = kContainer.newKieSession("ksession-backward-chaining");
-            // drools session base on the xml configuration (<strong>kmodule.xml</strong>)
-
-            // graph population
-            kSession.insert(new Beatle("Starr", "drums"));
-            kSession.insert(new Beatle("McCartney", "bass"));
-            kSession.insert(new Beatle("Lennon", "guitar"));
-            kSession.insert(new Beatle("Harrison", "guitar"));
-
-            kSession.insert("Ringo"); // invoke the rule that calls the query implentation of backward chaining
-            kSession.fireAllRules(); // invoke all the rules
-        
-    }
-
-}
\ No newline at end of file
diff --git a/drools/backward-chaining/src/main/java/com/baeldung/model/Beatle.java b/drools/backward-chaining/src/main/java/com/baeldung/model/Beatle.java
deleted file mode 100644
index 4b219b3a69..0000000000
--- a/drools/backward-chaining/src/main/java/com/baeldung/model/Beatle.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.baeldung.model;
-
-import org.kie.api.definition.type.Position;
-
-public class Beatle {
-
-    @Position(0)
-    private String lastName;
-    @Position(1)
-    private String instrument;
-
-    public Beatle(String lastName, String instrument) {
-        this.lastName = lastName;
-        this.instrument = instrument;
-    }
-
-    public String getInstrument() {
-        return instrument;
-    }
-
-    public void setInstrument(String instrument) {
-        this.instrument = instrument;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-}
\ No newline at end of file
diff --git a/drools/backward-chaining/src/main/resources/META-INF/kmodule.xml b/drools/backward-chaining/src/main/resources/META-INF/kmodule.xml
deleted file mode 100644
index 6498e26343..0000000000
--- a/drools/backward-chaining/src/main/resources/META-INF/kmodule.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
-    <kbase name="backward_chaining" packages="backward_chaining">
-        <ksession name="ksession-backward-chaining"/>
-    </kbase>
-</kmodule>
diff --git a/drools/backward-chaining/src/main/resources/META-INF/maven/pom.properties b/drools/backward-chaining/src/main/resources/META-INF/maven/pom.properties
deleted file mode 100644
index 26d8331732..0000000000
--- a/drools/backward-chaining/src/main/resources/META-INF/maven/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-groupId=com.baeldung.drools
-artifactId=DroosBackwardChaining
-version=1.0.0-SNAPSHOT
diff --git a/drools/backward-chaining/src/main/resources/backward_chaining/Beatles.drl b/drools/backward-chaining/src/main/resources/backward_chaining/Beatles.drl
deleted file mode 100644
index 8d0d06a79e..0000000000
--- a/drools/backward-chaining/src/main/resources/backward_chaining/Beatles.drl
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.baeldung
-
-import com.baeldung.model.Beatle;
-
-
-query whichBeatle(String lastName, String instrument) 
-  Beatle(lastName, instrument;)
-  or 
-  (Beatle(lastName, null;) 
-    and 
-   whichBeatle(null, instrument;)) //recursive call to the function that allows to search in a derivation tree structure
-end
-
-rule "Ringo"
-  when
-    String(this == "Ringo")
-    whichBeatle("Starr", "drums";)
-  then
-    System.out.println("The beatle is Ringo Starr");
-end
-
-rule "Paul"
-  when
-    String(this == "Paul")
-    whichBeatle("McCartney", "bass";)
-  then
-    System.out.println("The beatle is Paul McCartney");
-end
-
-rule "John"
-  when
-    String(this == "John")
-    whichBeatle("Lennon", "guitar";)
-  then
-    System.out.println("The beatle is John Lennon");
-end
-
-rule "George"
-  when
-    String(this == "George")
-    whichBeatle("Harrison", "guitar";)
-  then
-    System.out.println("The beatle is George Harrison");
-end
diff --git a/drools/backward-chaining/src/main/resources/backward_chaining/rules.drl b/drools/backward-chaining/src/main/resources/backward_chaining/rules.drl
deleted file mode 100644
index abcf95b9f1..0000000000
--- a/drools/backward-chaining/src/main/resources/backward_chaining/rules.drl
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.baeldung
-
-import com.baeldung.drools.model.Fact;
-
-global com.baeldung.drools.model.Result result;
-
-dialect  "mvel"
-
-query belongsTo(String x, String y)
-  Fact(x, y;)
-  or
-  (Fact(z, y;) and belongsTo(x, z;))
-end
-
-rule "Great Wall of China BELONGS TO Planet Earth"
-when
-    belongsTo("Great Wall of China", "Planet Earth";)
-then
-	result.setValue("Decision one taken: Great Wall of China BELONGS TO Planet Earth");
-end
-
-rule "Great Wall of China DOES NOT BELONG TO of Planet Earth"
-when
-    not belongsTo("Great Wall of China", "Planet Earth";)
-then
-    result.setValue("Decision two taken: Great Wall of China DOES NOT BELONG TO Planet Earth");
-end
-
-rule "print all facts"
-when
-    belongsTo(element, place;)
-then
-    result.addFact(element + " IS ELEMENT OF " + place);
-end
diff --git a/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java b/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java
deleted file mode 100644
index 112188f01f..0000000000
--- a/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.baeldung.test;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.kie.api.KieServices;
-import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.KieSession;
-
-import com.baeldung.drools.model.Fact;
-import com.baeldung.drools.model.Result;
-
-import static junit.framework.TestCase.assertEquals;
-
-public class BackwardChainingTest {
-    private Result result;
-    private KieServices ks;
-    private KieContainer kContainer;
-    private KieSession ksession;
-
-    @Before
-    public void before() {
-        result = new Result();
-        ks = KieServices.Factory.get();
-        kContainer = ks.getKieClasspathContainer();
-        ksession = kContainer.newKieSession("ksession-backward-chaining");
-        ksession.setGlobal("result", result);
-    }
-
-    @Test
-    public void whenWallOfChinaIsGiven_ThenItBelongsToPlanetEarth() {
-
-        ksession.setGlobal("result", result);
-        ksession.insert(new Fact("Asia", "Planet Earth"));
-        ksession.insert(new Fact("China", "Asia"));
-        ksession.insert(new Fact("Great Wall of China", "China"));
-
-        ksession.fireAllRules();
-        
-        // Assert Decision one
-        assertEquals(result.getValue(), "Decision one taken: Great Wall of China BELONGS TO Planet Earth");
-    }
-
-    @Test
-    public void whenChinaIsNotGiven_ThenWallOfChinaDoesNotBelongToPlanetEarth() {
-        ksession.insert(new Fact("Asia", "Planet Earth"));
-        // ksession.insert(new Location("China", "Asia")); // not provided to force Decision two
-        ksession.insert(new Fact("Great Wall of China", "China"));
-        
-        ksession.fireAllRules();
-        
-        // Assert Decision two
-        assertEquals(result.getValue(), "Decision two taken: Great Wall of China DOES NOT BELONG TO Planet Earth");
-    }
-}
diff --git a/drools/pom.xml b/drools/pom.xml
index ab894c6a1a..971bd5f4b8 100644
--- a/drools/pom.xml
+++ b/drools/pom.xml
@@ -1,73 +1,68 @@
 <?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>
+<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>drools</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+	<artifactId>drools</artifactId>
 	
-	<packaging>pom</packaging>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-modules</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
 
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
+	<properties>
+		<http-component-version>4.4.6</http-component-version>
+		<drools-version>7.1.0.Beta2</drools-version>
+		<apache-poi-version>3.13</apache-poi-version>
+	</properties>
 
-    <properties>
-        <http-component-version>4.4.6</http-component-version>
-        <drools-version>7.1.0.Beta2</drools-version>
-        <apache-poi-version>3.13</apache-poi-version>
-    </properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>${http-component-version}</version>
+		</dependency>
+		<!-- ... -->
+		<dependency>
+			<groupId>org.kie</groupId>
+			<artifactId>kie-ci</artifactId>
+			<version>${drools-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.drools</groupId>
+			<artifactId>drools-decisiontables</artifactId>
+			<version>${drools-version}</version>
+		</dependency>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>${http-component-version}</version>
-        </dependency>
-        <!-- ... -->
-        <dependency>
-            <groupId>org.kie</groupId>
-            <artifactId>kie-ci</artifactId>
-            <version>${drools-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-decisiontables</artifactId>
-            <version>${drools-version}</version>
-        </dependency>
+		<dependency>
+			<groupId>org.drools</groupId>
+			<artifactId>drools-core</artifactId>
+			<version>${drools-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.drools</groupId>
+			<artifactId>drools-compiler</artifactId>
+			<version>${drools-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>${apache-poi-version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-core</artifactId>
-            <version>${drools-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-compiler</artifactId>
-            <version>${drools-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>${apache-poi-version}</version>
-        </dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>${apache-poi-version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>${apache-poi-version}</version>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>4.3.6.RELEASE</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>4.3.6.RELEASE</version>
-        </dependency>
-
-    </dependencies>
+	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/drools/backward-chaining/src/main/java/com/baeldung/drools/BackwardChaining.java b/drools/src/main/java/com/baeldung/drools/backward_chaining/BackwardChaining.java
similarity index 59%
rename from drools/backward-chaining/src/main/java/com/baeldung/drools/BackwardChaining.java
rename to drools/src/main/java/com/baeldung/drools/backward_chaining/BackwardChaining.java
index bac144c32b..6f15ee510b 100644
--- a/drools/backward-chaining/src/main/java/com/baeldung/drools/BackwardChaining.java
+++ b/drools/src/main/java/com/baeldung/drools/backward_chaining/BackwardChaining.java
@@ -1,9 +1,8 @@
-package com.baeldung.drools;
+package com.baeldung.drools.backward_chaining;
 
-import org.kie.api.KieServices;
-import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
 
+import com.baeldung.drools.config.DroolsBeanFactory;
 import com.baeldung.drools.model.Fact;
 import com.baeldung.drools.model.Result;
 
@@ -11,17 +10,17 @@ public class BackwardChaining {
     public static void main(String[] args) {
         Result result = new BackwardChaining().backwardChaining();
         System.out.println(result.getValue());
-        result.getFacts().stream().forEach(System.out::println);
+        result.getFacts()
+            .stream()
+            .forEach(System.out::println);
     }
 
     public Result backwardChaining() {
         Result result = new Result();
-        KieServices ks = KieServices.Factory.get();
-        KieContainer kContainer = ks.getKieClasspathContainer();
-        KieSession ksession = kContainer.newKieSession("ksession-backward-chaining");
+        KieSession ksession = new DroolsBeanFactory().getKieSession();
         ksession.setGlobal("result", result);
         ksession.insert(new Fact("Asia", "Planet Earth"));
-        // ksession.insert(new Fact("China", "Asia"));
+        ksession.insert(new Fact("China", "Asia"));
         ksession.insert(new Fact("Great Wall of China", "China"));
 
         ksession.fireAllRules();
diff --git a/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java b/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java
index e8841b05e2..cf5d56f246 100644
--- a/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java
+++ b/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java
@@ -3,7 +3,6 @@ package com.baeldung.drools.config;
 import org.drools.decisiontable.DecisionTableProviderImpl;
 import org.kie.api.KieServices;
 import org.kie.api.builder.*;
-import org.kie.api.io.KieResources;
 import org.kie.api.io.Resource;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
@@ -22,7 +21,7 @@ public class DroolsBeanFactory {
 
     private  KieFileSystem getKieFileSystem() throws IOException{
         KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-        List<String> rules=Arrays.asList("SuggestApplicant.drl","Product_rules.xls");
+        List<String> rules=Arrays.asList("BackwardChaining.drl","SuggestApplicant.drl","Product_rules.xls");
         for(String rule:rules){
             kieFileSystem.write(ResourceFactory.newClassPathResource(rule));
         }
@@ -56,9 +55,11 @@ public class DroolsBeanFactory {
         getKieRepository();
         KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
 
+        kieFileSystem.write(ResourceFactory.newClassPathResource("com/baeldung/drools/rules/BackwardChaining.drl"));
         kieFileSystem.write(ResourceFactory.newClassPathResource("com/baeldung/drools/rules/SuggestApplicant.drl"));
         kieFileSystem.write(ResourceFactory.newClassPathResource("com/baeldung/drools/rules/Product_rules.xls"));
-
+        
+        
         KieBuilder kb = kieServices.newKieBuilder(kieFileSystem);
         kb.buildAll();
         KieModule kieModule = kb.getKieModule();
diff --git a/drools/backward-chaining/src/main/java/com/baeldung/drools/model/Fact.java b/drools/src/main/java/com/baeldung/drools/model/Fact.java
similarity index 100%
rename from drools/backward-chaining/src/main/java/com/baeldung/drools/model/Fact.java
rename to drools/src/main/java/com/baeldung/drools/model/Fact.java
diff --git a/drools/backward-chaining/src/main/java/com/baeldung/drools/model/Result.java b/drools/src/main/java/com/baeldung/drools/model/Result.java
similarity index 100%
rename from drools/backward-chaining/src/main/java/com/baeldung/drools/model/Result.java
rename to drools/src/main/java/com/baeldung/drools/model/Result.java
diff --git a/drools/backward-chaining/src/main/resources/com/baeldung/drools/backward_chaining/rules.drl b/drools/src/main/resources/com/baeldung/drools/rules/BackwardChaining.drl
similarity index 94%
rename from drools/backward-chaining/src/main/resources/com/baeldung/drools/backward_chaining/rules.drl
rename to drools/src/main/resources/com/baeldung/drools/rules/BackwardChaining.drl
index bb5a8299e1..975be84fb4 100644
--- a/drools/backward-chaining/src/main/resources/com/baeldung/drools/backward_chaining/rules.drl
+++ b/drools/src/main/resources/com/baeldung/drools/rules/BackwardChaining.drl
@@ -1,4 +1,4 @@
-package com.baeldung
+package com.baeldung.drools.rules
 
 import com.baeldung.drools.model.Fact;
 
diff --git a/drools/src/test/java/com/baeldung/drools/backward_chaining/BackwardChainingTest.java b/drools/src/test/java/com/baeldung/drools/backward_chaining/BackwardChainingTest.java
new file mode 100644
index 0000000000..f49d0b82de
--- /dev/null
+++ b/drools/src/test/java/com/baeldung/drools/backward_chaining/BackwardChainingTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.drools.backward_chaining;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.kie.api.runtime.KieSession;
+
+import com.baeldung.drools.config.DroolsBeanFactory;
+import com.baeldung.drools.model.Fact;
+import com.baeldung.drools.model.Result;
+
+import static junit.framework.TestCase.assertEquals;
+
+public class BackwardChainingTest {
+    private Result result;
+    private KieSession ksession;
+ 
+    @Before
+    public void before() {
+        result = new Result();
+        ksession = new DroolsBeanFactory().getKieSession();
+    }
+
+    @Test
+    public void whenWallOfChinaIsGiven_ThenItBelongsToPlanetEarth() {
+
+        ksession.setGlobal("result", result);
+        ksession.insert(new Fact("Asia", "Planet Earth"));
+        ksession.insert(new Fact("China", "Asia"));
+        ksession.insert(new Fact("Great Wall of China", "China"));
+
+        ksession.fireAllRules();
+        
+        // Assert Decision one
+        assertEquals(result.getValue(), "Decision one taken: Great Wall of China BELONGS TO Planet Earth");
+    }
+}

From b7b5543cf95028577f289ea40cc3d0144f1f86ad Mon Sep 17 00:00:00 2001
From: Ahmad Alsanie <ahmad.alsanie92@gmail.com>
Date: Mon, 13 Nov 2017 21:18:14 +0200
Subject: [PATCH 28/72] Different types of dependency injection

---
 .../baeldung/ditypes/RegisterarConfig.java    | 14 +++++++++
 .../java/com/baeldung/ditypes/Registrar.java  | 18 ++++++++++++
 .../main/java/com/baeldung/ditypes/User.java  | 20 +++++++++++++
 .../com/baeldung/ditypes/RegisterarTest.java  | 29 +++++++++++++++++++
 4 files changed, 81 insertions(+)
 create mode 100644 spring-core/src/main/java/com/baeldung/ditypes/RegisterarConfig.java
 create mode 100644 spring-core/src/main/java/com/baeldung/ditypes/Registrar.java
 create mode 100644 spring-core/src/main/java/com/baeldung/ditypes/User.java
 create mode 100644 spring-core/src/test/java/com/baeldung/ditypes/RegisterarTest.java

diff --git a/spring-core/src/main/java/com/baeldung/ditypes/RegisterarConfig.java b/spring-core/src/main/java/com/baeldung/ditypes/RegisterarConfig.java
new file mode 100644
index 0000000000..c1df1466f3
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/ditypes/RegisterarConfig.java
@@ -0,0 +1,14 @@
+package com.baeldung.ditypes;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan("com.baeldung.ditypes")
+public class RegisterarConfig {
+    @Bean
+    public User user() {
+        return new User("Alice", 1);
+    }
+}
diff --git a/spring-core/src/main/java/com/baeldung/ditypes/Registrar.java b/spring-core/src/main/java/com/baeldung/ditypes/Registrar.java
new file mode 100644
index 0000000000..4406151c1b
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/ditypes/Registrar.java
@@ -0,0 +1,18 @@
+package com.baeldung.ditypes;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Registrar {
+    private User user;
+
+    @Autowired
+    public Registrar(User user) {
+        this.user = user;
+    }
+
+    public String register() {
+        return user.register();
+    }
+}
diff --git a/spring-core/src/main/java/com/baeldung/ditypes/User.java b/spring-core/src/main/java/com/baeldung/ditypes/User.java
new file mode 100644
index 0000000000..b0120c7711
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/ditypes/User.java
@@ -0,0 +1,20 @@
+package com.baeldung.ditypes;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class User {
+
+    private String name;
+    private int id;
+
+    public User(String name, int id) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public String register() {
+        return "User" + id + ": " + name + " is registered";
+    }
+
+}
diff --git a/spring-core/src/test/java/com/baeldung/ditypes/RegisterarTest.java b/spring-core/src/test/java/com/baeldung/ditypes/RegisterarTest.java
new file mode 100644
index 0000000000..a0aea95a2b
--- /dev/null
+++ b/spring-core/src/test/java/com/baeldung/ditypes/RegisterarTest.java
@@ -0,0 +1,29 @@
+package com.baeldung.ditypes;
+
+import static 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;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = RegisterarConfig.class)
+public class RegisterarTest {
+
+    @Autowired
+    private Registrar reg;
+
+    @Autowired
+    private User user;
+
+    @Test
+    public void givenAutowiredAnnotation_whenSetOnField_thenRegistrarIsInjected() {
+        assertNotNull(reg);
+    }
+
+    @Test
+    public void givenAutowiredAnnotation_whenSetOnField_thenUserIsInjected() {
+        assertEquals("User1: Alice is registered", user.register());
+    }
+}

From c0f9c00a3b40648d72af62ee6ec878d3cae28346 Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <electricalweb@yahoo.com.ar>
Date: Tue, 14 Nov 2017 04:39:46 -0300
Subject: [PATCH 29/72] Implementing the Template Method Pattern with Java -
 BAEL-1289 (#3038)

* Initial Commit

* Update HighEndComputerBuilder.java

* Update HighEndComputerBuilder.java

* Update StandardComputerBuilder.java

* Update TemplateMethodPatternTest.java

* Update ComputerBuilder.java

* Delete HighEndComputer.java

* Delete StandardComputer.java
---
 .../templatemethodpattern/model/Computer.java | 28 +++----------------
 .../model/ComputerBuilder.java                |  6 ++--
 .../model/HighEndComputer.java                | 26 -----------------
 .../model/HighEndComputerBuilder.java         |  8 +++---
 .../model/StandardComputer.java               | 25 -----------------
 .../model/StandardComputerBuilder.java        |  6 ++--
 .../TemplateMethodPatternTest.java            |  5 ++--
 7 files changed, 16 insertions(+), 88 deletions(-)
 delete mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
 delete mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java

diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
index d422204b82..939071d843 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
@@ -2,36 +2,16 @@ package com.baeldung.templatemethodpattern.model;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.ArrayList;
-import java.util.List;
 
-public abstract class ComputerBuilder {
+public class Computer {
     
-    protected Map<String, String> computerParts = new HashMap<>();
-    protected List<String> moterboardSetupStatus = new ArrayList<>();
+    private Map<String, String> computerParts = new HashMap<>();
     
-    public final Computer buildComputer() {
-        addMotherboard();
-        setupMotherboard();
-        addProcessor();
-        return getComputer();
+    public Computer(Map<String, String> computerParts) {
+        this.computerParts = computerParts;
     }
     
-    public abstract void addMotherboard();
-    
-     public abstract void setupMotherboard();
-    
-    public abstract void addProcessor();
-    
-    public List<String> getMotherboardSetupStatus() {
-        return moterboardSetupStatus;
-    }
-        
     public Map<String, String> getComputerParts() {
         return computerParts;
     }
-     
-    private Computer getComputer() {
-        return new Computer(computerParts);
-    }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
index f264d33215..7526af4e52 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
@@ -8,7 +8,7 @@ import java.util.Map;
 public abstract class ComputerBuilder {
 
     protected Map<String, String> computerParts = new HashMap<>();
-    protected List<String> moterboardSetupStatus = new ArrayList<>();
+    protected List<String> motherboardSetupStatus = new ArrayList<>();
     
     public final Computer buildComputer() {
         addMotherboard();
@@ -24,9 +24,9 @@ public abstract class ComputerBuilder {
     public abstract void addProcessor();
 
     public List<String> getMotherboardSetupStatus() {
-        return moterboardSetupStatus;
+        return motherboardSetupStatus;
     }
-
+    
     public Map<String, String> getComputerParts() {
         return computerParts;
     }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
deleted file mode 100644
index 8d80e1e108..0000000000
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baeldung.templatemethodpattern.model;
-
-public class HighEndComputer extends Computer {
-
-    @Override
-    public void addMotherboard() {
-         computerParts.put("Motherboard", "High-end Motherboard");
-    }
-    
-    @Override
-    public void setupMotherboard() {
-        moterboardSetupStatus.add("Screwing the high-end motherboard to the case.");
-        moterboardSetupStatus.add("Pluging in the power supply connectors.");
-        moterboardSetupStatus.forEach(step -> System.out.println(step));
-    }
-    
-    @Override
-    public void addProcessor() {
-         computerParts.put("Processor", "High-end Processor");
-    }
-    
-    @Override
-    public void addMotherboard() {
-         computerParts.put("Motherboard", "High End Motherboard");
-    }
-}
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
index cf53a2ae6c..baa800ca8f 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
@@ -9,13 +9,13 @@ public class HighEndComputerBuilder extends ComputerBuilder {
     
     @Override
     public void setupMotherboard() {
-        moterboardSetupStatus.add("Screwing the high-end motherboard to the case.");
-        moterboardSetupStatus.add("Pluging in the power supply connectors.");
-        moterboardSetupStatus.forEach(step -> System.out.println(step));
+        motherboardSetupStatus.add("Screwing the high-end motherboard to the case.");
+        motherboardSetupStatus.add("Pluging in the power supply connectors.");
+        motherboardSetupStatus.forEach(step -> System.out.println(step));
     }
     
     @Override
     public void addProcessor() {
-         computerParts.put("Processor", "High-end Processor");
+        computerParts.put("Processor", "High-end Processor");
     }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java
deleted file mode 100644
index 8410ad88ee..0000000000
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.baeldung.templatemethodpattern.model;
- 
-public class StandardComputer extends Computer {
-    
-    public void addMotherboard() {
-        computerParts.put("Motherboard", "Standard Motherboard");
-    }
-    
-    @Override
-    public void setupMotherboard() {
-        moterboardSetupStatus.add("Screwing the standard motherboard to the case.");
-        moterboardSetupStatus.add("Pluging in the power supply connectors.");
-        moterboardSetupStatus.forEach(step -> System.out.println(step));
-    }
-    
-    @Override
-    public void addProcessor() {
-        computerParts.put("Processor", "Standard Processor");
-    }
-
-    @Override
-    public void addMotherboard() {
-        computerParts.put("Motherboard", "Standard Motherboard");
-    }
-}
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
index 1d9bd0e00f..78547dc38b 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
@@ -9,9 +9,9 @@ public class StandardComputerBuilder extends ComputerBuilder {
     
     @Override
     public void setupMotherboard() {
-        moterboardSetupStatus.add("Screwing the standard motherboard to the case.");
-        moterboardSetupStatus.add("Pluging in the power supply connectors.");
-        moterboardSetupStatus.forEach(step -> System.out.println(step));
+        motherboardSetupStatus.add("Screwing the standard motherboard to the case.");
+        motherboardSetupStatus.add("Pluging in the power supply connectors.");
+        motherboardSetupStatus.forEach(step -> System.out.println(step));
     }
     
     @Override
diff --git a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
index df5751fb03..6dc62facc6 100644
--- a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
+++ b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
@@ -29,8 +29,8 @@ public class TemplateMethodPatternTest {
 
     @Test
     public void givenStandardMotherBoard_whenAddingMotherBoard_thenEqualAssertion() {
-        standardComputer.addMotherboard();
-        assertEquals("Standard Motherboard", standardComputer.getComputerParts().get("Motherboard"));
+        standardComputerBuilder.addMotherboard();
+        assertEquals("Standard Motherboard", standardComputerBuilder.getComputerParts().get("Motherboard"));
     }
 
     @Test
@@ -81,7 +81,6 @@ public class TemplateMethodPatternTest {
         highEndComputerBuilder.buildComputer();
         assertEquals(2, highEndComputerBuilder.getComputerParts().size());
     }
-    
     @Test
     public void givenAllHighEndParts_whenComputerisBuilt_thenComputerInstance() {
         assertThat(standardComputerBuilder.buildComputer(), instanceOf(Computer.class));

From ebc5b52b3a59d55712cc79c47a2ee9f3b5df7daf Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Tue, 14 Nov 2017 08:52:11 +0100
Subject: [PATCH 30/72] Update README.MD (#3040)

---
 drools/README.MD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drools/README.MD b/drools/README.MD
index e3f00f5047..b2259e2878 100644
--- a/drools/README.MD
+++ b/drools/README.MD
@@ -1,4 +1,3 @@
 ### Relevant Articles:
 - [Introduction to Drools](http://www.baeldung.com/drools)
 - [Drools Using Rules from Excel Files](http://www.baeldung.com/drools-excel)
-- [Drools Using Rules from Excel Files](http://www.baeldung.com/drools-excel)

From 35d44cb6d72e1119ee168405d7d708605685f733 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Tue, 14 Nov 2017 11:37:36 +0200
Subject: [PATCH 31/72] Update README.md

---
 core-java/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core-java/README.md b/core-java/README.md
index b4b8d9062e..dcf77ff536 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -114,4 +114,5 @@
 - [StringBuilder and StringBuffer in Java](http://www.baeldung.com/java-string-builder-string-buffer)
 - [Number of Digits in an Integer in Java](http://www.baeldung.com/java-number-of-digits-in-int)
 - [Proxy, Decorator, Adapter and Bridge Patterns](http://www.baeldung.com/java-structural-design-patterns)
+- [Creating a Java Compiler Plugin](http://www.baeldung.com/java-build-compiler-plugin)
 

From d6096fc58bde01cce6d008aa36af035abde23558 Mon Sep 17 00:00:00 2001
From: bahti <bahti@users.noreply.github.com>
Date: Tue, 14 Nov 2017 14:17:57 +0200
Subject: [PATCH 32/72] BAEL 1185 Lazy Verification with Mockito 2 mini-article
 accompanying code (#2985)

* BAEL-1185 Add Mockito2 lazy verification test

* Test multiple exceptions with lazy verification

* move mockito2 lazyVerificationTest to testing-modules

* update test method name in lazyverificationtest
---
 .../mockito/java8/LazyVerificationTest.java   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/LazyVerificationTest.java

diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/LazyVerificationTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/LazyVerificationTest.java
new file mode 100644
index 0000000000..43b39d6859
--- /dev/null
+++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/LazyVerificationTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.mockito.java8;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.mockito.exceptions.base.MockitoAssertionError;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.VerificationCollector;
+
+public class LazyVerificationTest {
+
+    @Test
+    public void whenLazilyVerified_thenReportsMultipleFailures() {
+        VerificationCollector collector = MockitoJUnit.collector()
+            .assertLazily();
+
+        List mockList = mock(List.class);
+        verify(mockList).add("one");
+        verify(mockList).clear();
+
+        try {
+            collector.collectAndReport();
+        } catch (MockitoAssertionError error) {
+            assertTrue(error.getMessage()
+                .contains("1. Wanted but not invoked:"));
+            assertTrue(error.getMessage()
+                .contains("2. Wanted but not invoked:"));
+        }
+    }
+}

From 62e5e2f75d0a3085b32cf5910d9177a8e37114d6 Mon Sep 17 00:00:00 2001
From: Doha2012 <dohae243@gmail.com>
Date: Tue, 14 Nov 2017 14:47:48 +0200
Subject: [PATCH 33/72] add readme to grouping modules (#3039)

* move security content from spring-security-rest-full

* swagger update

* move query language to new module

* rename spring-security-rest-full to spring-rest-full

* group persistence modules

* group testing modules

* try fix conflict

* cleanup

* group and cleanup

* add readme to grouping modules
---
 guava-modules/README.md       | 3 +++
 logging-modules/README.md     | 3 +++
 persistence-modules/README.md | 3 +++
 testing-modules/README.md     | 3 +++
 4 files changed, 12 insertions(+)
 create mode 100644 guava-modules/README.md
 create mode 100644 logging-modules/README.md
 create mode 100644 persistence-modules/README.md
 create mode 100644 testing-modules/README.md

diff --git a/guava-modules/README.md b/guava-modules/README.md
new file mode 100644
index 0000000000..79e45a89e7
--- /dev/null
+++ b/guava-modules/README.md
@@ -0,0 +1,3 @@
+
+## Guava Modules
+
diff --git a/logging-modules/README.md b/logging-modules/README.md
new file mode 100644
index 0000000000..23458cf30b
--- /dev/null
+++ b/logging-modules/README.md
@@ -0,0 +1,3 @@
+
+## Logging Modules
+
diff --git a/persistence-modules/README.md b/persistence-modules/README.md
new file mode 100644
index 0000000000..6c2b1d2ca9
--- /dev/null
+++ b/persistence-modules/README.md
@@ -0,0 +1,3 @@
+
+## Persistence Modules
+
diff --git a/testing-modules/README.md b/testing-modules/README.md
new file mode 100644
index 0000000000..3fbeea6188
--- /dev/null
+++ b/testing-modules/README.md
@@ -0,0 +1,3 @@
+
+## Testing Modules
+

From d64b61548e57ae0a73f8d96aab02139f9aff865a Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Tue, 14 Nov 2017 13:58:56 +0100
Subject: [PATCH 34/72] Update pom.xml (#3041)

---
 drools/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drools/pom.xml b/drools/pom.xml
index 971bd5f4b8..17b1e1129d 100644
--- a/drools/pom.xml
+++ b/drools/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<http-component-version>4.4.6</http-component-version>
-		<drools-version>7.1.0.Beta2</drools-version>
+		<drools-version>7.4.1.Final</drools-version>
 		<apache-poi-version>3.13</apache-poi-version>
 	</properties>
 
@@ -65,4 +65,4 @@
 
 	</dependencies>
 
-</project>
\ No newline at end of file
+</project>

From 1c543f8f866ec64ab6f32d85b12f260d250f3756 Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <asturcon1234@gmail.com>
Date: Tue, 14 Nov 2017 18:14:01 +0100
Subject: [PATCH 35/72] BAEL-1233 - Enabled Annotation in Spring 5 Testing
 (#3031)

* tests with enabled annotations

* rollback pom

* formatting
---
 .../com/baeldung/jupiter/EnabledOnJava8.java  | 18 +++++++
 .../jupiter/Spring5EnabledAnnotationTest.java | 50 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java
 create mode 100644 spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationTest.java

diff --git a/spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java b/spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java
new file mode 100644
index 0000000000..c6d3b7ff10
--- /dev/null
+++ b/spring-5/src/test/java/com/baeldung/jupiter/EnabledOnJava8.java
@@ -0,0 +1,18 @@
+package com.baeldung.jupiter;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.test.context.junit.jupiter.EnabledIf;
+
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@EnabledIf(
+    expression = "#{systemProperties['java.version'].startsWith('1.8')}",
+    reason = "Enabled on Java 8"
+)
+public @interface EnabledOnJava8 {
+
+}
diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationTest.java
new file mode 100644
index 0000000000..ae058bc8ba
--- /dev/null
+++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5EnabledAnnotationTest.java
@@ -0,0 +1,50 @@
+package com.baeldung.jupiter;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.DisabledIf;
+import org.springframework.test.context.junit.jupiter.EnabledIf;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+@SpringJUnitConfig(Spring5EnabledAnnotationTest.Config.class)
+@TestPropertySource(properties = { "tests.enabled=true" })
+public class Spring5EnabledAnnotationTest {
+    
+    @Configuration
+    static class Config {
+    }
+
+    @EnabledIf("true")
+    @Test
+    void givenEnabledIfLiteral_WhenTrue_ThenTestExecuted() {
+        assertTrue(true);
+    }
+
+    @EnabledIf(expression = "${tests.enabled}", loadContext = true)
+    @Test
+    void givenEnabledIfExpression_WhenTrue_ThenTestExecuted() {
+        assertTrue(true);
+    }
+
+    @EnabledIf("#{systemProperties['java.version'].startsWith('1.8')}")
+    @Test
+    void givenEnabledIfSpel_WhenTrue_ThenTestExecuted() {
+        assertTrue(true);
+    }
+
+    @EnabledOnJava8
+    @Test
+    void givenEnabledOnJava8_WhenTrue_ThenTestExecuted() {
+        assertTrue(true);
+    }
+
+    @DisabledIf("#{systemProperties['java.version'].startsWith('1.7')}")
+    @Test
+    void givenDisabledIf_WhenTrue_ThenTestNotExecuted() {
+        assertTrue(true);
+    }
+
+}

From 95868bf28ec649f88ae0b69bfa63a6badb49af68 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Wed, 15 Nov 2017 07:24:54 +0100
Subject: [PATCH 36/72] Update README.md (#3015)

---
 testing-modules/mocks/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing-modules/mocks/README.md b/testing-modules/mocks/README.md
index 15370b812b..d7b817c518 100644
--- a/testing-modules/mocks/README.md
+++ b/testing-modules/mocks/README.md
@@ -1,6 +1,5 @@
 ## Relevant articles:
 
-- [Introduction to MockServer](http://www.baeldung.com/mockserver)
 - [JMockit Advanced Usage](http://www.baeldung.com/jmockit-advanced-usage)
 - [A Guide to JMockit Expectations](http://www.baeldung.com/jmockit-expectations)
 - [JMockit 101](http://www.baeldung.com/jmockit-101)

From 499f57cad423581c977b3eee27cf2c5841a15123 Mon Sep 17 00:00:00 2001
From: Dassi orleando <me@dassiorleando.xyz>
Date: Wed, 15 Nov 2017 07:31:59 +0100
Subject: [PATCH 37/72] BAEL-1190: JUnit 5 upgrade (#3048)

* Different types of bean injection in Spring

* Difference between two dates in java

* Update README.md

* Simple clean of difference between dates

* Clean my test article

* Improve dates diff: for dates and datetimes

* Move difference between dates from core-java to libraries

* BAEL-890 - Kotlin-Allopen with Spring example

* BAEL-1107 - Introduction to Apache Cayenne Orm

* BAEL-1107: update formating and version of libs

* BAEL-1107: update properties of Author

* BAEL-1157: Apache Cayenne - Advanced Querying

* BAEL-1157: Fix imports

* BAEL-1157: code indentation

* BAEL-1157: Update list of author names

* BAEL-132: Configure Jenkins to Run and Show Jmeter Tests

* Removed submodule spring-jmeter-jenkins

* Commit again spring-jmeter-jenkins

* BAEL-1190: JUnit 5 upgrade
---
 testing-modules/junit-5/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml
index 229703ccf5..2be8937d04 100644
--- a/testing-modules/junit-5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -20,7 +20,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <junit.jupiter.version>5.0.1</junit.jupiter.version>
+        <junit.jupiter.version>5.0.2</junit.jupiter.version>
         <junit.platform.version>1.0.1</junit.platform.version>
         <junit.vintage.version>4.12.1</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
@@ -127,4 +127,4 @@
         
     </dependencies>
   
-</project>
\ No newline at end of file
+</project>

From af50b1e59cbb15e0bcedf15375879b42132aced3 Mon Sep 17 00:00:00 2001
From: Andrew <andrewtobilko@users.noreply.github.com>
Date: Wed, 15 Nov 2017 09:26:24 +0200
Subject: [PATCH 38/72] Updated a link to the article (#3047)

* code snippets for the `Java 9 Stream API improvements` article

* code snippets for the `Java 9 Stream API improvements` article [2 attempt]

* removed the first attempt

* the Spring 5 WebClient

* delted stream features test

* HttpMediaTypeNotAcceptableExceptionExampleController [0]

* reactive web client service was removed

* new WebClient

* new WebClient [2]

* spring-rest-shell init

* pom added

* readme added

* updated a link to the article
---
 spring-rest-shell/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-rest-shell/README.md b/spring-rest-shell/README.md
index 06e18450c6..901d9a51ee 100644
--- a/spring-rest-shell/README.md
+++ b/spring-rest-shell/README.md
@@ -2,4 +2,4 @@
 
 ### Relevant Articles
 
-- [Spring REST Shell](http://www.baeldung.com/<ARTICLE_URI>)
\ No newline at end of file
+- [Spring REST Shell](http://www.baeldung.com/spring-rest-shell)
\ No newline at end of file

From 9685875496aaab220d3d7316ca5da176cd8c3876 Mon Sep 17 00:00:00 2001
From: adamd1985 <adamdarmanin@gmail.com>
Date: Wed, 15 Nov 2017 17:28:49 +0100
Subject: [PATCH 39/72] Revert "Implementing the Template Method Pattern with
 Java - BAEL-1289 (#3038)" (#3042)

This reverts commit c0f9c00a3b40648d72af62ee6ec878d3cae28346.
---
 .../templatemethodpattern/model/Computer.java | 28 ++++++++++++++++---
 .../model/ComputerBuilder.java                |  6 ++--
 .../model/HighEndComputer.java                | 26 +++++++++++++++++
 .../model/HighEndComputerBuilder.java         |  8 +++---
 .../model/StandardComputer.java               | 25 +++++++++++++++++
 .../model/StandardComputerBuilder.java        |  6 ++--
 .../TemplateMethodPatternTest.java            |  5 ++--
 7 files changed, 88 insertions(+), 16 deletions(-)
 create mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
 create mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java

diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
index 939071d843..d422204b82 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
@@ -2,16 +2,36 @@ package com.baeldung.templatemethodpattern.model;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 
-public class Computer {
+public abstract class ComputerBuilder {
     
-    private Map<String, String> computerParts = new HashMap<>();
+    protected Map<String, String> computerParts = new HashMap<>();
+    protected List<String> moterboardSetupStatus = new ArrayList<>();
     
-    public Computer(Map<String, String> computerParts) {
-        this.computerParts = computerParts;
+    public final Computer buildComputer() {
+        addMotherboard();
+        setupMotherboard();
+        addProcessor();
+        return getComputer();
     }
     
+    public abstract void addMotherboard();
+    
+     public abstract void setupMotherboard();
+    
+    public abstract void addProcessor();
+    
+    public List<String> getMotherboardSetupStatus() {
+        return moterboardSetupStatus;
+    }
+        
     public Map<String, String> getComputerParts() {
         return computerParts;
     }
+     
+    private Computer getComputer() {
+        return new Computer(computerParts);
+    }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
index 7526af4e52..f264d33215 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
@@ -8,7 +8,7 @@ import java.util.Map;
 public abstract class ComputerBuilder {
 
     protected Map<String, String> computerParts = new HashMap<>();
-    protected List<String> motherboardSetupStatus = new ArrayList<>();
+    protected List<String> moterboardSetupStatus = new ArrayList<>();
     
     public final Computer buildComputer() {
         addMotherboard();
@@ -24,9 +24,9 @@ public abstract class ComputerBuilder {
     public abstract void addProcessor();
 
     public List<String> getMotherboardSetupStatus() {
-        return motherboardSetupStatus;
+        return moterboardSetupStatus;
     }
-    
+
     public Map<String, String> getComputerParts() {
         return computerParts;
     }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
new file mode 100644
index 0000000000..8d80e1e108
--- /dev/null
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
@@ -0,0 +1,26 @@
+package com.baeldung.templatemethodpattern.model;
+
+public class HighEndComputer extends Computer {
+
+    @Override
+    public void addMotherboard() {
+         computerParts.put("Motherboard", "High-end Motherboard");
+    }
+    
+    @Override
+    public void setupMotherboard() {
+        moterboardSetupStatus.add("Screwing the high-end motherboard to the case.");
+        moterboardSetupStatus.add("Pluging in the power supply connectors.");
+        moterboardSetupStatus.forEach(step -> System.out.println(step));
+    }
+    
+    @Override
+    public void addProcessor() {
+         computerParts.put("Processor", "High-end Processor");
+    }
+    
+    @Override
+    public void addMotherboard() {
+         computerParts.put("Motherboard", "High End Motherboard");
+    }
+}
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
index baa800ca8f..cf53a2ae6c 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
@@ -9,13 +9,13 @@ public class HighEndComputerBuilder extends ComputerBuilder {
     
     @Override
     public void setupMotherboard() {
-        motherboardSetupStatus.add("Screwing the high-end motherboard to the case.");
-        motherboardSetupStatus.add("Pluging in the power supply connectors.");
-        motherboardSetupStatus.forEach(step -> System.out.println(step));
+        moterboardSetupStatus.add("Screwing the high-end motherboard to the case.");
+        moterboardSetupStatus.add("Pluging in the power supply connectors.");
+        moterboardSetupStatus.forEach(step -> System.out.println(step));
     }
     
     @Override
     public void addProcessor() {
-        computerParts.put("Processor", "High-end Processor");
+         computerParts.put("Processor", "High-end Processor");
     }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java
new file mode 100644
index 0000000000..8410ad88ee
--- /dev/null
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java
@@ -0,0 +1,25 @@
+package com.baeldung.templatemethodpattern.model;
+ 
+public class StandardComputer extends Computer {
+    
+    public void addMotherboard() {
+        computerParts.put("Motherboard", "Standard Motherboard");
+    }
+    
+    @Override
+    public void setupMotherboard() {
+        moterboardSetupStatus.add("Screwing the standard motherboard to the case.");
+        moterboardSetupStatus.add("Pluging in the power supply connectors.");
+        moterboardSetupStatus.forEach(step -> System.out.println(step));
+    }
+    
+    @Override
+    public void addProcessor() {
+        computerParts.put("Processor", "Standard Processor");
+    }
+
+    @Override
+    public void addMotherboard() {
+        computerParts.put("Motherboard", "Standard Motherboard");
+    }
+}
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
index 78547dc38b..1d9bd0e00f 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
@@ -9,9 +9,9 @@ public class StandardComputerBuilder extends ComputerBuilder {
     
     @Override
     public void setupMotherboard() {
-        motherboardSetupStatus.add("Screwing the standard motherboard to the case.");
-        motherboardSetupStatus.add("Pluging in the power supply connectors.");
-        motherboardSetupStatus.forEach(step -> System.out.println(step));
+        moterboardSetupStatus.add("Screwing the standard motherboard to the case.");
+        moterboardSetupStatus.add("Pluging in the power supply connectors.");
+        moterboardSetupStatus.forEach(step -> System.out.println(step));
     }
     
     @Override
diff --git a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
index 6dc62facc6..df5751fb03 100644
--- a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
+++ b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
@@ -29,8 +29,8 @@ public class TemplateMethodPatternTest {
 
     @Test
     public void givenStandardMotherBoard_whenAddingMotherBoard_thenEqualAssertion() {
-        standardComputerBuilder.addMotherboard();
-        assertEquals("Standard Motherboard", standardComputerBuilder.getComputerParts().get("Motherboard"));
+        standardComputer.addMotherboard();
+        assertEquals("Standard Motherboard", standardComputer.getComputerParts().get("Motherboard"));
     }
 
     @Test
@@ -81,6 +81,7 @@ public class TemplateMethodPatternTest {
         highEndComputerBuilder.buildComputer();
         assertEquals(2, highEndComputerBuilder.getComputerParts().size());
     }
+    
     @Test
     public void givenAllHighEndParts_whenComputerisBuilt_thenComputerInstance() {
         assertThat(standardComputerBuilder.buildComputer(), instanceOf(Computer.class));

From 8957b9414c59f7d9f5451cac3a4e8b665f666e50 Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <electricalweb@yahoo.com.ar>
Date: Wed, 15 Nov 2017 13:43:57 -0300
Subject: [PATCH 40/72] Initial Commit (#3045)

---
 .../baeldung/templatemethodpattern/model/ComputerBuilder.java | 4 ++--
 .../templatemethodpatterntest/TemplateMethodPatternTest.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
index f264d33215..9d8eae7f80 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
@@ -20,9 +20,9 @@ public abstract class ComputerBuilder {
     public abstract void addMotherboard();
 
     public abstract void setupMotherboard();
-
+    
     public abstract void addProcessor();
-
+    
     public List<String> getMotherboardSetupStatus() {
         return moterboardSetupStatus;
     }
diff --git a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
index df5751fb03..39888d5ad5 100644
--- a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
+++ b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
@@ -77,7 +77,7 @@ public class TemplateMethodPatternTest {
     }
     
     @Test
-    public void givenAllHighEnddParts_whenBuildingComputer_thenTwoParts() {
+    public void givenAllHighEndParts_whenBuildingComputer_thenTwoParts() {
         highEndComputerBuilder.buildComputer();
         assertEquals(2, highEndComputerBuilder.getComputerParts().size());
     }

From d54917c7e9f0f74c40982571af8ac9f61782b7cb Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Wed, 15 Nov 2017 17:57:10 +0100
Subject: [PATCH 41/72] Spring cloud samples (#3010)

* Matchers is now deprecated in Mockito 2, it's now replaced by ArgumentMatchers

* BAEL-1069: Guide to diamond operator in Java

* Changes after review

* BAEL-719: Intro to Spring Cloud Stream

* Pull request changes done

* Renamed unit tests

* Add spring-cloud-stream

* Add module

* Exclude integration tests from spring-cloud
---
 drools/pom.xml                                | 125 ++++++++++--------
 spring-cloud/pom.xml                          |  10 +-
 spring-cloud/spring-cloud-stream/pom.xml      |  71 ++++++++++
 .../spring-cloud-stream-rabbit/pom.xml        |  32 +++++
 .../MultipleOutputsServiceApplication.java    |  38 ++++++
 ...tputsWithConditionsServiceApplication.java |  39 ++++++
 .../rabbit/MyLoggerServiceApplication.java    |  32 +++++
 .../messages/TextPlainMessageConverter.java   |  26 ++++
 .../cloud/stream/rabbit/model/LogMessage.java |  32 +++++
 .../stream/rabbit/processor/MyProcessor.java  |  19 +++
 .../src/main/resources/application.yml        |  28 ++++
 ...putsServiceApplicationIntegrationTest.java |  52 ++++++++
 ...sWithConditionsServiceIntegrationTest.java |  52 ++++++++
 .../MyLoggerApplicationIntegrationTest.java   |  40 ++++++
 14 files changed, 539 insertions(+), 57 deletions(-)
 create mode 100644 spring-cloud/spring-cloud-stream/pom.xml
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java
 create mode 100644 spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java

diff --git a/drools/pom.xml b/drools/pom.xml
index 17b1e1129d..5f228802fa 100644
--- a/drools/pom.xml
+++ b/drools/pom.xml
@@ -1,68 +1,87 @@
 <?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>drools</artifactId>
-	
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-modules</artifactId>
-		<version>1.0.0-SNAPSHOT</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>drools</artifactId>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
 	<properties>
 		<http-component-version>4.4.6</http-component-version>
 		<drools-version>7.4.1.Final</drools-version>
 		<apache-poi-version>3.13</apache-poi-version>
 	</properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-			<version>${http-component-version}</version>
-		</dependency>
-		<!-- ... -->
-		<dependency>
-			<groupId>org.kie</groupId>
-			<artifactId>kie-ci</artifactId>
-			<version>${drools-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.drools</groupId>
-			<artifactId>drools-decisiontables</artifactId>
-			<version>${drools-version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>${http-component-version}</version>
+        </dependency>
+        <!-- ... -->
+        <dependency>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-ci</artifactId>
+            <version>${drools-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-decisiontables</artifactId>
+            <version>${drools-version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>org.drools</groupId>
-			<artifactId>drools-core</artifactId>
-			<version>${drools-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.drools</groupId>
-			<artifactId>drools-compiler</artifactId>
-			<version>${drools-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi</artifactId>
-			<version>${apache-poi-version}</version>
-		</dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-core</artifactId>
+            <version>${drools-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-compiler</artifactId>
+            <version>${drools-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${apache-poi-version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi-ooxml</artifactId>
-			<version>${apache-poi-version}</version>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${apache-poi-version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>4.3.6.RELEASE</version>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>4.3.6.RELEASE</version>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
+
+    <build>
+        <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>**/*LongRunningUnitTest.java</exclude>
+                        <exclude>**/*ManualTest.java</exclude>
+                        <exclude>**/JdbcTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 93bf6ea74b..fd023a5ea5 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -1,7 +1,7 @@
 <?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">
+         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.spring.cloud</groupId>
@@ -15,8 +15,9 @@
         <module>spring-cloud-ribbon-client</module>
         <module>spring-cloud-rest</module>
         <module>spring-cloud-zookeeper</module>
-		<module>spring-cloud-gateway</module>
-		<module>spring-cloud-connectors-heroku</module>
+        <module>spring-cloud-gateway</module>
+        <module>spring-cloud-stream</module>
+        <module>spring-cloud-connectors-heroku</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -38,6 +39,7 @@
         <spring-cloud-starter-eureka.version>1.2.3.RELEASE</spring-cloud-starter-eureka.version>
         <spring-cloud-starter-feign.version>1.2.3.RELEASE</spring-cloud-starter-feign.version>
         <spring-cloud-starter-hystrix.version>1.2.3.RELEASE</spring-cloud-starter-hystrix.version>
+        <spring-cloud-stream.version>1.3.0.RELEASE</spring-cloud-stream.version>
         <spring-boot-starter-web.version>1.4.2.RELEASE</spring-boot-starter-web.version>
         <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
         <spring-boot-maven-plugin.version>1.4.2.RELEASE</spring-boot-maven-plugin.version>
diff --git a/spring-cloud/spring-cloud-stream/pom.xml b/spring-cloud/spring-cloud-stream/pom.xml
new file mode 100644
index 0000000000..5ec24268d9
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/pom.xml
@@ -0,0 +1,71 @@
+<?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>org.baeldung</groupId>
+    <artifactId>spring-cloud-stream</artifactId>
+    <packaging>pom</packaging>
+
+    <name>spring-cloud-stream</name>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>spring-cloud-stream-rabbit</module>
+    </modules>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+                <version>${spring-cloud-stream.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-stream</artifactId>
+                <version>${spring-cloud-stream.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-stream-test-support</artifactId>
+                <version>${spring-cloud-stream.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring-boot-maven-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml
new file mode 100644
index 0000000000..a954a7035e
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml
@@ -0,0 +1,32 @@
+<?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-stream-rabbit</artifactId>
+    <packaging>jar</packaging>
+
+    <name>spring-cloud-stream-rabbit</name>
+    <description>Simple Spring Cloud Stream</description>
+
+    <parent>
+        <groupId>org.baeldung</groupId>
+        <artifactId>spring-cloud-stream</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-test-support</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java
new file mode 100644
index 0000000000..375494dfac
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java
@@ -0,0 +1,38 @@
+package com.baeldung.spring.cloud.stream.rabbit;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.cloud.stream.annotation.StreamListener;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.support.MessageBuilder;
+
+import com.baeldung.spring.cloud.stream.rabbit.processor.MyProcessor;
+
+@SpringBootApplication
+@EnableBinding(MyProcessor.class)
+public class MultipleOutputsServiceApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(MultipleOutputsServiceApplication.class, args);
+    }
+
+    @Autowired
+    private MyProcessor processor;
+
+    @StreamListener(MyProcessor.INPUT)
+    public void routeValues(Integer val) {
+        if (val < 10) {
+            processor.anOutput()
+                .send(message(val));
+        } else {
+            processor.anotherOutput()
+                .send(message(val));
+        }
+    }
+
+    private static final <T> Message<T> message(T val) {
+        return MessageBuilder.withPayload(val)
+            .build();
+    }
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java
new file mode 100644
index 0000000000..4729e418b6
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java
@@ -0,0 +1,39 @@
+package com.baeldung.spring.cloud.stream.rabbit;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.cloud.stream.annotation.StreamListener;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.support.MessageBuilder;
+
+import com.baeldung.spring.cloud.stream.rabbit.processor.MyProcessor;
+
+@SpringBootApplication
+@EnableBinding(MyProcessor.class)
+public class MultipleOutputsWithConditionsServiceApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(MultipleOutputsWithConditionsServiceApplication.class, args);
+    }
+
+    @Autowired
+    private MyProcessor processor;
+
+    @StreamListener(target = MyProcessor.INPUT, condition = "payload < 10")
+    public void routeValuesToAnOutput(Integer val) {
+        processor.anOutput()
+            .send(message(val));
+    }
+
+    @StreamListener(target = MyProcessor.INPUT, condition = "payload >= 10")
+    public void routeValuesToAnotherOutput(Integer val) {
+        processor.anotherOutput()
+            .send(message(val));
+    }
+
+    private static final <T> Message<T> message(T val) {
+        return MessageBuilder.withPayload(val)
+            .build();
+    }
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java
new file mode 100644
index 0000000000..aac551e544
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java
@@ -0,0 +1,32 @@
+package com.baeldung.spring.cloud.stream.rabbit;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.cloud.stream.annotation.StreamListener;
+import org.springframework.cloud.stream.messaging.Processor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.messaging.converter.MessageConverter;
+import org.springframework.messaging.handler.annotation.SendTo;
+
+import com.baeldung.spring.cloud.stream.rabbit.messages.TextPlainMessageConverter;
+import com.baeldung.spring.cloud.stream.rabbit.model.LogMessage;
+
+@SpringBootApplication
+@EnableBinding(Processor.class)
+public class MyLoggerServiceApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(MyLoggerServiceApplication.class, args);
+    }
+
+    @Bean
+    public MessageConverter providesTextPlainMessageConverter() {
+        return new TextPlainMessageConverter();
+    }
+
+    @StreamListener(Processor.INPUT)
+    @SendTo(Processor.OUTPUT)
+    public LogMessage enrichLogMessage(LogMessage log) {
+        return new LogMessage(String.format("[1]: %s", log.getMessage()));
+    }
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java
new file mode 100644
index 0000000000..d690ee38a9
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java
@@ -0,0 +1,26 @@
+package com.baeldung.spring.cloud.stream.rabbit.messages;
+
+import org.springframework.messaging.Message;
+import org.springframework.messaging.converter.AbstractMessageConverter;
+import org.springframework.util.MimeType;
+
+import com.baeldung.spring.cloud.stream.rabbit.model.LogMessage;
+
+public class TextPlainMessageConverter extends AbstractMessageConverter {
+
+    public TextPlainMessageConverter() {
+        super(new MimeType("text", "plain"));
+    }
+
+    @Override
+    protected boolean supports(Class<?> clazz) {
+        return (LogMessage.class == clazz);
+    }
+
+    @Override
+    protected Object convertFromInternal(Message<?> message, Class<?> targetClass, Object conversionHint) {
+        Object payload = message.getPayload();
+        String text = payload instanceof String ? (String) payload : new String((byte[]) payload);
+        return new LogMessage(text);
+    }
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java
new file mode 100644
index 0000000000..44a6ca4d4e
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java
@@ -0,0 +1,32 @@
+package com.baeldung.spring.cloud.stream.rabbit.model;
+
+import java.io.Serializable;
+
+public class LogMessage implements Serializable {
+
+    private static final long serialVersionUID = -5857383701708275796L;
+
+    private String message;
+
+    public LogMessage() {
+
+    }
+
+    public LogMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public String toString() {
+        return message;
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java
new file mode 100644
index 0000000000..563ce06b6f
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java
@@ -0,0 +1,19 @@
+package com.baeldung.spring.cloud.stream.rabbit.processor;
+
+import org.springframework.cloud.stream.annotation.Input;
+import org.springframework.cloud.stream.annotation.Output;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.SubscribableChannel;
+
+public interface MyProcessor {
+    String INPUT = "myInput";
+
+    @Input
+    SubscribableChannel myInput();
+
+    @Output("myOutput")
+    MessageChannel anOutput();
+
+    @Output
+    MessageChannel anotherOutput();
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml
new file mode 100644
index 0000000000..3d9d97a736
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml
@@ -0,0 +1,28 @@
+spring:
+  cloud:
+    stream:
+      bindings:
+        input:
+          destination: queue.log.messages
+          binder: local_rabbit
+          group: logMessageConsumers
+        output:
+          destination: queue.pretty.log.messages
+          binder: local_rabbit
+      binders:
+        local_rabbit:
+          type: rabbit
+          environment:
+            spring:
+              rabbitmq:
+                host: localhost
+                port: 5672
+                username: guest
+                password: guest
+                virtual-host: /
+server:
+  port: 0
+management:
+  health:
+    binders:
+       enabled: true
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java
new file mode 100644
index 0000000000..898d06897f
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.spring.cloud.stream.rabbit;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.stream.test.binder.MessageCollector;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.cloud.stream.rabbit.processor.MyProcessor;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = MultipleOutputsServiceApplication.class)
+@DirtiesContext
+public class MultipleOutputsServiceApplicationIntegrationTest {
+
+    @Autowired
+    private MyProcessor pipe;
+
+    @Autowired
+    private MessageCollector messageCollector;
+
+    @Test
+    public void whenSendMessage_thenResponseIsInAOutput() {
+        whenSendMessage(1);
+        thenPayloadInChannelIs(pipe.anOutput(), 1);
+    }
+
+    @Test
+    public void whenSendMessage_thenResponseIsInAnotherOutput() {
+        whenSendMessage(11);
+        thenPayloadInChannelIs(pipe.anotherOutput(), 11);
+    }
+
+    private void whenSendMessage(Integer val) {
+        pipe.myInput()
+            .send(MessageBuilder.withPayload(val)
+                .build());
+    }
+
+    private void thenPayloadInChannelIs(MessageChannel channel, Integer expectedValue) {
+        Object payload = messageCollector.forChannel(channel)
+            .poll()
+            .getPayload();
+        assertEquals(expectedValue, payload);
+    }
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java
new file mode 100644
index 0000000000..c3bf5a1205
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.spring.cloud.stream.rabbit;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.stream.test.binder.MessageCollector;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.cloud.stream.rabbit.processor.MyProcessor;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = MultipleOutputsWithConditionsServiceApplication.class)
+@DirtiesContext
+public class MultipleOutputsWithConditionsServiceIntegrationTest {
+
+    @Autowired
+    private MyProcessor pipe;
+
+    @Autowired
+    private MessageCollector messageCollector;
+
+    @Test
+    public void whenSendMessage_thenResponseIsInAOutput() {
+        whenSendMessage(1);
+        thenPayloadInChannelIs(pipe.anOutput(), 1);
+    }
+
+    @Test
+    public void whenSendMessage_thenResponseIsInAnotherOutput() {
+        whenSendMessage(11);
+        thenPayloadInChannelIs(pipe.anotherOutput(), 11);
+    }
+
+    private void whenSendMessage(Integer val) {
+        pipe.myInput()
+            .send(MessageBuilder.withPayload(val)
+                .build());
+    }
+
+    private void thenPayloadInChannelIs(MessageChannel channel, Integer expectedValue) {
+        Object payload = messageCollector.forChannel(channel)
+            .poll()
+            .getPayload();
+        assertEquals(expectedValue, payload);
+    }
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java
new file mode 100644
index 0000000000..21d84e79e0
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.spring.cloud.stream.rabbit;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.stream.messaging.Processor;
+import org.springframework.cloud.stream.test.binder.MessageCollector;
+import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.cloud.stream.rabbit.model.LogMessage;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = MyLoggerServiceApplication.class)
+@DirtiesContext
+public class MyLoggerApplicationIntegrationTest {
+
+    @Autowired
+    private Processor pipe;
+
+    @Autowired
+    private MessageCollector messageCollector;
+
+    @Test
+    public void whenSendMessage_thenResponseShouldUpdateText() {
+        pipe.input()
+            .send(MessageBuilder.withPayload(new LogMessage("This is my message"))
+                .build());
+
+        Object payload = messageCollector.forChannel(pipe.output())
+            .poll()
+            .getPayload();
+
+        assertEquals("[1]: This is my message", payload.toString());
+    }
+}

From 656e89f0893a150d1ff9e88d856f4a511b404976 Mon Sep 17 00:00:00 2001
From: KevinGilmore <kpg102@gmail.com>
Date: Thu, 16 Nov 2017 06:02:47 -0600
Subject: [PATCH 42/72] 1098 README update (#3058)

* BAEL-973: updated README

* BAEL-1069: Updated README

* BAEL-817: add README file

* BAEL-1084: README update

* BAEL-960: Update README

* BAEL-1155: updated README

* BAEL-1041: updated README

* BAEL-973: Updated README

* BAEL-1187: updated README

* BAEL-1183: Update README

* BAEL-1133: Updated README

* BAEL-1098: README update
---
 testing-modules/rest-testing/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing-modules/rest-testing/README.md b/testing-modules/rest-testing/README.md
index 37a53dd815..c6185de05f 100644
--- a/testing-modules/rest-testing/README.md
+++ b/testing-modules/rest-testing/README.md
@@ -10,3 +10,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Introduction to WireMock](http://www.baeldung.com/introduction-to-wiremock)
 - [REST API Testing with Cucumber](http://www.baeldung.com/cucumber-rest-api-testing)
 - [Testing a REST API with JBehave](http://www.baeldung.com/jbehave-rest-testing)
+- [REST API Testing with Karate](http://www.baeldung.com/karate-rest-api-testing)

From bdbee879af049ea73b38c70e66bbb64b662fea9b Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <electricalweb@yahoo.com.ar>
Date: Thu, 16 Nov 2017 17:28:55 -0300
Subject: [PATCH 43/72] Implementing the Template Method Pattern with Java -
 BAEL-1289 (#3065)

* Initial Commit

* Added Domain Classes

* Update HighEndComputer.java

* Update StandardComputer.java

* Update TemplateMethodPatternTest.java
---
 .../application/Application.java              |  4 +--
 .../templatemethodpattern/model/Computer.java | 26 +++---------------
 .../model/ComputerBuilder.java                | 10 +++----
 .../model/HighEndComputer.java                | 26 ++++--------------
 .../model/HighEndComputerBuilder.java         |  8 +++---
 .../model/StandardComputer.java               | 27 +++++--------------
 .../model/StandardComputerBuilder.java        |  6 ++---
 .../TemplateMethodPatternTest.java            |  8 +++---
 8 files changed, 33 insertions(+), 82 deletions(-)

diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java
index 5570c2e1dd..bd383b4568 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java
@@ -1,11 +1,11 @@
 package com.baeldung.templatemethodpattern.application;
 
 import com.baeldung.templatemethodpattern.model.Computer;
+import com.baeldung.templatemethodpattern.model.StandardComputer;
+import com.baeldung.templatemethodpattern.model.HighEndComputer;
 import com.baeldung.templatemethodpattern.model.ComputerBuilder;
 import com.baeldung.templatemethodpattern.model.HighEndComputerBuilder;
 import com.baeldung.templatemethodpattern.model.StandardComputerBuilder;
-import com.baeldung.templatemethodpattern.model.HighEndComputer;
-import com.baeldung.templatemethodpattern.model.StandardComputer;
 
 public class Application {
     
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
index d422204b82..128eec59ad 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
@@ -5,33 +5,15 @@ import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class ComputerBuilder {
+public class Computer {
     
-    protected Map<String, String> computerParts = new HashMap<>();
-    protected List<String> moterboardSetupStatus = new ArrayList<>();
+    private Map<String, String> computerParts = new HashMap<>();
     
-    public final Computer buildComputer() {
-        addMotherboard();
-        setupMotherboard();
-        addProcessor();
-        return getComputer();
+    public Computer(Map<String, String> computerParts) {
+        this.computerParts = computerParts;
     }
     
-    public abstract void addMotherboard();
-    
-     public abstract void setupMotherboard();
-    
-    public abstract void addProcessor();
-    
-    public List<String> getMotherboardSetupStatus() {
-        return moterboardSetupStatus;
-    }
-        
     public Map<String, String> getComputerParts() {
         return computerParts;
     }
-     
-    private Computer getComputer() {
-        return new Computer(computerParts);
-    }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
index 9d8eae7f80..39052f4776 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
@@ -8,7 +8,7 @@ import java.util.Map;
 public abstract class ComputerBuilder {
 
     protected Map<String, String> computerParts = new HashMap<>();
-    protected List<String> moterboardSetupStatus = new ArrayList<>();
+    protected List<String> motherboardSetupStatus = new ArrayList<>();
     
     public final Computer buildComputer() {
         addMotherboard();
@@ -22,11 +22,11 @@ public abstract class ComputerBuilder {
     public abstract void setupMotherboard();
     
     public abstract void addProcessor();
-    
-    public List<String> getMotherboardSetupStatus() {
-        return moterboardSetupStatus;
-    }
 
+    public List<String> getMotherboardSetupStatus() {
+        return motherboardSetupStatus;
+    }
+    
     public Map<String, String> getComputerParts() {
         return computerParts;
     }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
index 8d80e1e108..16d89f1ad6 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
@@ -1,26 +1,10 @@
 package com.baeldung.templatemethodpattern.model;
 
-public class HighEndComputer extends Computer {
+import java.util.Map;
 
-    @Override
-    public void addMotherboard() {
-         computerParts.put("Motherboard", "High-end Motherboard");
-    }
+public class HighEndComputer extends Computer {
     
-    @Override
-    public void setupMotherboard() {
-        moterboardSetupStatus.add("Screwing the high-end motherboard to the case.");
-        moterboardSetupStatus.add("Pluging in the power supply connectors.");
-        moterboardSetupStatus.forEach(step -> System.out.println(step));
-    }
-    
-    @Override
-    public void addProcessor() {
-         computerParts.put("Processor", "High-end Processor");
-    }
-    
-    @Override
-    public void addMotherboard() {
-         computerParts.put("Motherboard", "High End Motherboard");
-    }
+    public HighEndComputer(Map<String, String> computerParts) {
+        super(computerParts);
+    }    
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
index cf53a2ae6c..baa800ca8f 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
@@ -9,13 +9,13 @@ public class HighEndComputerBuilder extends ComputerBuilder {
     
     @Override
     public void setupMotherboard() {
-        moterboardSetupStatus.add("Screwing the high-end motherboard to the case.");
-        moterboardSetupStatus.add("Pluging in the power supply connectors.");
-        moterboardSetupStatus.forEach(step -> System.out.println(step));
+        motherboardSetupStatus.add("Screwing the high-end motherboard to the case.");
+        motherboardSetupStatus.add("Pluging in the power supply connectors.");
+        motherboardSetupStatus.forEach(step -> System.out.println(step));
     }
     
     @Override
     public void addProcessor() {
-         computerParts.put("Processor", "High-end Processor");
+        computerParts.put("Processor", "High-end Processor");
     }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java
index 8410ad88ee..14d32d7b64 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java
@@ -1,25 +1,10 @@
 package com.baeldung.templatemethodpattern.model;
- 
+
+import java.util.Map;
+
 public class StandardComputer extends Computer {
     
-    public void addMotherboard() {
-        computerParts.put("Motherboard", "Standard Motherboard");
-    }
-    
-    @Override
-    public void setupMotherboard() {
-        moterboardSetupStatus.add("Screwing the standard motherboard to the case.");
-        moterboardSetupStatus.add("Pluging in the power supply connectors.");
-        moterboardSetupStatus.forEach(step -> System.out.println(step));
-    }
-    
-    @Override
-    public void addProcessor() {
-        computerParts.put("Processor", "Standard Processor");
-    }
-
-    @Override
-    public void addMotherboard() {
-        computerParts.put("Motherboard", "Standard Motherboard");
-    }
+    public StandardComputer(Map<String, String> computerParts) {
+        super(computerParts);
+    }    
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
index 1d9bd0e00f..78547dc38b 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
+++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
@@ -9,9 +9,9 @@ public class StandardComputerBuilder extends ComputerBuilder {
     
     @Override
     public void setupMotherboard() {
-        moterboardSetupStatus.add("Screwing the standard motherboard to the case.");
-        moterboardSetupStatus.add("Pluging in the power supply connectors.");
-        moterboardSetupStatus.forEach(step -> System.out.println(step));
+        motherboardSetupStatus.add("Screwing the standard motherboard to the case.");
+        motherboardSetupStatus.add("Pluging in the power supply connectors.");
+        motherboardSetupStatus.forEach(step -> System.out.println(step));
     }
     
     @Override
diff --git a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
index 39888d5ad5..1d608ff2c2 100644
--- a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
+++ b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
@@ -29,12 +29,12 @@ public class TemplateMethodPatternTest {
 
     @Test
     public void givenStandardMotherBoard_whenAddingMotherBoard_thenEqualAssertion() {
-        standardComputer.addMotherboard();
-        assertEquals("Standard Motherboard", standardComputer.getComputerParts().get("Motherboard"));
+        standardComputerBuilder.addMotherboard();
+        assertEquals("Standard Motherboard", standardComputerBuilder.getComputerParts().get("Motherboard"));
     }
 
     @Test
-    public void givenStandardMotheroboard_whenSetup_thenTwoEqualAssertions() {
+    public void givenStandardMotherboard_whenSetup_thenTwoEqualAssertions() {
         standardComputerBuilder.setupMotherboard();
         assertEquals("Screwing the standard motherboard to the case.", standardComputerBuilder.getMotherboardSetupStatus().get(0));
         assertEquals("Pluging in the power supply connectors.", standardComputerBuilder.getMotherboardSetupStatus().get(1));
@@ -77,7 +77,7 @@ public class TemplateMethodPatternTest {
     }
     
     @Test
-    public void givenAllHighEndParts_whenBuildingComputer_thenTwoParts() {
+    public void givenAllHighEnddParts_whenBuildingComputer_thenTwoParts() {
         highEndComputerBuilder.buildComputer();
         assertEquals(2, highEndComputerBuilder.getComputerParts().size());
     }

From 34ad3ad29b1eba478618bafe43ed393efd366c9a Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Thu, 16 Nov 2017 22:59:02 +0100
Subject: [PATCH 44/72] Build opt (#3062)

* spring-boot-admin

* Optimization
---
 cas/cas-secured-app/pom.xml                   |  19 ++
 ...SecuredAppApplicationIntegrationTest.java} |   2 +-
 ...dminClientApplicationIntegrationTest.java} |   2 +-
 ...va => HazelcastConfigIntegrationTest.java} |   2 +-
 ...NotifierConfigurationIntegrationTest.java} |   2 +-
 ... => WebSecurityConfigIntegrationTest.java} |   2 +-
 ...KeycloakConfigurationIntegrationTest.java} |   2 +-
 ... => DataSourceRoutingIntegrationTest.java} |   2 +-
 .../DataSourceRoutingTestConfiguration.java   |   6 +-
 .../ConfigPropertiesIntegrationTest.java      |   2 -
 ...terJenkinsApplicationIntegrationTest.java} |   2 +-
 ...est.java => SpringAclIntegrationTest.java} | 236 +++++++++---------
 12 files changed, 147 insertions(+), 132 deletions(-)
 rename cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/{CasSecuredAppApplicationTests.java => CasSecuredAppApplicationIntegrationTest.java} (84%)
 rename spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/{SpringBootAdminClientApplicationTests.java => SpringBootAdminClientApplicationIntegrationTest.java} (97%)
 rename spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/{HazelcastConfigTest.java => HazelcastConfigIntegrationTest.java} (95%)
 rename spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/{NotifierConfigurationTest.java => NotifierConfigurationIntegrationTest.java} (96%)
 rename spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/{WebSecurityConfigTest.java => WebSecurityConfigIntegrationTest.java} (97%)
 rename spring-boot-keycloak/src/test/java/com/baeldung/keycloak/{KeycloakConfigurationTest.java => KeycloakConfigurationIntegrationTest.java} (97%)
 rename spring-boot/src/test/java/org/baeldung/dsrouting/{DataSourceRoutingTests.java => DataSourceRoutingIntegrationTest.java} (97%)
 rename spring-jmeter-jenkins/src/test/java/com/baeldung/{SpringJMeterJenkinsApplicationTests.java => SpringJMeterJenkinsApplicationIntegrationTest.java} (82%)
 rename spring-security-mvc-boot/src/test/java/org/baeldung/acl/{SpringAclTest.java => SpringAclIntegrationTest.java} (96%)

diff --git a/cas/cas-secured-app/pom.xml b/cas/cas-secured-app/pom.xml
index f66d54ae67..543354e8b3 100644
--- a/cas/cas-secured-app/pom.xml
+++ b/cas/cas-secured-app/pom.xml
@@ -65,6 +65,24 @@
 				<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>**/*LongRunningUnitTest.java</exclude>
+						<exclude>**/*ManualTest.java</exclude>
+						<exclude>**/JdbcTest.java</exclude>
+						<exclude>**/*LiveTest.java</exclude>
+					</excludes>
+
+				</configuration>
+			</plugin>
+
 		</plugins>
 	</build>
 
@@ -107,4 +125,5 @@
 	</pluginRepositories>
 
 
+
 </project>
diff --git a/cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java b/cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java
similarity index 84%
rename from cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java
rename to cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java
index 09dbaf0c61..2f2644e2ea 100644
--- a/cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java
+++ b/cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class CasSecuredAppApplicationTests {
+public class CasSecuredAppApplicationIntegrationTest {
 
 	@Test
 	public void contextLoads() {
diff --git a/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationTests.java b/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java
similarity index 97%
rename from spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationTests.java
rename to spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java
index d70fb1c7cf..0201deabca 100644
--- a/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationTests.java
+++ b/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java
@@ -19,7 +19,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT)
-public class SpringBootAdminClientApplicationTests {
+public class SpringBootAdminClientApplicationIntegrationTest {
 
     @Autowired Environment environment;
 
diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigTest.java b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java
similarity index 95%
rename from spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigTest.java
rename to spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java
index 8ca50a6f75..7c1b1881a4 100644
--- a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigTest.java
+++ b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java
@@ -13,7 +13,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { HazelcastConfig.class }, webEnvironment = NONE)
-public class HazelcastConfigTest {
+public class HazelcastConfigIntegrationTest {
 
     @Autowired private ApplicationContext applicationContext;
 
diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationTest.java b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java
similarity index 96%
rename from spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationTest.java
rename to spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java
index 85f6b374a4..465d079ac3 100644
--- a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationTest.java
+++ b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java
@@ -16,7 +16,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { NotifierConfiguration.class }, webEnvironment = NONE)
-public class NotifierConfigurationTest {
+public class NotifierConfigurationIntegrationTest {
 
     @Autowired private ApplicationContext applicationContext;
 
diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigTest.java b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java
similarity index 97%
rename from spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigTest.java
rename to spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java
index 40611f00f6..0c0695e6c2 100644
--- a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigTest.java
+++ b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java
@@ -17,7 +17,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class WebSecurityConfigTest {
+public class WebSecurityConfigIntegrationTest {
 
     @Autowired WebApplicationContext wac;
 
diff --git a/spring-boot-keycloak/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java b/spring-boot-keycloak/src/test/java/com/baeldung/keycloak/KeycloakConfigurationIntegrationTest.java
similarity index 97%
rename from spring-boot-keycloak/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java
rename to spring-boot-keycloak/src/test/java/com/baeldung/keycloak/KeycloakConfigurationIntegrationTest.java
index 41662e5c17..e0bbef1c7f 100644
--- a/spring-boot-keycloak/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java
+++ b/spring-boot-keycloak/src/test/java/com/baeldung/keycloak/KeycloakConfigurationIntegrationTest.java
@@ -20,7 +20,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = SpringBoot.class)
-public class KeycloakConfigurationTest {
+public class KeycloakConfigurationIntegrationTest {
 
     @Spy
     private KeycloakSecurityContextClientRequestInterceptor factory;
diff --git a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTests.java b/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java
similarity index 97%
rename from spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTests.java
rename to spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java
index 88a142fcde..f81247e3cd 100644
--- a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTests.java
+++ b/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java
@@ -14,7 +14,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = DataSourceRoutingTestConfiguration.class)
-public class DataSourceRoutingTests {
+public class DataSourceRoutingIntegrationTest {
 
     @Autowired
     DataSource routingDatasource;
diff --git a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java b/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
index 595ad6ce0d..dee9d58722 100644
--- a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
+++ b/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
@@ -35,19 +35,17 @@ public class DataSourceRoutingTestConfiguration {
 
     private DataSource clientADatasource() {
         EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder();
-        EmbeddedDatabase embeddedDb = dbBuilder.setType(EmbeddedDatabaseType.H2)
+        return dbBuilder.setType(EmbeddedDatabaseType.H2)
             .setName("CLIENT_A")
             .addScript("classpath:dsrouting-db.sql")
             .build();
-        return embeddedDb;
     }
 
     private DataSource clientBDatasource() {
         EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder();
-        EmbeddedDatabase embeddedDb = dbBuilder.setType(EmbeddedDatabaseType.H2)
+        return dbBuilder.setType(EmbeddedDatabaseType.H2)
             .setName("CLIENT_B")
             .addScript("classpath:dsrouting-db.sql")
             .build();
-        return embeddedDb;
     }
 }
diff --git a/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java
index a51e3a6884..ffd5bf55d6 100644
--- a/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java
+++ b/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java
@@ -1,7 +1,5 @@
 package org.baeldung.properties;
 
-import org.baeldung.properties.ConfigProperties;
-import org.baeldung.properties.ConfigPropertiesDemoApplication;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationTests.java b/spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationIntegrationTest.java
similarity index 82%
rename from spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationTests.java
rename to spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationIntegrationTest.java
index b39a5605b1..71eec9cf45 100644
--- a/spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationTests.java
+++ b/spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationIntegrationTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class SpringJMeterJenkinsApplicationTests {
+public class SpringJMeterJenkinsApplicationIntegrationTest {
 
 	@Test
 	public void contextLoads() {
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclIntegrationTest.java
similarity index 96%
rename from spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclTest.java
rename to spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclIntegrationTest.java
index fd9069d9bc..38e1a2a9e7 100644
--- a/spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclTest.java
+++ b/spring-security-mvc-boot/src/test/java/org/baeldung/acl/SpringAclIntegrationTest.java
@@ -1,119 +1,119 @@
-package org.baeldung.acl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.List;
-
-import org.baeldung.acl.persistence.dao.NoticeMessageRepository;
-import org.baeldung.acl.persistence.entity.NoticeMessage;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.test.context.support.WithMockUser;
-import org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
-import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
-import org.springframework.test.context.web.ServletTestExecutionListener;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-@TestExecutionListeners(listeners={ServletTestExecutionListener.class,
-        DependencyInjectionTestExecutionListener.class,
-        DirtiesContextTestExecutionListener.class,
-        TransactionalTestExecutionListener.class,
-        WithSecurityContextTestExecutionListener.class})
-public class SpringAclTest extends AbstractJUnit4SpringContextTests{
-    
-    private static Integer FIRST_MESSAGE_ID = 1;
-    private static Integer SECOND_MESSAGE_ID = 2;
-    private static Integer THIRD_MESSAGE_ID = 3;
-    private static String EDITTED_CONTENT = "EDITED";
-    
-    @Configuration
-    @ComponentScan("org.baeldung.acl.*")
-    public static class SpringConfig {
-
-    }
-    
-    @Autowired
-    NoticeMessageRepository repo;
-    
-    @Test
-    @WithMockUser(username="manager")
-    public void givenUsernameManager_whenFindAllMessage_thenReturnFirstMessage(){
-        List<NoticeMessage> details = repo.findAll();
-        assertNotNull(details);
-        assertEquals(1,details.size());
-        assertEquals(FIRST_MESSAGE_ID,details.get(0).getId());
-    }
-    
-    @Test
-    @WithMockUser(username="manager")
-    public void givenUsernameManager_whenFindFirstMessageByIdAndUpdateFirstMessageContent_thenOK(){
-        NoticeMessage firstMessage = repo.findById(FIRST_MESSAGE_ID);
-        assertNotNull(firstMessage);
-        assertEquals(FIRST_MESSAGE_ID,firstMessage.getId());
-        
-        firstMessage.setContent(EDITTED_CONTENT);
-        repo.save(firstMessage);
-        
-        NoticeMessage editedFirstMessage = repo.findById(FIRST_MESSAGE_ID);
-        assertNotNull(editedFirstMessage);
-        assertEquals(FIRST_MESSAGE_ID,editedFirstMessage.getId());
-        assertEquals(EDITTED_CONTENT,editedFirstMessage.getContent());
-    }
-    
-    @Test
-    @WithMockUser(username="hr")
-    public void givenUsernameHr_whenFindMessageById2_thenOK(){
-        NoticeMessage secondMessage = repo.findById(SECOND_MESSAGE_ID);
-        assertNotNull(secondMessage);
-        assertEquals(SECOND_MESSAGE_ID,secondMessage.getId());
-    }
-    
-    @Test(expected=AccessDeniedException.class)
-    @WithMockUser(username="hr")
-    public void givenUsernameHr_whenUpdateMessageWithId2_thenFail(){
-        NoticeMessage secondMessage = new NoticeMessage();
-        secondMessage.setId(SECOND_MESSAGE_ID);
-        secondMessage.setContent(EDITTED_CONTENT);
-        repo.save(secondMessage);
-    }
-    
-    @Test
-    @WithMockUser(roles={"EDITOR"})
-    public void givenRoleEditor_whenFindAllMessage_thenReturnThreeMessage(){
-        List<NoticeMessage> details = repo.findAll();
-        assertNotNull(details);
-        assertEquals(3,details.size());
-    }
-    
-    @Test
-    @WithMockUser(roles={"EDITOR"})
-    public void givenRoleEditor_whenUpdateThirdMessage_thenOK(){
-        NoticeMessage thirdMessage = new NoticeMessage();
-        thirdMessage.setId(THIRD_MESSAGE_ID);
-        thirdMessage.setContent(EDITTED_CONTENT);
-        repo.save(thirdMessage);
-    }
-    
-    @Test(expected=AccessDeniedException.class)
-    @WithMockUser(roles={"EDITOR"})
-    public void givenRoleEditor_whenFindFirstMessageByIdAndUpdateFirstMessageContent_thenFail(){
-        NoticeMessage firstMessage = repo.findById(FIRST_MESSAGE_ID);
-        assertNotNull(firstMessage);
-        assertEquals(FIRST_MESSAGE_ID,firstMessage.getId());
-        firstMessage.setContent(EDITTED_CONTENT);
-        repo.save(firstMessage);
-    }
-}
+package org.baeldung.acl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import org.baeldung.acl.persistence.dao.NoticeMessageRepository;
+import org.baeldung.acl.persistence.entity.NoticeMessage;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
+import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
+import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
+import org.springframework.test.context.web.ServletTestExecutionListener;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+@TestExecutionListeners(listeners={ServletTestExecutionListener.class,
+        DependencyInjectionTestExecutionListener.class,
+        DirtiesContextTestExecutionListener.class,
+        TransactionalTestExecutionListener.class,
+        WithSecurityContextTestExecutionListener.class})
+public class SpringAclIntegrationTest extends AbstractJUnit4SpringContextTests{
+    
+    private static Integer FIRST_MESSAGE_ID = 1;
+    private static Integer SECOND_MESSAGE_ID = 2;
+    private static Integer THIRD_MESSAGE_ID = 3;
+    private static String EDITTED_CONTENT = "EDITED";
+    
+    @Configuration
+    @ComponentScan("org.baeldung.acl.*")
+    public static class SpringConfig {
+
+    }
+    
+    @Autowired
+    NoticeMessageRepository repo;
+    
+    @Test
+    @WithMockUser(username="manager")
+    public void givenUsernameManager_whenFindAllMessage_thenReturnFirstMessage(){
+        List<NoticeMessage> details = repo.findAll();
+        assertNotNull(details);
+        assertEquals(1,details.size());
+        assertEquals(FIRST_MESSAGE_ID,details.get(0).getId());
+    }
+    
+    @Test
+    @WithMockUser(username="manager")
+    public void givenUsernameManager_whenFindFirstMessageByIdAndUpdateFirstMessageContent_thenOK(){
+        NoticeMessage firstMessage = repo.findById(FIRST_MESSAGE_ID);
+        assertNotNull(firstMessage);
+        assertEquals(FIRST_MESSAGE_ID,firstMessage.getId());
+        
+        firstMessage.setContent(EDITTED_CONTENT);
+        repo.save(firstMessage);
+        
+        NoticeMessage editedFirstMessage = repo.findById(FIRST_MESSAGE_ID);
+        assertNotNull(editedFirstMessage);
+        assertEquals(FIRST_MESSAGE_ID,editedFirstMessage.getId());
+        assertEquals(EDITTED_CONTENT,editedFirstMessage.getContent());
+    }
+    
+    @Test
+    @WithMockUser(username="hr")
+    public void givenUsernameHr_whenFindMessageById2_thenOK(){
+        NoticeMessage secondMessage = repo.findById(SECOND_MESSAGE_ID);
+        assertNotNull(secondMessage);
+        assertEquals(SECOND_MESSAGE_ID,secondMessage.getId());
+    }
+    
+    @Test(expected=AccessDeniedException.class)
+    @WithMockUser(username="hr")
+    public void givenUsernameHr_whenUpdateMessageWithId2_thenFail(){
+        NoticeMessage secondMessage = new NoticeMessage();
+        secondMessage.setId(SECOND_MESSAGE_ID);
+        secondMessage.setContent(EDITTED_CONTENT);
+        repo.save(secondMessage);
+    }
+    
+    @Test
+    @WithMockUser(roles={"EDITOR"})
+    public void givenRoleEditor_whenFindAllMessage_thenReturnThreeMessage(){
+        List<NoticeMessage> details = repo.findAll();
+        assertNotNull(details);
+        assertEquals(3,details.size());
+    }
+    
+    @Test
+    @WithMockUser(roles={"EDITOR"})
+    public void givenRoleEditor_whenUpdateThirdMessage_thenOK(){
+        NoticeMessage thirdMessage = new NoticeMessage();
+        thirdMessage.setId(THIRD_MESSAGE_ID);
+        thirdMessage.setContent(EDITTED_CONTENT);
+        repo.save(thirdMessage);
+    }
+    
+    @Test(expected=AccessDeniedException.class)
+    @WithMockUser(roles={"EDITOR"})
+    public void givenRoleEditor_whenFindFirstMessageByIdAndUpdateFirstMessageContent_thenFail(){
+        NoticeMessage firstMessage = repo.findById(FIRST_MESSAGE_ID);
+        assertNotNull(firstMessage);
+        assertEquals(FIRST_MESSAGE_ID,firstMessage.getId());
+        firstMessage.setContent(EDITTED_CONTENT);
+        repo.save(firstMessage);
+    }
+}
     
\ No newline at end of file

From b30097b5814bc90aa435761ab9a2bf21aac08da0 Mon Sep 17 00:00:00 2001
From: Eric Goebelbecker <egoebelbecker@users.noreply.github.com>
Date: Thu, 16 Nov 2017 18:41:00 -0500
Subject: [PATCH 45/72] BAEL-1264 - class and tests for killing a thread
 (#3069)

---
 .../concurrent/stopping/ControlSubThread.java | 52 +++++++++++++++++++
 .../concurrent/stopping/StopThreadTest.java   | 50 ++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 core-java-concurrency/src/main/java/com/baeldung/concurrent/stopping/ControlSubThread.java
 create mode 100644 core-java-concurrency/src/test/java/com/baeldung/concurrent/stopping/StopThreadTest.java

diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/stopping/ControlSubThread.java b/core-java-concurrency/src/main/java/com/baeldung/concurrent/stopping/ControlSubThread.java
new file mode 100644
index 0000000000..0e72821a88
--- /dev/null
+++ b/core-java-concurrency/src/main/java/com/baeldung/concurrent/stopping/ControlSubThread.java
@@ -0,0 +1,52 @@
+package com.baeldung.concurrent.stopping;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class ControlSubThread implements Runnable {
+
+    private Thread worker;
+    private int interval = 100;
+    private AtomicBoolean running = new AtomicBoolean(false);
+    private AtomicBoolean stopped = new AtomicBoolean(true);
+
+
+    public ControlSubThread(int sleepInterval) {
+        interval = sleepInterval;
+    }
+
+    public void start() {
+        worker = new Thread(this);
+        worker.start();
+    }
+
+    public void stop() {
+        running.set(false);
+    }
+
+    public void interrupt() {
+        running.set(false);
+        worker.interrupt();
+    }
+
+    boolean isRunning() {
+        return running.get();
+    }
+
+    boolean isStopped() {
+        return stopped.get();
+    }
+
+    public void run() {
+        running.set(true);
+        stopped.set(false);
+        while (running.get()) {
+            try {
+                Thread.sleep(interval);
+            } catch (InterruptedException e) {
+                // no-op, just loop again
+            }
+            // do something
+        }
+        stopped.set(true);
+    }
+}
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/stopping/StopThreadTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/stopping/StopThreadTest.java
new file mode 100644
index 0000000000..8c1bdbf787
--- /dev/null
+++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/stopping/StopThreadTest.java
@@ -0,0 +1,50 @@
+package com.baeldung.concurrent.stopping;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class StopThreadTest {
+
+    @Test
+    public void whenStoppedThreadIsStopped() throws InterruptedException {
+
+        int interval = 100;
+
+        ControlSubThread controlSubThread = new ControlSubThread(interval);
+        controlSubThread.start();
+
+        // Give things a chance to get set up
+        Thread.sleep(interval);
+        assertTrue(controlSubThread.isRunning());
+        assertFalse(controlSubThread.isStopped());
+
+        // Stop it and make sure the flags have been reversed
+        controlSubThread.stop();
+        Thread.sleep(interval);
+        assertTrue(controlSubThread.isStopped());
+    }
+
+
+    @Test
+    public void whenInterruptedThreadIsStopped() throws InterruptedException {
+
+        int interval = 5000;
+
+        ControlSubThread controlSubThread = new ControlSubThread(interval);
+        controlSubThread.start();
+
+        // Give things a chance to get set up
+        Thread.sleep(100);
+        assertTrue(controlSubThread.isRunning());
+        assertFalse(controlSubThread.isStopped());
+
+        // Stop it and make sure the flags have been reversed
+        controlSubThread.interrupt();
+
+        // Wait less than the time we would normally sleep, and make sure we exited.
+        Thread.sleep(interval/10);
+        assertTrue(controlSubThread.isStopped());
+    }
+}

From 7a21f5ee858e1cdc53155791731d2c8310445a8c Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Fri, 17 Nov 2017 07:22:09 +0100
Subject: [PATCH 46/72] Move data.sql - schema.sql (#3067)

---
 {spring-jpa/src/main => spring-boot/src/test}/resources/data.sql  | 0
 .../src/main => spring-boot/src/test}/resources/schema.sql        | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {spring-jpa/src/main => spring-boot/src/test}/resources/data.sql (100%)
 rename {spring-jpa/src/main => spring-boot/src/test}/resources/schema.sql (100%)

diff --git a/spring-jpa/src/main/resources/data.sql b/spring-boot/src/test/resources/data.sql
similarity index 100%
rename from spring-jpa/src/main/resources/data.sql
rename to spring-boot/src/test/resources/data.sql
diff --git a/spring-jpa/src/main/resources/schema.sql b/spring-boot/src/test/resources/schema.sql
similarity index 100%
rename from spring-jpa/src/main/resources/schema.sql
rename to spring-boot/src/test/resources/schema.sql

From d0bf73ff6da10674fe9cbcfb7fd18c6deeaec570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mitja=20Jeseni=C4=8Dnik=20Kotnik?= <mitja@cotnic.com>
Date: Fri, 17 Nov 2017 09:51:56 +0100
Subject: [PATCH 47/72] simple printing in servlet (#3066)

---
 .../widlfly-web/src/main/java/TestEJBServlet.java     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java b/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
index a27f0efe51..57376e9c4a 100644
--- a/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
+++ b/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
@@ -26,16 +26,13 @@ public class TestEJBServlet extends HttpServlet {
         PrintWriter out = response.getWriter();
 
         out.println("<html>");
-        out.println("<head><title>Users</title></head>");
         out.println("<body>");
-        out.println("<center><h1>List of users:</h1>");
-        out.println("<table border=\"1\" align=\"center\" style=\"width:50%\">");
         for (User user : users) {
-            out.println("<tr>");
-            out.print("<td>" + user.getUsername() + "</td>");
-            out.print("<td>" + user.getEmail() + "</td>");
-            out.println("</tr>");
+            out.print(user.getUsername());
+            out.print(" " + user.getEmail() + " <br>");
         }
+        out.println("</body>");
+        out.println("</html>");
     }
 
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

From f02ffe9ae602db4b6c6d032423fc428201dcaf25 Mon Sep 17 00:00:00 2001
From: Rokon Uddin Ahmed <cody70506@gmail.com>
Date: Fri, 17 Nov 2017 20:00:32 +0600
Subject: [PATCH 48/72] pull req 16.11 (#3059)

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Create README.md

* Update README.md
---
 algorithms/README.md            | 1 +
 apache-spark/README.md          | 3 +++
 core-java-concurrency/README.md | 1 +
 core-java/README.md             | 3 ++-
 deeplearning4j/README.md        | 2 +-
 libraries/README.md             | 6 +++++-
 metrics/README.md               | 1 +
 rxjava/README.md                | 1 +
 spring-activiti/README.md       | 1 +
 spring-all/README.md            | 1 +
 10 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 apache-spark/README.md

diff --git a/algorithms/README.md b/algorithms/README.md
index b0c5ee9d77..5f101c296c 100644
--- a/algorithms/README.md
+++ b/algorithms/README.md
@@ -14,3 +14,4 @@
 - [Bubble Sort in Java](http://www.baeldung.com/java-bubble-sort)
 - [Introduction to JGraphT](http://www.baeldung.com/jgrapht)
 - [Introduction to Minimax Algorithm](http://www.baeldung.com/java-minimax-algorithm)
+- [How to Calculate Levenshtein Distance in Java?](http://www.baeldung.com/java-levenshtein-distance)
diff --git a/apache-spark/README.md b/apache-spark/README.md
new file mode 100644
index 0000000000..fb8059eb27
--- /dev/null
+++ b/apache-spark/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Introduction to Apache Spark](http://www.baeldung.com/apache-spark)
diff --git a/core-java-concurrency/README.md b/core-java-concurrency/README.md
index f1d95482d4..48c5f2a50c 100644
--- a/core-java-concurrency/README.md
+++ b/core-java-concurrency/README.md
@@ -30,3 +30,4 @@
 - [Guide to Volatile Keyword in Java](http://www.baeldung.com/java-volatile)
 - [Overview of the java.util.concurrent](http://www.baeldung.com/java-util-concurrent)
 - [Semaphores in Java](http://www.baeldung.com/java-semaphore)
+- [Daemon Threads in Java](http://www.baeldung.com/java-daemon-thread)
diff --git a/core-java/README.md b/core-java/README.md
index dcf77ff536..df3d26d8fa 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -115,4 +115,5 @@
 - [Number of Digits in an Integer in Java](http://www.baeldung.com/java-number-of-digits-in-int)
 - [Proxy, Decorator, Adapter and Bridge Patterns](http://www.baeldung.com/java-structural-design-patterns)
 - [Creating a Java Compiler Plugin](http://www.baeldung.com/java-build-compiler-plugin)
-
+- [A Guide to the Static Keyword in Java](http://www.baeldung.com/java-static)
+- [Initializing Arrays in Java](http://www.baeldung.com/java-initialize-array)
diff --git a/deeplearning4j/README.md b/deeplearning4j/README.md
index 729ab101fd..7f9c92ec73 100644
--- a/deeplearning4j/README.md
+++ b/deeplearning4j/README.md
@@ -2,4 +2,4 @@
 This is a sample project for the [deeplearning4j](https://deeplearning4j.org) library.
 
 ### Relevant Articles:
-- [A Guide to deeplearning4j](http://www.baeldung.com/a-guide-to-deeplearning4j/)
+- [A Guide to deeplearning4j](http://www.baeldung.com/deeplearning4j)
diff --git a/libraries/README.md b/libraries/README.md
index c6bbb5634c..65ef79f45b 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -53,7 +53,11 @@
 - [Using Pairs in Java](http://www.baeldung.com/java-pairs)
 - [Apache Commons Collections Bag](http://www.baeldung.com/apache-commons-bag)
 - [Introduction to Caffeine](http://www.baeldung.com/java-caching-caffeine)
-+-[Introduction to Chronicle Queue](http://www.baeldung.com/java-chronicle-queue)
+- [Introduction to Chronicle Queue](http://www.baeldung.com/java-chronicle-queue)
+- [Introduction To Docx4J](http://www.baeldung.com/docx4j)
+- [Introduction to StreamEx](http://www.baeldung.com/streamex)
+- [Introduction to BouncyCastle with Java](http://www.baeldung.com/java-bouncy-castle)
+- [Intro to JDO Queries 2/2](http://www.baeldung.com/jdo-queries)
 
 The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own.
 
diff --git a/metrics/README.md b/metrics/README.md
index 09fe925604..c7772bffa0 100644
--- a/metrics/README.md
+++ b/metrics/README.md
@@ -2,3 +2,4 @@
 
 - [Intro to Dropwizard Metrics](http://www.baeldung.com/dropwizard-metrics)
 - [Introduction to Netflix Servo](http://www.baeldung.com/netflix-servo)
+- [Quick Guide to Micrometer](http://www.baeldung.com/micrometer)
diff --git a/rxjava/README.md b/rxjava/README.md
index 71231cc391..c88ec36991 100644
--- a/rxjava/README.md
+++ b/rxjava/README.md
@@ -8,3 +8,4 @@
 - [Observable Utility Operators in RxJava](http://www.baeldung.com/rxjava-observable-operators)
 - [Introduction to rxjava-jdbc](http://www.baeldung.com/rxjava-jdbc)
 - [Schedulers in RxJava](http://www.baeldung.com/rxjava-schedulers)
+- [Mathematical and Aggregate Operators in RxJava](http://www.baeldung.com/rxjava-math)
diff --git a/spring-activiti/README.md b/spring-activiti/README.md
index 5007b03ec7..703dfeec52 100644
--- a/spring-activiti/README.md
+++ b/spring-activiti/README.md
@@ -3,3 +3,4 @@
 - [A Guide to Activiti with Java](http://www.baeldung.com/java-activiti)
 - [Introduction to Activiti with Spring](http://www.baeldung.com/spring-activiti)
 - [Activiti with Spring Security](http://www.baeldung.com/activiti-spring-security)
+- [ProcessEngine Configuration in Activiti](http://www.baeldung.com/activiti-process-engine)
diff --git a/spring-all/README.md b/spring-all/README.md
index 36bf7da778..e1504a66db 100644
--- a/spring-all/README.md
+++ b/spring-all/README.md
@@ -23,3 +23,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [New in Guava 21 common.util.concurrent](http://www.baeldung.com/guava-21-util-concurrent)
 - [A CLI with Spring Shell](http://www.baeldung.com/spring-shell-cli)
 - [JasperReports with Spring](http://www.baeldung.com/spring-jasper)
+- [Model, ModelMap, and ModelView in Spring MVC](http://www.baeldung.com/spring-mvc-model-model-map-model-view)

From 8dcc6cb1065d7d640aa6f1754697353fbe6aaf99 Mon Sep 17 00:00:00 2001
From: Sergey Petunin <s.petunin@me.com>
Date: Fri, 17 Nov 2017 19:41:59 +0100
Subject: [PATCH 49/72] BAEL-1311: Spring Security 5 - Security for Reactive
 Applications (#3056)

---
 spring-5/pom.xml                              |  9 +++-
 .../baeldung/SpringSecurity5Application.java  | 34 +++++++++++++
 .../baeldung/security/GreetController.java    | 37 ++++++++++++++
 .../com/baeldung/security/GreetService.java   | 15 ++++++
 .../com/baeldung/security/SecurityConfig.java | 42 ++++++++++++++++
 .../src/main/resources/application.properties |  3 --
 .../com/baeldung/security/SecurityTest.java   | 48 +++++++++++++++++++
 .../web/client/WebTestClientTest.java         |  2 +-
 8 files changed, 184 insertions(+), 6 deletions(-)
 create mode 100644 spring-5/src/main/java/com/baeldung/SpringSecurity5Application.java
 create mode 100644 spring-5/src/main/java/com/baeldung/security/GreetController.java
 create mode 100644 spring-5/src/main/java/com/baeldung/security/GreetService.java
 create mode 100644 spring-5/src/main/java/com/baeldung/security/SecurityConfig.java
 create mode 100644 spring-5/src/test/java/com/baeldung/security/SecurityTest.java

diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index e9a65232d2..7e30179f07 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M3</version>
+		<version>2.0.0.M6</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -99,6 +99,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -189,7 +194,7 @@
 		<junit.platform.version>1.0.0</junit.platform.version>
 		<junit.jupiter.version>5.0.0</junit.jupiter.version>
 		<maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
-		<spring.version>5.0.0.RELEASE</spring.version>
+		<spring.version>5.0.1.RELEASE</spring.version>
 		<reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
 		<johnzon.version>1.1.3</johnzon.version>
 		<jsonb-api.version>1.0</jsonb-api.version>
diff --git a/spring-5/src/main/java/com/baeldung/SpringSecurity5Application.java b/spring-5/src/main/java/com/baeldung/SpringSecurity5Application.java
new file mode 100644
index 0000000000..02c91a1879
--- /dev/null
+++ b/spring-5/src/main/java/com/baeldung/SpringSecurity5Application.java
@@ -0,0 +1,34 @@
+package com.baeldung;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.http.server.reactive.HttpHandler;
+import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
+import org.springframework.web.reactive.config.EnableWebFlux;
+import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
+import reactor.ipc.netty.NettyContext;
+import reactor.ipc.netty.http.server.HttpServer;
+
+@ComponentScan(basePackages = {"com.baeldung.security"})
+@EnableWebFlux
+public class SpringSecurity5Application {
+
+    public static void main(String[] args) {
+        try (AnnotationConfigApplicationContext context =
+                     new AnnotationConfigApplicationContext(SpringSecurity5Application.class)) {
+            context.getBean(NettyContext.class).onClose().block();
+        }
+    }
+
+    @Bean
+    public NettyContext nettyContext(ApplicationContext context) {
+        HttpHandler handler = WebHttpHandlerBuilder.applicationContext(context)
+                .build();
+        ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler);
+        HttpServer httpServer = HttpServer.create("localhost", 8080);
+        return httpServer.newHandler(adapter).block();
+    }
+
+}
diff --git a/spring-5/src/main/java/com/baeldung/security/GreetController.java b/spring-5/src/main/java/com/baeldung/security/GreetController.java
new file mode 100644
index 0000000000..6b69e3bc9b
--- /dev/null
+++ b/spring-5/src/main/java/com/baeldung/security/GreetController.java
@@ -0,0 +1,37 @@
+package com.baeldung.security;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+
+import java.security.Principal;
+
+@RestController
+public class GreetController {
+
+    private GreetService greetService;
+
+    public GreetController(GreetService greetService) {
+        this.greetService = greetService;
+    }
+
+    @GetMapping("/")
+    public Mono<String> greet(Mono<Principal> principal) {
+        return principal
+                .map(Principal::getName)
+                .map(name -> String.format("Hello, %s", name));
+    }
+
+    @GetMapping("/admin")
+    public Mono<String> greetAdmin(Mono<Principal> principal) {
+        return principal
+                .map(Principal::getName)
+                .map(name -> String.format("Admin access: %s", name));
+    }
+
+    @GetMapping("/greetService")
+    public Mono<String> greetService() {
+        return greetService.greet();
+    }
+
+}
diff --git a/spring-5/src/main/java/com/baeldung/security/GreetService.java b/spring-5/src/main/java/com/baeldung/security/GreetService.java
new file mode 100644
index 0000000000..7622b360be
--- /dev/null
+++ b/spring-5/src/main/java/com/baeldung/security/GreetService.java
@@ -0,0 +1,15 @@
+package com.baeldung.security;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+@Service
+public class GreetService {
+
+    @PreAuthorize("hasRole('ADMIN')")
+    public Mono<String> greet() {
+        return Mono.just("Hello from service!");
+    }
+
+}
diff --git a/spring-5/src/main/java/com/baeldung/security/SecurityConfig.java b/spring-5/src/main/java/com/baeldung/security/SecurityConfig.java
new file mode 100644
index 0000000000..a9e44a2eee
--- /dev/null
+++ b/spring-5/src/main/java/com/baeldung/security/SecurityConfig.java
@@ -0,0 +1,42 @@
+package com.baeldung.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
+import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.web.server.SecurityWebFilterChain;
+
+@EnableWebFluxSecurity
+@EnableReactiveMethodSecurity
+public class SecurityConfig {
+
+    @Bean
+    public SecurityWebFilterChain securitygWebFilterChain(ServerHttpSecurity http) {
+        return http.authorizeExchange()
+                .pathMatchers("/admin").hasAuthority("ROLE_ADMIN")
+                .anyExchange().authenticated()
+                .and().formLogin()
+                .and().build();
+    }
+
+    @Bean
+    public MapReactiveUserDetailsService userDetailsService() {
+        UserDetails user = User.withDefaultPasswordEncoder()
+                .username("user")
+                .password("password")
+                .roles("USER")
+                .build();
+
+        UserDetails admin = User.withDefaultPasswordEncoder()
+                .username("admin")
+                .password("password")
+                .roles("ADMIN")
+                .build();
+
+        return new MapReactiveUserDetailsService(user, admin);
+    }
+
+}
diff --git a/spring-5/src/main/resources/application.properties b/spring-5/src/main/resources/application.properties
index 886ea1978b..ccec014c2b 100644
--- a/spring-5/src/main/resources/application.properties
+++ b/spring-5/src/main/resources/application.properties
@@ -1,6 +1,3 @@
 server.port=8081
 
-security.user.name=user
-security.user.password=pass
-
 logging.level.root=INFO
\ No newline at end of file
diff --git a/spring-5/src/test/java/com/baeldung/security/SecurityTest.java b/spring-5/src/test/java/com/baeldung/security/SecurityTest.java
new file mode 100644
index 0000000000..a1c940a17a
--- /dev/null
+++ b/spring-5/src/test/java/com/baeldung/security/SecurityTest.java
@@ -0,0 +1,48 @@
+package com.baeldung.security;
+
+import com.baeldung.SpringSecurity5Application;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = SpringSecurity5Application.class)
+public class SecurityTest {
+
+    @Autowired
+    ApplicationContext context;
+
+    private WebTestClient rest;
+
+    @Before
+    public void setup() {
+        this.rest = WebTestClient
+                .bindToApplicationContext(this.context)
+                .configureClient()
+                .build();
+    }
+
+    @Test
+    public void whenNoCredentials_thenRedirectToLogin() {
+        this.rest.get()
+                .uri("/")
+                .exchange()
+                .expectStatus().is3xxRedirection();
+    }
+
+    @Test
+    @WithMockUser
+    public void whenHasCredentials_thenSeesGreeting() {
+        this.rest.get()
+                .uri("/")
+                .exchange()
+                .expectStatus().isOk()
+                .expectBody(String.class).isEqualTo("Hello, user");
+    }
+}
diff --git a/spring-5/src/test/java/com/baeldung/web/client/WebTestClientTest.java b/spring-5/src/test/java/com/baeldung/web/client/WebTestClientTest.java
index b05f903b4b..43114b5b50 100644
--- a/spring-5/src/test/java/com/baeldung/web/client/WebTestClientTest.java
+++ b/spring-5/src/test/java/com/baeldung/web/client/WebTestClientTest.java
@@ -53,7 +53,7 @@ public class WebTestClientTest {
             .uri("/resource")
             .exchange()
             .expectStatus()
-            .is4xxClientError()
+            .is3xxRedirection()
             .expectBody();
     }
 

From 408cf8476e02063b93f3f243dcaf24993844b9d9 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Fri, 17 Nov 2017 21:47:05 +0100
Subject: [PATCH 50/72] Update README.md (#3051)

---
 libraries/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/README.md b/libraries/README.md
index 65ef79f45b..1b6cbf2735 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -39,7 +39,6 @@
 - [Introduction to Apache Commons CSV](http://www.baeldung.com/apache-commons-csv)
 - [Difference Between Two Dates in Java](http://www.baeldung.com/java-date-difference)
 - [Introduction to NoException](http://www.baeldung.com/no-exception)
-- [Introduction to FunctionalJava](http://www.baeldung.com/functional-java)
 - [Apache Commons IO](http://www.baeldung.com/apache-commons-io)
 - [Introduction to Conflict-Free Replicated Data Types](http://www.baeldung.com/java-conflict-free-replicated-data-types)
 - [Introduction to javax.measure](http://www.baeldung.com/javax-measure)

From f8fa52a6c747ac46e2c38ae96d1556730dd7c2a8 Mon Sep 17 00:00:00 2001
From: KevinGilmore <kpg102@gmail.com>
Date: Sat, 18 Nov 2017 09:38:07 -0600
Subject: [PATCH 51/72] BAEL-719 Spring Cloud Stream README (#3074)

* BAEL-973: updated README

* BAEL-1069: Updated README

* BAEL-817: add README file

* BAEL-1084: README update

* BAEL-960: Update README

* BAEL-1155: updated README

* BAEL-1041: updated README

* BAEL-973: Updated README

* BAEL-1187: updated README

* BAEL-1183: Update README

* BAEL-1133: Updated README

* BAEL-1098: README update

* BAEL-719: add README.md
---
 spring-cloud/spring-cloud-stream/README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 spring-cloud/spring-cloud-stream/README.md

diff --git a/spring-cloud/spring-cloud-stream/README.md b/spring-cloud/spring-cloud-stream/README.md
new file mode 100644
index 0000000000..5ecb852df5
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Introduction to Spring Cloud Stream](http://www.baeldung.com/spring-cloud-stream)

From f7e92e326f5d80bad152d8ebe3ff2bd3650a9ce3 Mon Sep 17 00:00:00 2001
From: Ahmad Alsanie <ahmad.alsanie92@gmail.com>
Date: Sat, 18 Nov 2017 19:45:37 +0200
Subject: [PATCH 52/72] BAEL-1308

---
 .../com/baeldung/copyfiles/FileCopier.java    | 40 ++++++++++++++++++
 .../baeldung/copyfiles/FileCopierTest.java    | 41 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/copyfiles/FileCopier.java
 create mode 100644 core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java

diff --git a/core-java/src/main/java/com/baeldung/copyfiles/FileCopier.java b/core-java/src/main/java/com/baeldung/copyfiles/FileCopier.java
new file mode 100644
index 0000000000..0841cd67a3
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/copyfiles/FileCopier.java
@@ -0,0 +1,40 @@
+package com.baeldung.copyfiles;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+
+import org.apache.commons.io.FileUtils;
+
+public class FileCopier {
+	public static File copyWithIO(File original, File copied) throws IOException {
+		try (InputStream in = new BufferedInputStream(new FileInputStream(original));
+				OutputStream out = new BufferedOutputStream(new FileOutputStream(copied))) {
+			byte[] buffer = new byte[1024];
+			int lengthRead;
+			while ((lengthRead = in.read(buffer)) > 0) {
+				out.write(buffer, 0, lengthRead);
+				out.flush();
+			}
+		}
+		return copied;
+	}
+
+	public static Path copyWithNio(Path original, Path copied) throws IOException {
+		Files.copy(original, copied, StandardCopyOption.REPLACE_EXISTING);
+		return copied;
+	}
+
+	public static File copyWithCommonsIO(File original, File copied) throws IOException {
+		FileUtils.copyFile(original, copied);
+		return copied;
+	}
+}
diff --git a/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java b/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
new file mode 100644
index 0000000000..72eaaa9bdb
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.copyfiles;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.Test;
+
+public class FileCopierTest {
+
+	@Test
+	public void givenIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+		File copied = new File("src/test/resources/copiedWithIo.txt");
+		File original = new File("src/test/resources/original.txt");
+		copied = FileCopier.copyWithIO(original, copied);
+		assertTrue(copied.exists());
+		assertTrue(Files.readAllLines(original.toPath()).equals(Files.readAllLines(copied.toPath())));
+	}
+
+	@Test
+	public void givenCommonsIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+		File copied = new File("src/test/resources/copiedWithApacheCommons.txt");
+		File original = new File("src/test/resources/original.txt");
+		copied = FileCopier.copyWithCommonsIO(original, copied);
+		assertTrue(copied.exists());
+		assertTrue(Files.readAllLines(original.toPath()).equals(Files.readAllLines(copied.toPath())));
+	}
+
+	@Test
+	public void givenNIO2_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+		Path copied = Paths.get("src/test/resources/copiedWithNio.txt");
+		Path original = Paths.get("src/test/resources/original.txt");
+		copied = FileCopier.copyWithNio(original, copied);
+		assertTrue(Files.exists(copied));
+		assertTrue(Files.readAllLines(original).equals(Files.readAllLines(copied)));
+	}
+}

From 8b2d647eeccade082df78c5f517b10163b62873f Mon Sep 17 00:00:00 2001
From: Ahmad Alsanie <ahmad.alsanie92@gmail.com>
Date: Sat, 18 Nov 2017 20:40:52 +0200
Subject: [PATCH 53/72] BAEL-1308 - test modifications

---
 .../baeldung/copyfiles/FileCopierTest.java    | 57 +++++++++++--------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java b/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
index 72eaaa9bdb..9c95dcec47 100644
--- a/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
+++ b/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
@@ -8,34 +8,41 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import org.junit.Before;
 import org.junit.Test;
 
 public class FileCopierTest {
+    File original =new File("src/test/resources/original.txt");
+    @Before
+    public void init() throws IOException{
+        if(!original.exists())
+            Files.createFile(original.toPath());
+    }
+    @Test
+    public void givenIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+        File copied = new File("src/test/resources/copiedWithIo.txt");
+        copied = FileCopier.copyWithIO(original, copied);
+        assertTrue(copied.exists());
+        assertTrue(Files.readAllLines(original.toPath())
+            .equals(Files.readAllLines(copied.toPath())));
+    }
 
-	@Test
-	public void givenIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
-		File copied = new File("src/test/resources/copiedWithIo.txt");
-		File original = new File("src/test/resources/original.txt");
-		copied = FileCopier.copyWithIO(original, copied);
-		assertTrue(copied.exists());
-		assertTrue(Files.readAllLines(original.toPath()).equals(Files.readAllLines(copied.toPath())));
-	}
+    @Test
+    public void givenCommonsIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+        File copied = new File("src/test/resources/copiedWithApacheCommons.txt");
+        copied = FileCopier.copyWithCommonsIO(original, copied);
+        assertTrue(copied.exists());
+        assertTrue(Files.readAllLines(original.toPath())
+            .equals(Files.readAllLines(copied.toPath())));
+    }
 
-	@Test
-	public void givenCommonsIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
-		File copied = new File("src/test/resources/copiedWithApacheCommons.txt");
-		File original = new File("src/test/resources/original.txt");
-		copied = FileCopier.copyWithCommonsIO(original, copied);
-		assertTrue(copied.exists());
-		assertTrue(Files.readAllLines(original.toPath()).equals(Files.readAllLines(copied.toPath())));
-	}
-
-	@Test
-	public void givenNIO2_whenCopied_thenCopyExistsWithSameContents() throws IOException {
-		Path copied = Paths.get("src/test/resources/copiedWithNio.txt");
-		Path original = Paths.get("src/test/resources/original.txt");
-		copied = FileCopier.copyWithNio(original, copied);
-		assertTrue(Files.exists(copied));
-		assertTrue(Files.readAllLines(original).equals(Files.readAllLines(copied)));
-	}
+    @Test
+    public void givenNIO2_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+        Path copied = Paths.get("src/test/resources/copiedWithNio.txt");
+        Path originalPath = original.toPath();
+        copied = FileCopier.copyWithNio(originalPath, copied);
+        assertTrue(Files.exists(copied));
+        assertTrue(Files.readAllLines(originalPath)
+            .equals(Files.readAllLines(copied)));
+    }
 }

From 375d7373ea64de4785acf06525b395c7198064e6 Mon Sep 17 00:00:00 2001
From: chrisoberle <chrisoberle@users.noreply.github.com>
Date: Sat, 18 Nov 2017 17:15:11 -0500
Subject: [PATCH 54/72] move datasource routing example to spring-jpa module
 (#3076)

---
 .../src/main/java/org/baeldung/dsrouting/ClientDao.java           | 0
 .../main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java  | 0
 .../src/main/java/org/baeldung/dsrouting/ClientDatabase.java      | 0
 .../java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java  | 0
 .../src/main/java/org/baeldung/dsrouting/ClientService.java       | 0
 .../org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java  | 0
 .../baeldung/dsrouting/DataSourceRoutingTestConfiguration.java    | 0
 {spring-boot => spring-jpa}/src/test/resources/dsrouting-db.sql   | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename {spring-boot => spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientDao.java (100%)
 rename {spring-boot => spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java (100%)
 rename {spring-boot => spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientDatabase.java (100%)
 rename {spring-boot => spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java (100%)
 rename {spring-boot => spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientService.java (100%)
 rename {spring-boot => spring-jpa}/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java (100%)
 rename {spring-boot => spring-jpa}/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java (100%)
 rename {spring-boot => spring-jpa}/src/test/resources/dsrouting-db.sql (100%)

diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDao.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDao.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientDao.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDao.java
diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java
diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabase.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabase.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabase.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabase.java
diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java
diff --git a/spring-boot/src/main/java/org/baeldung/dsrouting/ClientService.java b/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientService.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/dsrouting/ClientService.java
rename to spring-jpa/src/main/java/org/baeldung/dsrouting/ClientService.java
diff --git a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java
similarity index 100%
rename from spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java
rename to spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java
diff --git a/spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java b/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
similarity index 100%
rename from spring-boot/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
rename to spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java
diff --git a/spring-boot/src/test/resources/dsrouting-db.sql b/spring-jpa/src/test/resources/dsrouting-db.sql
similarity index 100%
rename from spring-boot/src/test/resources/dsrouting-db.sql
rename to spring-jpa/src/test/resources/dsrouting-db.sql

From 81aecd936da674af1dbcf83e92407c229b4f1899 Mon Sep 17 00:00:00 2001
From: Rokon Uddin Ahmed <cody70506@gmail.com>
Date: Sun, 19 Nov 2017 12:28:47 +0600
Subject: [PATCH 55/72] Pull request (#3079)

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Create README.md

* Update README.md

* Update README.md

* Update README.md
---
 testing-modules/mockito/README.md | 1 +
 testing-modules/testing/README.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/testing-modules/mockito/README.md b/testing-modules/mockito/README.md
index 2407a5c3c5..0d6f69a64f 100644
--- a/testing-modules/mockito/README.md
+++ b/testing-modules/mockito/README.md
@@ -11,3 +11,4 @@
 - [Mockito’s Mock Methods](http://www.baeldung.com/mockito-mock-methods)
 - [Introduction to PowerMock](http://www.baeldung.com/intro-to-powermock)
 - [Mocking Exception Throwing using Mockito](http://www.baeldung.com/mockito-exceptions)
+- [Mocking Void Methods with Mockito](http://www.baeldung.com/mockito-void-methods)
diff --git a/testing-modules/testing/README.md b/testing-modules/testing/README.md
index 889f6706d4..143cb792cf 100644
--- a/testing-modules/testing/README.md
+++ b/testing-modules/testing/README.md
@@ -15,3 +15,4 @@
 - [Cucumber Java 8 Support](http://www.baeldung.com/cucumber-java-8-support)
 - [Introduction to Lambda Behave](http://www.baeldung.com/lambda-behave)
 - [Introduction to Jukito](http://www.baeldung.com/jukito)
+- [Custom JUnit 4 Test Runners](http://www.baeldung.com/junit-4-custom-runners)

From d9608d20a22907ac4ccd49c7b9e6465ed7916709 Mon Sep 17 00:00:00 2001
From: Holger Steinhauer <hlibrenz@gmail.com>
Date: Sun, 19 Nov 2017 18:02:25 +0000
Subject: [PATCH 56/72] BAEL-1317: Display All Time Zones With GMT and UTC

---
 .../timezonedisplay/TimezoneDisplay.java      | 50 +++++++++++++++++++
 .../timezonedisplay/TimezoneDisplayApp.java   | 19 +++++++
 2 files changed, 69 insertions(+)
 create mode 100644 core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java

diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
new file mode 100644
index 0000000000..296f8b82f8
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
@@ -0,0 +1,50 @@
+package com.baeldung.timezonedisplay;
+
+import sun.util.calendar.ZoneInfo;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.stream.Collectors;
+
+public class TimezoneDisplay {
+
+    public enum OffsetBase {
+        GMT, UTC
+    }
+
+    public List<String> compileListFor(OffsetBase base) {
+        Set<String> availableZoneIds = ZoneId.getAvailableZoneIds();
+
+        LocalDateTime now = LocalDateTime.now();
+        return availableZoneIds
+          .stream()
+          .map(ZoneId::of)
+          .sorted(new ZoneComparator())
+          .map(id -> String.format("(%s%s) %s", base, getOffset(now, id), id.getId()))
+          .collect(Collectors.toList());
+    }
+
+    private String getOffset(LocalDateTime dateTime, ZoneId id) {
+        return dateTime
+          .atZone(id)
+          .getOffset()
+          .getId()
+          .replace("Z", "+00:00");
+    }
+
+    private class ZoneComparator implements Comparator<ZoneId> {
+
+        @Override
+        public int compare(ZoneId zoneId1, ZoneId zoneId2) {
+            TimeZone tz1 = ZoneInfo.getTimeZone(zoneId1);
+            TimeZone tz2 = ZoneInfo.getTimeZone(zoneId2);
+
+            return Integer.compare(tz1.getRawOffset(), tz2.getRawOffset());
+        }
+    }
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
new file mode 100644
index 0000000000..42a7a2ba85
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
@@ -0,0 +1,19 @@
+package com.baeldung.timezonedisplay;
+
+import java.util.List;
+
+public class TimezoneDisplayApp {
+
+    public static void main(String... args) {
+        TimezoneDisplay display = new TimezoneDisplay();
+
+        System.out.println("Time zones in UTC:");
+        List<String> utc = display.compileListFor(TimezoneDisplay.OffsetBase.UTC);
+        utc.forEach(System.out::println);
+
+        System.out.println("Time zones in GMT:");
+        List<String> gmt = display.compileListFor(TimezoneDisplay.OffsetBase.GMT);
+        gmt.forEach(System.out::println);
+    }
+
+}

From 232d2d8e81a8f08b1008de8c78cc1818d193a6cf Mon Sep 17 00:00:00 2001
From: Holger Steinhauer <hlibrenz@gmail.com>
Date: Sun, 19 Nov 2017 18:08:35 +0000
Subject: [PATCH 57/72] BAEL-1317: Display All Time Zones With GMT and UTC

---
 .../timezonedisplay/TimezoneDisplay.java        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
index 296f8b82f8..ff618c8eea 100644
--- a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
+++ b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
@@ -1,13 +1,11 @@
 package com.baeldung.timezonedisplay;
 
-import sun.util.calendar.ZoneInfo;
-
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
-import java.util.TimeZone;
 import java.util.stream.Collectors;
 
 public class TimezoneDisplay {
@@ -40,10 +38,17 @@ public class TimezoneDisplay {
 
         @Override
         public int compare(ZoneId zoneId1, ZoneId zoneId2) {
-            TimeZone tz1 = ZoneInfo.getTimeZone(zoneId1);
-            TimeZone tz2 = ZoneInfo.getTimeZone(zoneId2);
+            LocalDateTime now = LocalDateTime.now();
 
-            return Integer.compare(tz1.getRawOffset(), tz2.getRawOffset());
+            ZoneOffset offset1 = now
+              .atZone(zoneId1)
+              .getOffset();
+
+            ZoneOffset offset2 = now
+              .atZone(zoneId2)
+              .getOffset();
+
+            return offset1.compareTo(offset2);
         }
     }
 

From 2a9570cc1faf15ade29c1967b4f71a6754072932 Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <electricalweb@yahoo.com.ar>
Date: Sun, 19 Nov 2017 16:45:54 -0300
Subject: [PATCH 58/72] Implementing the Template Method Pattern in Java -
 BAEL-1289 (#3078)

* Initial Commit

* Added Domain Classes

* Update HighEndComputer.java

* Update StandardComputer.java

* Update TemplateMethodPatternTest.java

* Update parent pom.xml

* Update pom.xml in template-method submodule

* Update readme.md

* Update README.md
---
 patterns/README.md               |  1 +
 patterns/pom.xml                 |  3 ++-
 patterns/template-method/pom.xml | 30 +++++++++++++++++++++++-------
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/patterns/README.md b/patterns/README.md
index bcd54a64b1..67d84154cb 100644
--- a/patterns/README.md
+++ b/patterns/README.md
@@ -1,3 +1,4 @@
 ###Relevant Articles:
 - [A Guide to the Front Controller Pattern in Java](http://www.baeldung.com/java-front-controller-pattern)
 - [Introduction to Intercepting Filter Pattern in Java](http://www.baeldung.com/intercepting-filter-pattern-in-java)
+- [Implementing the Template Method Pattern in Java](http://www.baeldung.com/template-method-pattern-in-java)
diff --git a/patterns/pom.xml b/patterns/pom.xml
index c40d7c58b7..68e5316f64 100644
--- a/patterns/pom.xml
+++ b/patterns/pom.xml
@@ -9,6 +9,7 @@
     <modules>
         <module>front-controller</module>
         <module>intercepting-filter</module>
+        <module>template-method</module>
     </modules>
 
     <parent>
@@ -51,4 +52,4 @@
         <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
         <jetty-maven-plugin.version>9.4.0.v20161208</jetty-maven-plugin.version>
     </properties>
-</project>
+</project>
\ No newline at end of file
diff --git a/patterns/template-method/pom.xml b/patterns/template-method/pom.xml
index c3b6a084ac..4b863fe0a4 100644
--- a/patterns/template-method/pom.xml
+++ b/patterns/template-method/pom.xml
@@ -1,15 +1,17 @@
 <?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.templatemethodpattern</groupId>
-    <artifactId>templatemethodpattern</artifactId>
+    <groupId>com.baeldung.templatemethod</groupId>
+    <artifactId>template-method</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
+    <parent>
+        <groupId>com.baeldung.patterns</groupId>
+	   <artifactId>patterns-parent</artifactId>
+	   <version>1.0.0-SNAPSHOT</version>
+	   <relativePath>..</relativePath>
+    </parent>	
+   
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -18,4 +20,18 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>	
 </project>
\ No newline at end of file

From e2202f0285c1b431adb1448d450577d79b670206 Mon Sep 17 00:00:00 2001
From: Eric Goebelbecker <egoebelbecker@users.noreply.github.com>
Date: Sun, 19 Nov 2017 14:47:03 -0500
Subject: [PATCH 59/72] BAEL-1182 - mocking final classes and methods with
 Mockito (#3083)

---
 .../java/org/baeldung/mockito/FinalList.java  | 10 ++++++
 .../java/org/baeldung/mockito/MockFinals.java | 35 +++++++++++++++++++
 .../java/org/baeldung/mockito/MyList.java     |  3 ++
 .../org.mockito.plugins.MockMaker             |  1 +
 4 files changed, 49 insertions(+)
 create mode 100644 testing-modules/mockito/src/test/java/org/baeldung/mockito/FinalList.java
 create mode 100644 testing-modules/mockito/src/test/java/org/baeldung/mockito/MockFinals.java
 create mode 100644 testing-modules/mockito/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/FinalList.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/FinalList.java
new file mode 100644
index 0000000000..3824de619c
--- /dev/null
+++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/FinalList.java
@@ -0,0 +1,10 @@
+package org.baeldung.mockito;
+
+public class FinalList extends MyList {
+
+  @Override
+  public int size() {
+    return 1;
+  }
+
+}
diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockFinals.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockFinals.java
new file mode 100644
index 0000000000..5f064e1355
--- /dev/null
+++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockFinals.java
@@ -0,0 +1,35 @@
+package org.baeldung.mockito;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class MockFinals {
+
+      @Test
+      public void whenMockFinalClassMockWorks() {
+
+        FinalList finalList = new FinalList();
+
+        FinalList mock = mock(FinalList.class);
+        when(mock.size()).thenReturn(2);
+
+        assertNotEquals(mock.size(), finalList.size());
+
+      }
+
+    @Test
+    public void whenMockFinalMethodMockWorks() {
+
+      MyList myList = new MyList();
+
+      MyList mock = mock(MyList.class);
+      when(mock.finalMethod()).thenReturn(1);
+
+      assertNotEquals(mock.finalMethod(), myList.finalMethod());
+    }
+
+
+  }
diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MyList.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MyList.java
index 0b501225ad..4fcddb3164 100644
--- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MyList.java
+++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MyList.java
@@ -19,4 +19,7 @@ class MyList extends AbstractList<String> {
         // no-op
     }
 
+    final public int finalMethod() {
+        return 0;
+    }
 }
diff --git a/testing-modules/mockito/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/testing-modules/mockito/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000..ca6ee9cea8
--- /dev/null
+++ b/testing-modules/mockito/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file

From 621115406298bf2e647595046c1b24d96823b8d0 Mon Sep 17 00:00:00 2001
From: abialas <abialas@universal-soft.com>
Date: Sun, 19 Nov 2017 22:03:09 +0100
Subject: [PATCH 60/72] Bael 1344 (#3068)

* BAEL-1344 add java8 convert methods date, localdate, localdatetime

* BAEL-1344 add java9 example
---
 .../datetime/DateToLocalDateConverter.java    | 35 +++++++++
 .../DateToLocalDateTimeConverter.java         | 35 +++++++++
 .../LocalDateTimeToDateConverter.java         | 27 +++++++
 .../datetime/LocalDateToDateConverter.java    | 28 +++++++
 .../DateToLocalDateConverterTest.java         | 72 +++++++++++++++++
 .../DateToLocalDateTimeConverterTest.java     | 78 +++++++++++++++++++
 .../LocalDateTimeToDateConverterTest.java     | 61 +++++++++++++++
 .../LocalDateToDateConverterTest.java         | 55 +++++++++++++
 .../datetime/DateToLocalDateConverter.java    | 22 ++++++
 .../DateToLocalDateTimeConverter.java         | 22 ++++++
 .../DateToLocalDateConverterTest.java         | 41 ++++++++++
 .../DateToLocalDateTimeConverterTest.java     | 43 ++++++++++
 12 files changed, 519 insertions(+)
 create mode 100644 core-java-8/src/main/java/com/baeldung/datetime/DateToLocalDateConverter.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/datetime/DateToLocalDateTimeConverter.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/datetime/LocalDateTimeToDateConverter.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/datetime/LocalDateToDateConverter.java
 create mode 100644 core-java-8/src/test/java/com/baeldung/datetime/DateToLocalDateConverterTest.java
 create mode 100644 core-java-8/src/test/java/com/baeldung/datetime/DateToLocalDateTimeConverterTest.java
 create mode 100644 core-java-8/src/test/java/com/baeldung/datetime/LocalDateTimeToDateConverterTest.java
 create mode 100644 core-java-8/src/test/java/com/baeldung/datetime/LocalDateToDateConverterTest.java
 create mode 100644 core-java-9/src/main/java/com/baeldung/java9/datetime/DateToLocalDateConverter.java
 create mode 100644 core-java-9/src/main/java/com/baeldung/java9/datetime/DateToLocalDateTimeConverter.java
 create mode 100644 core-java-9/src/test/java/com/baeldung/java9/datetime/DateToLocalDateConverterTest.java
 create mode 100644 core-java-9/src/test/java/com/baeldung/java9/datetime/DateToLocalDateTimeConverterTest.java

diff --git a/core-java-8/src/main/java/com/baeldung/datetime/DateToLocalDateConverter.java b/core-java-8/src/main/java/com/baeldung/datetime/DateToLocalDateConverter.java
new file mode 100644
index 0000000000..8788aac747
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/datetime/DateToLocalDateConverter.java
@@ -0,0 +1,35 @@
+/**
+ * 
+ */
+package com.baeldung.datetime;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+
+/**
+ * Class which shows different ways of converting java.util.Date into java.time.LocalDate.
+ * 
+ * @author abialas
+ *
+ */
+public class DateToLocalDateConverter {
+
+    public static LocalDate convertToLocalDateViaInstant(Date dateToConvert) {
+        return dateToConvert.toInstant()
+            .atZone(ZoneId.systemDefault())
+            .toLocalDate();
+    }
+
+    public static LocalDate convertToLocalDateViaSqlDate(Date dateToConvert) {
+        return new java.sql.Date(dateToConvert.getTime()).toLocalDate();
+    }
+
+    public static LocalDate convertToLocalDateViaMilisecond(Date dateToConvert) {
+        return Instant.ofEpochMilli(dateToConvert.getTime())
+            .atZone(ZoneId.systemDefault())
+            .toLocalDate();
+    }
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/datetime/DateToLocalDateTimeConverter.java b/core-java-8/src/main/java/com/baeldung/datetime/DateToLocalDateTimeConverter.java
new file mode 100644
index 0000000000..f994023526
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/datetime/DateToLocalDateTimeConverter.java
@@ -0,0 +1,35 @@
+/**
+ * 
+ */
+package com.baeldung.datetime;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+
+/**
+ * Class which shows different ways of converting java.util.Date into java.time.LocalDateTime. 
+ * 
+ * @author abialas
+ *
+ */
+public class DateToLocalDateTimeConverter {
+
+    public static LocalDateTime convertToLocalDateTimeViaInstant(Date dateToConvert) {
+        return dateToConvert.toInstant()
+            .atZone(ZoneId.systemDefault())
+            .toLocalDateTime();
+    }
+
+    public static LocalDateTime convertToLocalDateTimeViaSqlTimestamp(Date dateToConvert) {
+        return new java.sql.Timestamp(dateToConvert.getTime()).toLocalDateTime();
+    }
+
+    public static LocalDateTime convertToLocalDateTimeViaMilisecond(Date dateToConvert) {
+        return Instant.ofEpochMilli(dateToConvert.getTime())
+            .atZone(ZoneId.systemDefault())
+            .toLocalDateTime();
+    }
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/datetime/LocalDateTimeToDateConverter.java b/core-java-8/src/main/java/com/baeldung/datetime/LocalDateTimeToDateConverter.java
new file mode 100644
index 0000000000..ef72c8b4fb
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/datetime/LocalDateTimeToDateConverter.java
@@ -0,0 +1,27 @@
+/**
+ * 
+ */
+package com.baeldung.datetime;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+
+/**
+ * Class which shows different ways of converting java.time.LocalDateTime into java.util.Date. 
+ *  
+ * @author abialas
+ *
+ */
+public class LocalDateTimeToDateConverter {
+
+    public static Date convertToDateViaSqlTimestamp(LocalDateTime dateToConvert) {
+        return java.sql.Timestamp.valueOf(dateToConvert);
+    }
+
+    public static Date convertToDateViaInstant(LocalDateTime dateToConvert) {
+        return java.util.Date.from(dateToConvert.atZone(ZoneId.systemDefault())
+            .toInstant());
+    }
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/datetime/LocalDateToDateConverter.java b/core-java-8/src/main/java/com/baeldung/datetime/LocalDateToDateConverter.java
new file mode 100644
index 0000000000..8050815799
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/datetime/LocalDateToDateConverter.java
@@ -0,0 +1,28 @@
+/**
+ * 
+ */
+package com.baeldung.datetime;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+
+/**
+ * Class which shows different ways of converting java.time.LocalDate into java.util.Date. 
+ *  
+ * @author abialas
+ *
+ */
+public class LocalDateToDateConverter {
+
+    public static Date convertToDateViaSqlDate(LocalDate dateToConvert) {
+        return java.sql.Date.valueOf(dateToConvert);
+    }
+
+    public static Date convertToDateViaInstant(LocalDate dateToConvert) {
+        return java.util.Date.from(dateToConvert.atStartOfDay()
+            .atZone(ZoneId.systemDefault())
+            .toInstant());
+    }
+
+}
diff --git a/core-java-8/src/test/java/com/baeldung/datetime/DateToLocalDateConverterTest.java b/core-java-8/src/test/java/com/baeldung/datetime/DateToLocalDateConverterTest.java
new file mode 100644
index 0000000000..5de6ae3e59
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/datetime/DateToLocalDateConverterTest.java
@@ -0,0 +1,72 @@
+/**
+ * 
+ */
+package com.baeldung.datetime;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.LocalDate;
+import java.time.temporal.ChronoField;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.junit.Test;
+
+/**
+ * 
+ * JUnits for {@link DateToLocalDateConverter} class.
+ * 
+ * @author abialas
+ *
+ */
+public class DateToLocalDateConverterTest {
+
+    @Test
+    public void shouldReturn10thNovember2010WhenConvertViaInstant() {
+        // given
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2010, 10, 10);
+        Date dateToConvert = calendar.getTime();
+
+        // when
+        LocalDate localDate = DateToLocalDateConverter.convertToLocalDateViaInstant(dateToConvert);
+
+        // then
+        assertEquals(2010, localDate.get(ChronoField.YEAR));
+        assertEquals(11, localDate.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(10, localDate.get(ChronoField.DAY_OF_MONTH));
+    }
+
+    @Test
+    public void shouldReturn10thNovember2010WhenConvertViaMiliseconds() {
+        // given
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2010, 10, 10);
+        Date dateToConvert = calendar.getTime();
+
+        // when
+        LocalDate localDate = DateToLocalDateConverter.convertToLocalDateViaMilisecond(dateToConvert);
+
+        // then
+        assertEquals(2010, localDate.get(ChronoField.YEAR));
+        assertEquals(11, localDate.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(10, localDate.get(ChronoField.DAY_OF_MONTH));
+    }
+
+    @Test
+    public void shouldReturn10thNovember2010WhenConvertViaSqlDate() {
+        // given
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2010, 10, 10);
+        Date dateToConvert = calendar.getTime();
+
+        // when
+        LocalDate localDate = DateToLocalDateConverter.convertToLocalDateViaSqlDate(dateToConvert);
+
+        // then
+        assertEquals(2010, localDate.get(ChronoField.YEAR));
+        assertEquals(11, localDate.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(10, localDate.get(ChronoField.DAY_OF_MONTH));
+    }
+
+}
diff --git a/core-java-8/src/test/java/com/baeldung/datetime/DateToLocalDateTimeConverterTest.java b/core-java-8/src/test/java/com/baeldung/datetime/DateToLocalDateTimeConverterTest.java
new file mode 100644
index 0000000000..6d8fb8ea93
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/datetime/DateToLocalDateTimeConverterTest.java
@@ -0,0 +1,78 @@
+/**
+ * 
+ */
+package com.baeldung.datetime;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoField;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.junit.Test;
+
+/**
+ * 
+ * JUnits for {@link DateToLocalDateTimeConverter} class.
+ * 
+ * @author abialas
+ *
+ */
+public class DateToLocalDateTimeConverterTest {
+
+    @Test
+    public void shouldReturn10thNovember2010time8hour20minWhenConvertViaInstant() {
+        // given
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2010, 10, 10, 8, 20);
+        Date dateToConvert = calendar.getTime();
+
+        // when
+        LocalDateTime localDateTime = DateToLocalDateTimeConverter.convertToLocalDateTimeViaInstant(dateToConvert);
+
+        // then
+        assertEquals(2010, localDateTime.get(ChronoField.YEAR));
+        assertEquals(11, localDateTime.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(10, localDateTime.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(8, localDateTime.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(20, localDateTime.get(ChronoField.MINUTE_OF_HOUR));
+    }
+
+    @Test
+    public void shouldReturn10thNovember2010time8hour20minWhenConvertViaMiliseconds() {
+        // given
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2010, 10, 10, 8, 20);
+        Date dateToConvert = calendar.getTime();
+
+        // when
+        LocalDateTime localDateTime = DateToLocalDateTimeConverter.convertToLocalDateTimeViaMilisecond(dateToConvert);
+
+        // then
+        assertEquals(2010, localDateTime.get(ChronoField.YEAR));
+        assertEquals(11, localDateTime.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(10, localDateTime.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(8, localDateTime.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(20, localDateTime.get(ChronoField.MINUTE_OF_HOUR));
+    }
+
+    @Test
+    public void shouldReturn10thNovember2010time8hour20minWhenConvertViaSqlTimestamp() {
+        // given
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2010, 10, 10, 8, 20);
+        Date dateToConvert = calendar.getTime();
+
+        // when
+        LocalDateTime localDateTime = DateToLocalDateTimeConverter.convertToLocalDateTimeViaSqlTimestamp(dateToConvert);
+
+        // then
+        assertEquals(2010, localDateTime.get(ChronoField.YEAR));
+        assertEquals(11, localDateTime.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(10, localDateTime.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(8, localDateTime.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(20, localDateTime.get(ChronoField.MINUTE_OF_HOUR));
+    }
+
+}
diff --git a/core-java-8/src/test/java/com/baeldung/datetime/LocalDateTimeToDateConverterTest.java b/core-java-8/src/test/java/com/baeldung/datetime/LocalDateTimeToDateConverterTest.java
new file mode 100644
index 0000000000..519fa69f04
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/datetime/LocalDateTimeToDateConverterTest.java
@@ -0,0 +1,61 @@
+/**
+ * 
+ */
+package com.baeldung.datetime;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.LocalDateTime;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.junit.Test;
+
+/**
+ * 
+ * JUnits for {@link LocalDateTimeToDateConverter} class.
+ * 
+ * @author abialas
+ *
+ */
+public class LocalDateTimeToDateConverterTest {
+
+    @Test
+    public void shouldReturn10thNovember2010time8hour20minWhenConvertViaInstant() {
+        // given
+        LocalDateTime dateToConvert = LocalDateTime.of(2010, 11, 10, 8, 20);
+
+        // when
+        Date date = LocalDateTimeToDateConverter.convertToDateViaInstant(dateToConvert);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+
+        // then
+        assertEquals(2010, calendar.get(Calendar.YEAR));
+        assertEquals(10, calendar.get(Calendar.MONTH));
+        assertEquals(10, calendar.get(Calendar.DAY_OF_MONTH));
+        assertEquals(8, calendar.get(Calendar.HOUR));
+        assertEquals(20, calendar.get(Calendar.MINUTE));
+        assertEquals(0, calendar.get(Calendar.SECOND));
+    }
+
+    @Test
+    public void shouldReturn10thNovember2010WhenConvertViaSqlTimestamp() {
+        // given
+        LocalDateTime dateToConvert = LocalDateTime.of(2010, 11, 10, 8, 20);
+
+        // when
+        Date date = LocalDateTimeToDateConverter.convertToDateViaSqlTimestamp(dateToConvert);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+
+        // then
+        assertEquals(2010, calendar.get(Calendar.YEAR));
+        assertEquals(10, calendar.get(Calendar.MONTH));
+        assertEquals(10, calendar.get(Calendar.DAY_OF_MONTH));
+        assertEquals(8, calendar.get(Calendar.HOUR));
+        assertEquals(20, calendar.get(Calendar.MINUTE));
+        assertEquals(0, calendar.get(Calendar.SECOND));
+    }
+
+}
diff --git a/core-java-8/src/test/java/com/baeldung/datetime/LocalDateToDateConverterTest.java b/core-java-8/src/test/java/com/baeldung/datetime/LocalDateToDateConverterTest.java
new file mode 100644
index 0000000000..c1da3af052
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/datetime/LocalDateToDateConverterTest.java
@@ -0,0 +1,55 @@
+/**
+ * 
+ */
+package com.baeldung.datetime;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.LocalDate;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.junit.Test;
+
+/**
+ * 
+ * JUnits for {@link LocalDateToDateConverter} class.
+ * 
+ * @author abialas
+ *
+ */
+public class LocalDateToDateConverterTest {
+
+    @Test
+    public void shouldReturn10thNovember2010WhenConvertViaInstant() {
+        // given
+        LocalDate dateToConvert = LocalDate.of(2010, 11, 10);
+
+        // when
+        Date date = LocalDateToDateConverter.convertToDateViaInstant(dateToConvert);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+
+        // then
+        assertEquals(2010, calendar.get(Calendar.YEAR));
+        assertEquals(10, calendar.get(Calendar.MONTH));
+        assertEquals(10, calendar.get(Calendar.DAY_OF_MONTH));
+    }
+
+    @Test
+    public void shouldReturn10thNovember2010WhenConvertViaSqlDate() {
+        // given
+        LocalDate dateToConvert = LocalDate.of(2010, 11, 10);
+
+        // when
+        Date date = LocalDateToDateConverter.convertToDateViaSqlDate(dateToConvert);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+
+        // then
+        assertEquals(2010, calendar.get(Calendar.YEAR));
+        assertEquals(10, calendar.get(Calendar.MONTH));
+        assertEquals(10, calendar.get(Calendar.DAY_OF_MONTH));
+    }
+
+}
diff --git a/core-java-9/src/main/java/com/baeldung/java9/datetime/DateToLocalDateConverter.java b/core-java-9/src/main/java/com/baeldung/java9/datetime/DateToLocalDateConverter.java
new file mode 100644
index 0000000000..bafa9ebff1
--- /dev/null
+++ b/core-java-9/src/main/java/com/baeldung/java9/datetime/DateToLocalDateConverter.java
@@ -0,0 +1,22 @@
+/**
+ * 
+ */
+package com.baeldung.java9.datetime;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+
+/**
+ * Class which shows a way to convert java.util.Date into java.time.LocalDate with new Java 1.9.
+ * 
+ * @author abialas
+ *
+ */
+public class DateToLocalDateConverter {
+
+    public static LocalDate convertToLocalDate(Date dateToConvert) {
+        return LocalDate.ofInstant(dateToConvert.toInstant(), ZoneId.systemDefault());
+    }
+
+}
diff --git a/core-java-9/src/main/java/com/baeldung/java9/datetime/DateToLocalDateTimeConverter.java b/core-java-9/src/main/java/com/baeldung/java9/datetime/DateToLocalDateTimeConverter.java
new file mode 100644
index 0000000000..538d5a9f63
--- /dev/null
+++ b/core-java-9/src/main/java/com/baeldung/java9/datetime/DateToLocalDateTimeConverter.java
@@ -0,0 +1,22 @@
+/**
+ * 
+ */
+package com.baeldung.java9.datetime;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+
+/**
+ * Class which shows a way to convert java.util.Date into java.time.LocalDateTime with new Java 1.9.
+ * 
+ * @author abialas
+ *
+ */
+public class DateToLocalDateTimeConverter {
+
+    public static LocalDateTime convertToLocalDateTime(Date dateToConvert) {
+        return LocalDateTime.ofInstant(dateToConvert.toInstant(), ZoneId.systemDefault());
+    }
+
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/datetime/DateToLocalDateConverterTest.java b/core-java-9/src/test/java/com/baeldung/java9/datetime/DateToLocalDateConverterTest.java
new file mode 100644
index 0000000000..2e0fb0dedd
--- /dev/null
+++ b/core-java-9/src/test/java/com/baeldung/java9/datetime/DateToLocalDateConverterTest.java
@@ -0,0 +1,41 @@
+/**
+ * 
+ */
+package com.baeldung.java9.datetime;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.LocalDate;
+import java.time.temporal.ChronoField;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.junit.Test;
+
+import com.baeldung.java9.datetime.DateToLocalDateConverter;
+
+/**
+ * JUnits for {@link DateToLocalDateConverter} class.
+ * 
+ * @author abialas
+ *
+ */
+public class DateToLocalDateConverterTest {
+
+    @Test
+    public void shouldReturn10thNovember2010WhenConvertToLocalDate() {
+        // given
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2010, 10, 10);
+        Date dateToConvert = calendar.getTime();
+
+        // when
+        LocalDate localDateTime = DateToLocalDateConverter.convertToLocalDate(dateToConvert);
+
+        // then
+        assertEquals(2010, localDateTime.get(ChronoField.YEAR));
+        assertEquals(11, localDateTime.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(10, localDateTime.get(ChronoField.DAY_OF_MONTH));
+    }
+
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/datetime/DateToLocalDateTimeConverterTest.java b/core-java-9/src/test/java/com/baeldung/java9/datetime/DateToLocalDateTimeConverterTest.java
new file mode 100644
index 0000000000..49988c8b33
--- /dev/null
+++ b/core-java-9/src/test/java/com/baeldung/java9/datetime/DateToLocalDateTimeConverterTest.java
@@ -0,0 +1,43 @@
+/**
+ * 
+ */
+package com.baeldung.java9.datetime;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoField;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.junit.Test;
+
+import com.baeldung.java9.datetime.DateToLocalDateTimeConverter;
+
+/**
+ * JUnits for {@link DateToLocalDateTimeConverter} class.
+ * 
+ * @author abialas
+ *
+ */
+public class DateToLocalDateTimeConverterTest {
+
+    @Test
+    public void shouldReturn10thNovember2010time8hour20minWhenConvertViaInstant() {
+        // given
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2010, 10, 10, 8, 20);
+        Date dateToConvert = calendar.getTime();
+
+        // when
+        LocalDateTime localDateTime = DateToLocalDateTimeConverter.convertToLocalDateTime(dateToConvert);
+
+        // then
+        assertEquals(2010, localDateTime.get(ChronoField.YEAR));
+        assertEquals(11, localDateTime.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(10, localDateTime.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(8, localDateTime.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(20, localDateTime.get(ChronoField.MINUTE_OF_HOUR));
+    }
+
+}

From cf7c96b469b22c7bc446d3992e51487019041e33 Mon Sep 17 00:00:00 2001
From: Ahmad Alsanie <ahmad.alsanie92@gmail.com>
Date: Mon, 20 Nov 2017 18:05:47 +0200
Subject: [PATCH 61/72] BAEL-1308 - copy a file with java (Editor Notes)

---
 .../com/baeldung/copyfiles/FileCopier.java    | 40 ---------
 .../baeldung/copyfiles/FileCopierTest.java    | 88 ++++++++++++-------
 2 files changed, 55 insertions(+), 73 deletions(-)
 delete mode 100644 core-java/src/main/java/com/baeldung/copyfiles/FileCopier.java

diff --git a/core-java/src/main/java/com/baeldung/copyfiles/FileCopier.java b/core-java/src/main/java/com/baeldung/copyfiles/FileCopier.java
deleted file mode 100644
index 0841cd67a3..0000000000
--- a/core-java/src/main/java/com/baeldung/copyfiles/FileCopier.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.baeldung.copyfiles;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-
-import org.apache.commons.io.FileUtils;
-
-public class FileCopier {
-	public static File copyWithIO(File original, File copied) throws IOException {
-		try (InputStream in = new BufferedInputStream(new FileInputStream(original));
-				OutputStream out = new BufferedOutputStream(new FileOutputStream(copied))) {
-			byte[] buffer = new byte[1024];
-			int lengthRead;
-			while ((lengthRead = in.read(buffer)) > 0) {
-				out.write(buffer, 0, lengthRead);
-				out.flush();
-			}
-		}
-		return copied;
-	}
-
-	public static Path copyWithNio(Path original, Path copied) throws IOException {
-		Files.copy(original, copied, StandardCopyOption.REPLACE_EXISTING);
-		return copied;
-	}
-
-	public static File copyWithCommonsIO(File original, File copied) throws IOException {
-		FileUtils.copyFile(original, copied);
-		return copied;
-	}
-}
diff --git a/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java b/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
index 9c95dcec47..973436a26a 100644
--- a/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
+++ b/core-java/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
@@ -1,48 +1,70 @@
 package com.baeldung.copyfiles;
 
-import static org.junit.Assert.*;
-
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
+import static org.assertj.core.api.Assertions.*;
 
 public class FileCopierTest {
-    File original =new File("src/test/resources/original.txt");
-    @Before
-    public void init() throws IOException{
-        if(!original.exists())
-            Files.createFile(original.toPath());
-    }
-    @Test
-    public void givenIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
-        File copied = new File("src/test/resources/copiedWithIo.txt");
-        copied = FileCopier.copyWithIO(original, copied);
-        assertTrue(copied.exists());
-        assertTrue(Files.readAllLines(original.toPath())
-            .equals(Files.readAllLines(copied.toPath())));
-    }
+	File original = new File("src/test/resources/original.txt");
 
-    @Test
-    public void givenCommonsIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
-        File copied = new File("src/test/resources/copiedWithApacheCommons.txt");
-        copied = FileCopier.copyWithCommonsIO(original, copied);
-        assertTrue(copied.exists());
-        assertTrue(Files.readAllLines(original.toPath())
-            .equals(Files.readAllLines(copied.toPath())));
-    }
+	@Before
+	public void init() throws IOException {
+		if (!original.exists())
+			Files.createFile(original.toPath());
+	}
 
-    @Test
-    public void givenNIO2_whenCopied_thenCopyExistsWithSameContents() throws IOException {
-        Path copied = Paths.get("src/test/resources/copiedWithNio.txt");
-        Path originalPath = original.toPath();
-        copied = FileCopier.copyWithNio(originalPath, copied);
-        assertTrue(Files.exists(copied));
-        assertTrue(Files.readAllLines(originalPath)
-            .equals(Files.readAllLines(copied)));
-    }
+	@Test
+	public void givenIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+		File copied = new File("src/test/resources/copiedWithIo.txt");
+		try (InputStream in = new BufferedInputStream(new FileInputStream(original));
+				OutputStream out = new BufferedOutputStream(new FileOutputStream(copied))) {
+			byte[] buffer = new byte[1024];
+			int lengthRead;
+			while ((lengthRead = in.read(buffer)) > 0) {
+				out.write(buffer, 0, lengthRead);
+				out.flush();
+			}
+		}
+		assertThat(copied).exists();
+		assertThat(Files.readAllLines(original.toPath()).equals(Files.readAllLines(copied.toPath())));
+	}
+
+	@Test
+	public void givenCommonsIoAPI_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+		File copied = new File("src/test/resources/copiedWithApacheCommons.txt");
+		FileUtils.copyFile(original, copied);
+		assertThat(copied).exists();
+		assertThat(Files.readAllLines(original.toPath()).equals(Files.readAllLines(copied.toPath())));
+	}
+
+	@Test
+	public void givenNIO2_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+		Path copied = Paths.get("src/test/resources/copiedWithNio.txt");
+		Path originalPath = original.toPath();
+		Files.copy(originalPath, copied, StandardCopyOption.REPLACE_EXISTING);
+		assertThat(copied).exists();
+		assertThat(Files.readAllLines(originalPath).equals(Files.readAllLines(copied)));
+	}
+
+	@Test
+	public void givenGuava_whenCopied_thenCopyExistsWithSameContents() throws IOException {
+		File copied = new File("src/test/resources/copiedWithApacheCommons.txt");
+		com.google.common.io.Files.copy(original, copied);
+		assertThat(copied).exists();
+		assertThat(Files.readAllLines(original.toPath()).equals(Files.readAllLines(copied.toPath())));
+	}
 }

From dba132f7deb446353a869af4e483fd439b3fcc8c Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek.ispat@gmail.com>
Date: Mon, 20 Nov 2017 21:54:03 +0530
Subject: [PATCH 62/72] BAEL-1173 - Add spring-cloud-aws module (#3046)

---
 spring-cloud/pom.xml                          |   1 +
 spring-cloud/spring-cloud-aws/README.md       |  21 +++
 spring-cloud/spring-cloud-aws/pom.xml         |  91 ++++++++++++
 .../cloud/aws/SpringCloudAwsApplication.java  |  12 ++
 .../aws/config/SpringCloudAwsConfig.java      |  22 +++
 .../spring/cloud/aws/s3/SpringCloudS3.java    |  52 +++++++
 .../cloud/aws/sns/SNSEndpointController.java  |  36 +++++
 .../cloud/aws/sns/SNSMessageSender.java       |  16 +++
 .../spring/cloud/aws/sqs/SpringCloudSQS.java  |  46 ++++++
 .../src/main/resources/application.properties |  14 ++
 .../cloud/aws/SpringCloudAwsTestUtil.java     |  73 ++++++++++
 .../rds/SpringCloudRDSIntegrationTest.java    |  46 ++++++
 .../aws/s3/SpringCloudS3IntegrationTest.java  | 101 +++++++++++++
 .../sns/SNSEndpointControllerUnitTest.java    |  38 +++++
 .../sns/SpringCloudSNSIntegrationTest.java    |  61 ++++++++
 .../spring/cloud/aws/sqs/Greeting.java        |  63 ++++++++
 .../sqs/SpringCloudSQSIntegrationTest.java    | 135 ++++++++++++++++++
 .../resources/application-test.properties     |   4 +
 18 files changed, 832 insertions(+)
 create mode 100644 spring-cloud/spring-cloud-aws/README.md
 create mode 100644 spring-cloud/spring-cloud-aws/pom.xml
 create mode 100644 spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/main/resources/application.properties
 create mode 100644 spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSIntegrationTest.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3IntegrationTest.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSIntegrationTest.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSIntegrationTest.java
 create mode 100644 spring-cloud/spring-cloud-aws/src/test/resources/application-test.properties

diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index fd023a5ea5..e6d78f292d 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -18,6 +18,7 @@
         <module>spring-cloud-gateway</module>
         <module>spring-cloud-stream</module>
         <module>spring-cloud-connectors-heroku</module>
+        <module>spring-cloud-aws</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/spring-cloud/spring-cloud-aws/README.md b/spring-cloud/spring-cloud-aws/README.md
new file mode 100644
index 0000000000..c5f58159c8
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/README.md
@@ -0,0 +1,21 @@
+# Spring Cloud AWS
+
+#### Running the Integration Tests
+
+To run the Integration Tests, we need to have an AWS account and have API keys generated for programmatic access. Edit 
+the `application.properties` file to add the following properties:
+
+```
+cloud.aws.credentials.accessKey=YourAccessKey
+cloud.aws.credentials.secretKey=YourSecretKey
+cloud.aws.region.static=us-east-1
+```
+
+To test automatic DataSource creation from RDS instance, we also need to create an RDS instance in the AWS account.
+Let's say that the RDS instance is called `spring-cloud-test-db` having the master password `se3retpass`, then we need 
+to write the following in `application.properties`:
+
+```
+cloud.aws.rds.spring-cloud-test-db
+cloud.aws.rds.spring-cloud-test-db.password=se3retpass
+```
diff --git a/spring-cloud/spring-cloud-aws/pom.xml b/spring-cloud/spring-cloud-aws/pom.xml
new file mode 100644
index 0000000000..632e050d92
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/pom.xml
@@ -0,0 +1,91 @@
+<?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.cloud</groupId>
+    <artifactId>spring-cloud-aws</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>Spring Cloud AWS</name>
+    <description>Spring Cloud AWS Examples</description>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.8.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>
+        <spring-cloud.version>Dalston.SR4</spring-cloud.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-aws</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-aws-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-aws-messaging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</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>
+            
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java
new file mode 100644
index 0000000000..2c3909b3eb
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.spring.cloud.aws;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringCloudAwsApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringCloudAwsApplication.class, args);
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java
new file mode 100644
index 0000000000..85dcd05c86
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java
@@ -0,0 +1,22 @@
+package com.baeldung.spring.cloud.aws.config;
+
+import com.amazonaws.services.sns.AmazonSNS;
+import com.amazonaws.services.sqs.AmazonSQSAsync;
+import org.springframework.cloud.aws.messaging.core.NotificationMessagingTemplate;
+import org.springframework.cloud.aws.messaging.core.QueueMessagingTemplate;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SpringCloudAwsConfig {
+
+    @Bean
+    public QueueMessagingTemplate queueMessagingTemplate(AmazonSQSAsync amazonSQSAsync) {
+        return new QueueMessagingTemplate(amazonSQSAsync);
+    }
+
+    @Bean
+    public NotificationMessagingTemplate notificationMessagingTemplate(AmazonSNS amazonSNS) {
+        return new NotificationMessagingTemplate(amazonSNS);
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java
new file mode 100644
index 0000000000..cfad6e904f
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java
@@ -0,0 +1,52 @@
+package com.baeldung.spring.cloud.aws.s3;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.io.WritableResource;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+
+@Component
+public class SpringCloudS3 {
+
+    @Autowired
+    ResourceLoader resourceLoader;
+
+    @Autowired
+    ResourcePatternResolver resourcePatternResolver;
+
+    public void downloadS3Object(String s3Url) throws IOException {
+        Resource resource = resourceLoader.getResource(s3Url);
+        File downloadedS3Object = new File(resource.getFilename());
+        try (InputStream inputStream = resource.getInputStream()) {
+            Files.copy(inputStream, downloadedS3Object.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        }
+    }
+
+    public void uploadFileToS3(File file, String s3Url) throws IOException {
+        WritableResource resource = (WritableResource) resourceLoader.getResource(s3Url);
+        try (OutputStream outputStream = resource.getOutputStream()) {
+            Files.copy(file.toPath(), outputStream);
+        }
+    }
+
+    public void downloadMultipleS3Objects(String s3UrlPattern) throws IOException {
+        Resource[] allFileMatchingPatten = this.resourcePatternResolver.getResources(s3UrlPattern);
+        for (Resource resource : allFileMatchingPatten) {
+            String fileName = resource.getFilename();
+            fileName = fileName.substring(0, fileName.lastIndexOf("/") + 1);
+            File downloadedS3Object = new File(fileName);
+            try (InputStream inputStream = resource.getInputStream()) {
+                Files.copy(inputStream, downloadedS3Object.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            }
+        }
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java
new file mode 100644
index 0000000000..7c78fcbe37
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java
@@ -0,0 +1,36 @@
+package com.baeldung.spring.cloud.aws.sns;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.aws.messaging.config.annotation.NotificationMessage;
+import org.springframework.cloud.aws.messaging.config.annotation.NotificationSubject;
+import org.springframework.cloud.aws.messaging.endpoint.NotificationStatus;
+import org.springframework.cloud.aws.messaging.endpoint.annotation.NotificationMessageMapping;
+import org.springframework.cloud.aws.messaging.endpoint.annotation.NotificationSubscriptionMapping;
+import org.springframework.cloud.aws.messaging.endpoint.annotation.NotificationUnsubscribeConfirmationMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/topic-subscriber")
+public class SNSEndpointController {
+
+    private static final Logger logger = LoggerFactory.getLogger(SNSEndpointController.class);
+
+    @NotificationMessageMapping
+    public void receiveNotification(@NotificationMessage String message, @NotificationSubject String subject) {
+        logger.info("Received message: {}, having subject: {}", message, subject);
+    }
+
+    @NotificationUnsubscribeConfirmationMapping
+    public void confirmSubscriptionMessage(NotificationStatus notificationStatus) {
+        logger.info("Unsubscribed from Topic");
+        notificationStatus.confirmSubscription();
+    }
+
+    @NotificationSubscriptionMapping
+    public void confirmUnsubscribeMessage(NotificationStatus notificationStatus) {
+        logger.info("Subscribed to Topic");
+        notificationStatus.confirmSubscription();
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java
new file mode 100644
index 0000000000..58cb03644b
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.aws.sns;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.aws.messaging.core.NotificationMessagingTemplate;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SNSMessageSender {
+
+    @Autowired
+    NotificationMessagingTemplate notificationMessagingTemplate;
+
+    public void send(String topicName, Object message, String subject) {
+        notificationMessagingTemplate.sendNotification(topicName, message, subject);
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java
new file mode 100644
index 0000000000..d2a5fcf9ca
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java
@@ -0,0 +1,46 @@
+package com.baeldung.spring.cloud.aws.sqs;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.aws.messaging.core.QueueMessagingTemplate;
+import org.springframework.cloud.aws.messaging.listener.annotation.SqsListener;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.CountDownLatch;
+
+@Component
+@Lazy
+public class SpringCloudSQS {
+
+    private static final Logger logger = LoggerFactory.getLogger(SpringCloudSQS.class);
+
+    static final String QUEUE_NAME = "spring-cloud-test-queue";
+
+    /*
+     * CountDownLatch is added to wait for messages
+     * during integration test
+     */
+    CountDownLatch countDownLatch;
+
+    public void setCountDownLatch(CountDownLatch countDownLatch) {
+        this.countDownLatch = countDownLatch;
+    }
+
+    @Autowired
+    QueueMessagingTemplate queueMessagingTemplate;
+
+    @SqsListener(QUEUE_NAME)
+    public void receiveMessage(String message, @Header("SenderId") String senderId) {
+        logger.info("Received message: {}, having SenderId: {}", message, senderId);
+        if (countDownLatch != null) {
+            countDownLatch.countDown();
+        }
+    }
+
+    public void send(String queueName, Object message) {
+        queueMessagingTemplate.convertAndSend(queueName, message);
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/application.properties b/spring-cloud/spring-cloud-aws/src/main/resources/application.properties
new file mode 100644
index 0000000000..a769b70ddd
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/main/resources/application.properties
@@ -0,0 +1,14 @@
+cloud.aws.credentials.accessKey=YourAccessKey
+cloud.aws.credentials.secretKey=YourSecretKey
+cloud.aws.region.static=us-east-1
+
+cloud.aws.rds.spring-cloud-test-db
+cloud.aws.rds.spring-cloud-test-db.password=se3retpass
+
+# These 3 properties are optional
+cloud.aws.rds.spring-cloud-test-db.username=testuser
+cloud.aws.rds.spring-cloud-test-db.readReplicaSupport=true
+cloud.aws.rds.spring-cloud-test-db.databaseName=test
+
+# Disable auto cloudfromation
+cloud.aws.stack.auto=false
diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java
new file mode 100644
index 0000000000..fe10eb6f15
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java
@@ -0,0 +1,73 @@
+package com.baeldung.spring.cloud.aws;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import com.amazonaws.services.sns.AmazonSNS;
+import com.amazonaws.services.sns.AmazonSNSClientBuilder;
+import com.amazonaws.services.sqs.AmazonSQS;
+import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.junit.BeforeClass;
+
+/**
+ * This class is needed only for testing. This is because we need to
+ * create AWS resources before Spring's Application context is created
+ * in a {@link BeforeClass} method. Since Autowired dependencies don't
+ * work in static context, we will use this class for AWS clients.
+ */
+public class SpringCloudAwsTestUtil {
+
+    private static String awsAccessKey;
+    private static String awsSecretKey;
+    private static String defaultRegion;
+
+    static {
+        try {
+            InputStream is = SpringCloudAwsTestUtil.class.getResourceAsStream("/application.properties");
+            Properties properties = new Properties();
+            properties.load(is);
+            awsAccessKey = properties.getProperty("cloud.aws.credentials.accessKey");
+            awsSecretKey = properties.getProperty("cloud.aws.credentials.secretKey");
+            defaultRegion = properties.getProperty("cloud.aws.region.static");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static AWSCredentials awsCredentials() {
+        return new BasicAWSCredentials(awsAccessKey, awsSecretKey);
+    }
+
+    public static AWSCredentialsProvider awsCredentialsProvider() {
+        return new AWSStaticCredentialsProvider(awsCredentials());
+    }
+
+    public static AmazonS3 amazonS3() {
+        return AmazonS3ClientBuilder.standard()
+            .withCredentials(awsCredentialsProvider())
+            .withRegion(defaultRegion)
+            .build();
+    }
+
+    public static AmazonSNS amazonSNS() {
+        return AmazonSNSClientBuilder.standard()
+            .withCredentials(awsCredentialsProvider())
+            .withRegion(defaultRegion)
+            .build();
+    }
+
+    public static AmazonSQS amazonSQS() {
+        return AmazonSQSClientBuilder.standard()
+            .withCredentials(awsCredentialsProvider())
+            .withRegion(defaultRegion)
+            .build();
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSIntegrationTest.java b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSIntegrationTest.java
new file mode 100644
index 0000000000..9e163d6dc4
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSIntegrationTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.spring.cloud.aws.rds;
+
+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 javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class SpringCloudRDSIntegrationTest {
+
+    @Autowired
+    DataSource dataSource;
+
+    @Test
+    public void whenDataSourceCreated_thenSuccess() {
+       assertThat(dataSource).isNotNull();
+    }
+
+    @Test
+    public void givenDataSource_whenConnectionCreated_thenSuccess() throws SQLException {
+        Connection connection = dataSource.getConnection();
+        assertThat(connection).isNotNull();
+    }
+
+    @Test
+    public void givenConnection_whenQueryExecuted_thenSuccess() throws SQLException {
+        Connection connection = dataSource.getConnection();
+        Statement statement = connection.createStatement();
+        ResultSet resultSet = statement.executeQuery("SELECT 1");
+        while (resultSet.next()) {
+            int result = resultSet.getInt(1);
+            assertThat(result).isEqualTo(1);
+        }
+        connection.close();
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3IntegrationTest.java b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3IntegrationTest.java
new file mode 100644
index 0000000000..a866287dec
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3IntegrationTest.java
@@ -0,0 +1,101 @@
+package com.baeldung.spring.cloud.aws.s3;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.ListObjectsV2Result;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.baeldung.spring.cloud.aws.SpringCloudAwsTestUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+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.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+@TestPropertySource("classpath:application-test.properties")
+public class SpringCloudS3IntegrationTest {
+
+    @Autowired
+    private SpringCloudS3 springCloudS3;
+
+    private static String bucketName;
+    private static String testFileToDownload;
+    private static String testFileToUpload;
+
+    private static String[] filesWithSimilarName;
+    private static List<File> similarNameFiles;
+
+    @BeforeClass
+    public static void setupResources() throws IOException {
+
+        bucketName = UUID.randomUUID().toString();
+        testFileToDownload = "test-file-download.txt";
+        testFileToUpload = "test-file-upload.txt";
+
+        filesWithSimilarName = new String[] { "foo/hello-apple.txt", "foo/hello-orange.txt", "bar/hello-grapes.txt", };
+
+        similarNameFiles = new ArrayList<>();
+        for (String name : filesWithSimilarName) {
+            similarNameFiles.add(new File(name.substring(0, name.lastIndexOf("/") + 1)));
+        }
+
+        Files.write(Paths.get(testFileToUpload), "Hello World Uploaded!".getBytes());
+
+        AmazonS3 amazonS3 = SpringCloudAwsTestUtil.amazonS3();
+        amazonS3.createBucket(bucketName);
+
+        amazonS3.putObject(bucketName, testFileToDownload, "Hello World");
+
+        for (String s3Key : filesWithSimilarName) {
+            amazonS3.putObject(bucketName, s3Key, "Hello World");
+        }
+    }
+
+    @Test
+    public void whenS3ObjectDownloaded_thenSuccess() throws IOException {
+        String s3Url = "s3://" + bucketName + "/" + testFileToDownload;
+        springCloudS3.downloadS3Object(s3Url);
+        assertThat(new File(testFileToDownload)).exists();
+    }
+
+    @Test
+    public void whenS3ObjectUploaded_thenSuccess() throws IOException {
+        String s3Url = "s3://" + bucketName + "/" + testFileToUpload;
+        File file = new File(testFileToUpload);
+        springCloudS3.uploadFileToS3(file, s3Url);
+    }
+
+    @Test
+    public void whenMultipleS3ObjectsDownloaded_thenSuccess() throws IOException {
+        String s3Url = "s3://" + bucketName + "/**/hello-*.txt";
+        springCloudS3.downloadMultipleS3Objects(s3Url);
+        similarNameFiles.forEach(f -> assertThat(f).exists());
+    }
+
+    @AfterClass
+    public static void cleanUpResources() {
+        AmazonS3 amazonS3 = SpringCloudAwsTestUtil.amazonS3();
+        ListObjectsV2Result listObjectsV2Result = amazonS3.listObjectsV2(bucketName);
+        for (S3ObjectSummary objectSummary : listObjectsV2Result.getObjectSummaries()) {
+            amazonS3.deleteObject(bucketName, objectSummary.getKey());
+        }
+        amazonS3.deleteBucket(bucketName);
+
+        new File(testFileToDownload).delete();
+        new File(testFileToUpload).delete();
+        similarNameFiles.forEach(File::delete);
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java
new file mode 100644
index 0000000000..14958570e2
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.spring.cloud.aws.sns;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.cloud.aws.messaging.endpoint.NotificationStatus;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+
+public class SNSEndpointControllerUnitTest {
+
+    SNSEndpointController snsEndpointController;
+
+    @Before
+    public void setUp() {
+        snsEndpointController = new SNSEndpointController();
+    }
+
+    @Test
+    public void whenReceivedNotificationInvoked_thenSuccess() {
+        snsEndpointController.receiveNotification("Message", "Subject");
+    }
+
+    @Test
+    public void whenConfirmUnsubscribeReturned_thenSuccess() {
+        NotificationStatus notificationStatus = mock(NotificationStatus.class);
+        doNothing().when(notificationStatus).confirmSubscription();
+        snsEndpointController.confirmUnsubscribeMessage(notificationStatus);
+    }
+
+    @Test
+    public void whenConfirmSubscriptionReturned_thenSuccess() {
+        NotificationStatus notificationStatus = mock(NotificationStatus.class);
+        doNothing().when(notificationStatus).confirmSubscription();
+        snsEndpointController.confirmSubscriptionMessage(notificationStatus);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSIntegrationTest.java b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSIntegrationTest.java
new file mode 100644
index 0000000000..e1f23d5c76
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSIntegrationTest.java
@@ -0,0 +1,61 @@
+package com.baeldung.spring.cloud.aws.sns;
+
+import java.util.UUID;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+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.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.amazonaws.services.sns.AmazonSNS;
+import com.amazonaws.services.sns.model.CreateTopicResult;
+import com.baeldung.spring.cloud.aws.SpringCloudAwsTestUtil;
+import com.baeldung.spring.cloud.aws.sqs.Greeting;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+@TestPropertySource("classpath:application-test.properties")
+public class SpringCloudSNSIntegrationTest {
+
+    @Autowired
+    private SNSMessageSender snsMessageSender;
+
+    private static String topicName;
+    private static String topicArn;
+
+    @BeforeClass
+    public static void setupAwsResources() {
+
+        topicName = UUID.randomUUID().toString();
+
+        AmazonSNS amazonSNS = SpringCloudAwsTestUtil.amazonSNS();
+
+        CreateTopicResult result = amazonSNS.createTopic(topicName);
+        topicArn = result.getTopicArn();
+    }
+
+    @Test
+    public void whenMessagePublished_thenSuccess() {
+        String subject = "Test Message";
+        String message = "Hello World";
+        snsMessageSender.send(topicName, message, subject);
+    }
+    
+    @Test
+    public void whenConvertedMessagePublished_thenSuccess() {
+        String subject = "Test Message";
+        Greeting message = new Greeting("Helo", "World");
+        snsMessageSender.send(topicName, message, subject);
+    }
+
+    @AfterClass
+    public static void cleanupAwsResources() {
+        AmazonSNS amazonSNS = SpringCloudAwsTestUtil.amazonSNS();
+        amazonSNS.deleteTopic(topicArn);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java
new file mode 100644
index 0000000000..3d14d55f14
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java
@@ -0,0 +1,63 @@
+package com.baeldung.spring.cloud.aws.sqs;
+
+public class Greeting {
+    private String message;
+    private String name;
+
+    public Greeting() {
+
+    }
+
+    public Greeting(String mesage, String name) {
+        this.message = mesage;
+        this.name = name;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((message == null) ? 0 : message.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Greeting other = (Greeting) obj;
+        if (message == null) {
+            if (other.message != null)
+                return false;
+        } else if (!message.equals(other.message))
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+    
+}
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSIntegrationTest.java b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSIntegrationTest.java
new file mode 100644
index 0000000000..76d2fd7c0d
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSIntegrationTest.java
@@ -0,0 +1,135 @@
+package com.baeldung.spring.cloud.aws.sqs;
+
+import com.amazonaws.services.sqs.AmazonSQS;
+import com.amazonaws.services.sqs.model.CreateQueueResult;
+import com.amazonaws.services.sqs.model.PurgeQueueRequest;
+import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
+import com.amazonaws.services.sqs.model.ReceiveMessageResult;
+import com.baeldung.spring.cloud.aws.SpringCloudAwsTestUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.IOException;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+@TestPropertySource("classpath:application-test.properties")
+public class SpringCloudSQSIntegrationTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(SpringCloudSQSIntegrationTest.class);
+
+    @Autowired
+    @Lazy
+    private SpringCloudSQS springCloudSQS;
+
+    private static String receiveQueueName;
+    private static String receiveQueueUrl;
+
+    private static String sendQueueName;
+    private static String sendQueueURl;
+
+    @BeforeClass
+    public static void setupAwsResources() {
+
+        sendQueueName = UUID.randomUUID().toString();
+        receiveQueueName = SpringCloudSQS.QUEUE_NAME;
+
+        AmazonSQS amazonSQS = SpringCloudAwsTestUtil.amazonSQS();
+
+        CreateQueueResult receiveQueue = amazonSQS.createQueue(receiveQueueName);
+        receiveQueueUrl = receiveQueue.getQueueUrl();
+
+        CreateQueueResult sendQueue = amazonSQS.createQueue(sendQueueName);
+        sendQueueURl = sendQueue.getQueueUrl();
+    }
+
+    @Test
+    public void whenMessageSentAndVerified_thenSuccess() throws InterruptedException {
+
+        String message = "Hello World";
+        springCloudSQS.send(sendQueueName, message);
+
+        AmazonSQS amazonSQS = SpringCloudAwsTestUtil.amazonSQS();
+
+        ReceiveMessageRequest request = new ReceiveMessageRequest(sendQueueURl);
+        request.setMaxNumberOfMessages(1);
+
+        ReceiveMessageResult result = null;
+        do {
+            result = amazonSQS.receiveMessage(request);
+            if (result.getMessages().size() == 0) {
+                logger.info("Message not received at first time, waiting for 1 second");
+            }
+        } while (result.getMessages().size() == 0);
+        assertThat(result.getMessages().get(0).getBody()).isEqualTo(message);
+        
+        // Delete message so that it doen't interfere with other test
+        amazonSQS.deleteMessage(sendQueueURl, result.getMessages().get(0).getReceiptHandle());
+        
+    }
+
+    @Test
+    public void whenConvertedMessageSentAndVerified_thenSuccess() throws InterruptedException, IOException {
+        
+        Greeting message = new Greeting("Hello", "World");
+        springCloudSQS.send(sendQueueName, message);
+
+        AmazonSQS amazonSQS = SpringCloudAwsTestUtil.amazonSQS();
+
+        ReceiveMessageRequest request = new ReceiveMessageRequest(sendQueueURl);
+        request.setMaxNumberOfMessages(1);
+
+        ReceiveMessageResult result = null;
+        do {
+            result = amazonSQS.receiveMessage(request);
+            if (result.getMessages().size() == 0) {
+                logger.info("Message not received at first time, waiting for 1 second");
+            }
+        } while (result.getMessages().size() == 0);
+        assertThat(new ObjectMapper().readValue(result.getMessages().get(0).getBody(), Greeting.class)).isEqualTo(message);
+        
+        // Delete message so that it doen't interfere with other test
+        amazonSQS.deleteMessage(sendQueueURl, result.getMessages().get(0).getReceiptHandle());
+    }
+    
+    @Test
+    public void givenMessageSent_whenMessageReceived_thenSuccess() throws InterruptedException {
+        CountDownLatch countDownLatch = new CountDownLatch(5);
+        springCloudSQS.setCountDownLatch(countDownLatch);
+
+        AmazonSQS amazonSQS = SpringCloudAwsTestUtil.amazonSQS();
+        for (int i = 0; i < 5; i++) {
+            amazonSQS.sendMessage(receiveQueueUrl, "Hello World " + i);
+            logger.info("Sent message {}, waiting for 1 second", i + 1);
+            Thread.sleep(1000L);
+        }
+        countDownLatch.await();
+    }
+
+    @AfterClass
+    public static void cleanupAwsResources() {
+        AmazonSQS amazonSQS = SpringCloudAwsTestUtil.amazonSQS();
+        PurgeQueueRequest receiveQueuePurge = new PurgeQueueRequest(receiveQueueUrl);
+        amazonSQS.purgeQueue(receiveQueuePurge);
+        amazonSQS.deleteQueue(receiveQueueUrl);
+
+        PurgeQueueRequest sendQueuePurge = new PurgeQueueRequest(sendQueueURl);
+        amazonSQS.purgeQueue(sendQueuePurge);
+        amazonSQS.deleteQueue(sendQueueURl);
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/src/test/resources/application-test.properties b/spring-cloud/spring-cloud-aws/src/test/resources/application-test.properties
new file mode 100644
index 0000000000..0d3d90b03a
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/test/resources/application-test.properties
@@ -0,0 +1,4 @@
+# Don't try to create DataSouce when running tests which don't need a DataSource
+spring.autoconfigure.exclude=\
+  org.springframework.cloud.aws.autoconfigure.jdbc.AmazonRdsDatabaseAutoConfiguration,\
+  org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration

From dd91ef722bf3b1a8968a1ad719f2bd4b29f4818e Mon Sep 17 00:00:00 2001
From: Ahmad Alsanie <ahmad.alsanie92@gmail.com>
Date: Mon, 20 Nov 2017 21:08:41 +0200
Subject: [PATCH 63/72] BAEL-1308 DI related code removed and included original
 text file

---
 core-java/src/test/resources/original         |  2 ++
 .../baeldung/ditypes/RegisterarConfig.java    | 14 ---------
 .../java/com/baeldung/ditypes/Registrar.java  | 18 ------------
 .../main/java/com/baeldung/ditypes/User.java  | 20 -------------
 .../com/baeldung/ditypes/RegisterarTest.java  | 29 -------------------
 5 files changed, 2 insertions(+), 81 deletions(-)
 create mode 100644 core-java/src/test/resources/original
 delete mode 100644 spring-core/src/main/java/com/baeldung/ditypes/RegisterarConfig.java
 delete mode 100644 spring-core/src/main/java/com/baeldung/ditypes/Registrar.java
 delete mode 100644 spring-core/src/main/java/com/baeldung/ditypes/User.java
 delete mode 100644 spring-core/src/test/java/com/baeldung/ditypes/RegisterarTest.java

diff --git a/core-java/src/test/resources/original b/core-java/src/test/resources/original
new file mode 100644
index 0000000000..cf8c89d389
--- /dev/null
+++ b/core-java/src/test/resources/original
@@ -0,0 +1,2 @@
+#Copy a File with Java (www.Baeldung.com)
+Copying Files with Java is Fun!
\ No newline at end of file
diff --git a/spring-core/src/main/java/com/baeldung/ditypes/RegisterarConfig.java b/spring-core/src/main/java/com/baeldung/ditypes/RegisterarConfig.java
deleted file mode 100644
index c1df1466f3..0000000000
--- a/spring-core/src/main/java/com/baeldung/ditypes/RegisterarConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.baeldung.ditypes;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan("com.baeldung.ditypes")
-public class RegisterarConfig {
-    @Bean
-    public User user() {
-        return new User("Alice", 1);
-    }
-}
diff --git a/spring-core/src/main/java/com/baeldung/ditypes/Registrar.java b/spring-core/src/main/java/com/baeldung/ditypes/Registrar.java
deleted file mode 100644
index 4406151c1b..0000000000
--- a/spring-core/src/main/java/com/baeldung/ditypes/Registrar.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.baeldung.ditypes;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Registrar {
-    private User user;
-
-    @Autowired
-    public Registrar(User user) {
-        this.user = user;
-    }
-
-    public String register() {
-        return user.register();
-    }
-}
diff --git a/spring-core/src/main/java/com/baeldung/ditypes/User.java b/spring-core/src/main/java/com/baeldung/ditypes/User.java
deleted file mode 100644
index b0120c7711..0000000000
--- a/spring-core/src/main/java/com/baeldung/ditypes/User.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.baeldung.ditypes;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class User {
-
-    private String name;
-    private int id;
-
-    public User(String name, int id) {
-        this.id = id;
-        this.name = name;
-    }
-
-    public String register() {
-        return "User" + id + ": " + name + " is registered";
-    }
-
-}
diff --git a/spring-core/src/test/java/com/baeldung/ditypes/RegisterarTest.java b/spring-core/src/test/java/com/baeldung/ditypes/RegisterarTest.java
deleted file mode 100644
index a0aea95a2b..0000000000
--- a/spring-core/src/test/java/com/baeldung/ditypes/RegisterarTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.baeldung.ditypes;
-
-import static 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;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = RegisterarConfig.class)
-public class RegisterarTest {
-
-    @Autowired
-    private Registrar reg;
-
-    @Autowired
-    private User user;
-
-    @Test
-    public void givenAutowiredAnnotation_whenSetOnField_thenRegistrarIsInjected() {
-        assertNotNull(reg);
-    }
-
-    @Test
-    public void givenAutowiredAnnotation_whenSetOnField_thenUserIsInjected() {
-        assertEquals("User1: Alice is registered", user.register());
-    }
-}

From 2061f5b7eb84fce002f924a4862059f6dca35a3a Mon Sep 17 00:00:00 2001
From: Adam Arold <arold.adam@gmail.com>
Date: Mon, 20 Nov 2017 20:11:34 +0100
Subject: [PATCH 64/72] adding built-in java annotation examples (#3087)

---
 .../annotations/ClassWithAnnotation.java         |  5 +++++
 .../annotations/ClassWithDeprecatedMethod.java   |  9 +++++++++
 .../annotations/ClassWithSafeVarargs.java        | 11 +++++++++++
 .../annotations/ClassWithSuppressWarnings.java   |  9 +++++++++
 .../com/baeldung/annotations/IntConsumer.java    |  8 ++++++++
 .../java/com/baeldung/annotations/Interval.java  |  8 ++++++++
 .../com/baeldung/annotations/IntervalUsage.java  |  9 +++++++++
 .../java/com/baeldung/annotations/Intervals.java |  5 +++++
 .../com/baeldung/annotations/MyAnnotation.java   | 11 +++++++++++
 .../baeldung/annotations/MyAnnotationTarget.java | 16 ++++++++++++++++
 .../com/baeldung/annotations/MyOperation.java    |  6 ++++++
 .../baeldung/annotations/MyOperationImpl.java    |  9 +++++++++
 12 files changed, 106 insertions(+)
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/ClassWithDeprecatedMethod.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/IntConsumer.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/Interval.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/IntervalUsage.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/Intervals.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/MyAnnotation.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/MyOperation.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/annotations/MyOperationImpl.java

diff --git a/core-java-8/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java b/core-java-8/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java
new file mode 100644
index 0000000000..034e6785a4
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java
@@ -0,0 +1,5 @@
+package com.baeldung.annotations;
+
+@Deprecated
+class ClassWithAnnotation {
+}
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/ClassWithDeprecatedMethod.java b/core-java-8/src/main/java/com/baeldung/annotations/ClassWithDeprecatedMethod.java
new file mode 100644
index 0000000000..6f5da03b74
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/ClassWithDeprecatedMethod.java
@@ -0,0 +1,9 @@
+package com.baeldung.annotations;
+
+class ClassWithDeprecatedMethod {
+
+    @Deprecated
+    static void deprecatedMethod() {
+
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java b/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java
new file mode 100644
index 0000000000..cfa91f5951
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java
@@ -0,0 +1,11 @@
+package com.baeldung.annotations;
+
+class ClassWithSafeVarargs<T> {
+
+    @SafeVarargs
+    final void iterateOverVarargs(T... args) {
+        for (T x : args) {
+            // do stuff with x
+        }
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java b/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java
new file mode 100644
index 0000000000..fe22ec1c24
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java
@@ -0,0 +1,9 @@
+package com.baeldung.annotations;
+
+class ClassWithSuppressWarnings {
+
+    @SuppressWarnings("deprecation")
+    void useDeprecatedMethod() {
+        ClassWithDeprecatedMethod.deprecatedMethod(); // no warning is generated here
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/IntConsumer.java b/core-java-8/src/main/java/com/baeldung/annotations/IntConsumer.java
new file mode 100644
index 0000000000..4f16b27281
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/IntConsumer.java
@@ -0,0 +1,8 @@
+package com.baeldung.annotations;
+
+@FunctionalInterface
+interface IntConsumer {
+
+    void accept(Integer number);
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/Interval.java b/core-java-8/src/main/java/com/baeldung/annotations/Interval.java
new file mode 100644
index 0000000000..f73e6e5b14
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/Interval.java
@@ -0,0 +1,8 @@
+package com.baeldung.annotations;
+
+import java.lang.annotation.Repeatable;
+
+@Repeatable(Intervals.class)
+@interface Interval {
+    int hour() default 1;
+}
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/IntervalUsage.java b/core-java-8/src/main/java/com/baeldung/annotations/IntervalUsage.java
new file mode 100644
index 0000000000..2e11de8215
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/IntervalUsage.java
@@ -0,0 +1,9 @@
+package com.baeldung.annotations;
+
+public class IntervalUsage {
+
+    @Interval(hour = 17)
+    @Interval(hour = 13)
+    void doPeriodicCleanup() {
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/Intervals.java b/core-java-8/src/main/java/com/baeldung/annotations/Intervals.java
new file mode 100644
index 0000000000..af469f18cc
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/Intervals.java
@@ -0,0 +1,5 @@
+package com.baeldung.annotations;
+
+@interface Intervals {
+    Interval[] value();
+}
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotation.java b/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotation.java
new file mode 100644
index 0000000000..6e71f446b0
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotation.java
@@ -0,0 +1,11 @@
+package com.baeldung.annotations;
+
+import java.lang.annotation.*;
+
+@Inherited
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.LOCAL_VARIABLE, ElementType.FIELD})
+@interface MyAnnotation {
+
+}
\ No newline at end of file
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java b/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java
new file mode 100644
index 0000000000..37f40a624e
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java
@@ -0,0 +1,16 @@
+package com.baeldung.annotations;
+
+class MyAnnotationTarget {
+
+    // this is OK
+    @MyAnnotation
+    String someField;
+
+    // @MyAnnotation <- this is invalid usage!
+    void doSomething() {
+
+        // this also works
+        @MyAnnotation
+        String localVariable;
+    }
+}
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/MyOperation.java b/core-java-8/src/main/java/com/baeldung/annotations/MyOperation.java
new file mode 100644
index 0000000000..a4385bc786
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/MyOperation.java
@@ -0,0 +1,6 @@
+package com.baeldung.annotations;
+
+interface MyOperation {
+
+    void perform();
+}
\ No newline at end of file
diff --git a/core-java-8/src/main/java/com/baeldung/annotations/MyOperationImpl.java b/core-java-8/src/main/java/com/baeldung/annotations/MyOperationImpl.java
new file mode 100644
index 0000000000..e6a8ce76d3
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/annotations/MyOperationImpl.java
@@ -0,0 +1,9 @@
+package com.baeldung.annotations;
+
+class MyOperationImpl implements MyOperation {
+
+    @Override
+    public void perform() {
+
+    }
+}
\ No newline at end of file

From 5b25c39f08f963c89416c81696e0776b6bb12bdb Mon Sep 17 00:00:00 2001
From: Ahmad Alsanie <ahmad.alsanie92@gmail.com>
Date: Mon, 20 Nov 2017 21:18:17 +0200
Subject: [PATCH 65/72] BAEL-1308 changed name to original.txt

---
 core-java/src/test/resources/{original => original.txt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core-java/src/test/resources/{original => original.txt} (100%)

diff --git a/core-java/src/test/resources/original b/core-java/src/test/resources/original.txt
similarity index 100%
rename from core-java/src/test/resources/original
rename to core-java/src/test/resources/original.txt

From 8de9f342e437d0eb9386ef42c7f26100a2ead289 Mon Sep 17 00:00:00 2001
From: ramansahasi <ramansahasi@gmail.com>
Date: Tue, 21 Nov 2017 02:43:07 +0530
Subject: [PATCH 66/72] BAEL-1212 Guide to Creational Design Patterns (#2932)

* Initial commit for 'Introduction to Creational Design Patterns'

* second commit with some minor fixes and test case additions

* second commit with some minor fixes and test case additions

* BAEL-1212 Guide to Creational Patterns - Made changes as per latest review

* Renamed Toy family to AAnimal family.
---
 .../abstractfactory/AbstractFactory.java      |  6 ++
 .../AbstractPatternDriver.java                | 18 ++++++
 .../creational/abstractfactory/Animal.java    |  6 ++
 .../abstractfactory/AnimalFactory.java        | 21 ++++++
 .../creational/abstractfactory/Brown.java     | 10 +++
 .../creational/abstractfactory/Color.java     |  5 ++
 .../abstractfactory/ColorFactory.java         | 21 ++++++
 .../creational/abstractfactory/Dog.java       | 15 +++++
 .../creational/abstractfactory/Duck.java      | 15 +++++
 .../abstractfactory/FactoryProvider.java      | 15 +++++
 .../creational/abstractfactory/White.java     | 10 +++
 .../creational/builder/BankAccount.java       | 64 +++++++++++++++++++
 .../builder/BuilderPatternDriver.java         | 16 +++++
 .../creational/factory/FactoryDriver.java     | 16 +++++
 .../creational/factory/Heptagon.java          | 10 +++
 .../creational/factory/Octagon.java           | 10 +++
 .../creational/factory/Pentagon.java          | 10 +++
 .../creational/factory/Polygon.java           |  5 ++
 .../creational/factory/PolygonFactory.java    | 22 +++++++
 .../creational/factory/Square.java            | 10 +++
 .../creational/factory/Triangle.java          | 10 +++
 .../creational/singleton/Singleton.java       | 13 ++++
 .../creational/singleton/SingletonDriver.java |  8 +++
 .../AbstractPatternIntegrationTest.java       | 23 +++++++
 .../BuilderPatternIntegrationTest.java        | 33 ++++++++++
 .../factory/FactoryIntegrationTest.java       | 32 ++++++++++
 .../singleton/SingletonIntegrationTest.java   | 26 ++++++++
 27 files changed, 450 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractFactory.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternDriver.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Animal.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AnimalFactory.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Brown.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Color.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/ColorFactory.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Dog.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Duck.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/FactoryProvider.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/White.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BankAccount.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BuilderPatternDriver.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/factory/FactoryDriver.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Heptagon.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Octagon.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Pentagon.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Polygon.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/factory/PolygonFactory.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Square.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Triangle.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/Singleton.java
 create mode 100644 core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/SingletonDriver.java
 create mode 100644 core-java/src/test/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternIntegrationTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/designpatterns/creational/builder/BuilderPatternIntegrationTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/designpatterns/creational/factory/FactoryIntegrationTest.java
 create mode 100644 core-java/src/test/java/com/baeldung/designpatterns/creational/singleton/SingletonIntegrationTest.java

diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractFactory.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractFactory.java
new file mode 100644
index 0000000000..46d97d1a15
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractFactory.java
@@ -0,0 +1,6 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public interface AbstractFactory {
+    Animal getAnimal(String toyType) ;
+    Color getColor(String colorType);
+}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternDriver.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternDriver.java
new file mode 100644
index 0000000000..7ab166e16a
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternDriver.java
@@ -0,0 +1,18 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public class AbstractPatternDriver {
+    public static void main(String[] args) {
+        AbstractFactory abstractFactory;
+        
+        //creating a brown toy dog
+        abstractFactory = FactoryProvider.getFactory("Toy");
+        Animal toy = abstractFactory.getAnimal("Dog");
+        
+        abstractFactory = FactoryProvider.getFactory("Color");
+        Color color = abstractFactory.getColor("Brown");
+        
+        String result = "A " + toy.getType() + " with " + color.getColor() + " color " + toy.makeSound();
+        
+        System.out.println(result);
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Animal.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Animal.java
new file mode 100644
index 0000000000..59c1336053
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Animal.java
@@ -0,0 +1,6 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public interface Animal {
+    String getType();
+    String makeSound();
+}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AnimalFactory.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AnimalFactory.java
new file mode 100644
index 0000000000..49583c3a98
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AnimalFactory.java
@@ -0,0 +1,21 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public class AnimalFactory implements AbstractFactory {
+
+    @Override
+    public Animal getAnimal(String animalType) {
+        if ("Dog".equalsIgnoreCase(animalType)) {
+            return new Dog();
+        } else if ("Duck".equalsIgnoreCase(animalType)) {
+            return new Duck();
+        }
+
+        return null;
+    }
+
+    @Override
+    public Color getColor(String color) {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Brown.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Brown.java
new file mode 100644
index 0000000000..f251285ebf
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Brown.java
@@ -0,0 +1,10 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public class Brown implements Color {
+
+    @Override
+    public String getColor() {
+        return "brown";
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Color.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Color.java
new file mode 100644
index 0000000000..897bb71f38
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Color.java
@@ -0,0 +1,5 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public interface Color {
+    String getColor();
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/ColorFactory.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/ColorFactory.java
new file mode 100644
index 0000000000..8f7559ff27
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/ColorFactory.java
@@ -0,0 +1,21 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public class ColorFactory implements AbstractFactory {
+
+    @Override
+    public Color getColor(String colorType) {
+        if ("Brown".equalsIgnoreCase(colorType)) {
+            return new Brown();
+        } else if ("White".equalsIgnoreCase(colorType)) {
+            return new White();
+        }
+
+        return null;
+    }
+
+    @Override
+    public Animal getAnimal(String toyType) {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Dog.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Dog.java
new file mode 100644
index 0000000000..002b5665d3
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Dog.java
@@ -0,0 +1,15 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public class Dog implements Animal {
+
+    @Override
+    public String getType() {
+        return "Dog";
+    }
+
+    @Override
+    public String makeSound() {
+        return "Barks";
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Duck.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Duck.java
new file mode 100644
index 0000000000..5603ad6eee
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Duck.java
@@ -0,0 +1,15 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public class Duck implements Animal {
+
+    @Override
+    public String getType() {
+        return "Duck";
+    }
+
+    @Override
+    public String makeSound() {
+        return "Squeks";
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/FactoryProvider.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/FactoryProvider.java
new file mode 100644
index 0000000000..fcbee1e6de
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/FactoryProvider.java
@@ -0,0 +1,15 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public class FactoryProvider {
+    public static AbstractFactory getFactory(String choice){
+        
+        if("Toy".equalsIgnoreCase(choice)){
+            return new AnimalFactory();
+        }
+        else if("Color".equalsIgnoreCase(choice)){
+            return new ColorFactory();
+        }
+        
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/White.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/White.java
new file mode 100644
index 0000000000..62ef8048ea
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/White.java
@@ -0,0 +1,10 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+public class White implements Color {
+
+    @Override
+    public String getColor() {
+        return "White";
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BankAccount.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BankAccount.java
new file mode 100644
index 0000000000..355fa74895
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BankAccount.java
@@ -0,0 +1,64 @@
+package com.baeldung.designpatterns.creational.builder;
+
+public class BankAccount {
+    private String name;
+    private String accountNumber;
+    private String email;
+    private boolean newsletter;
+
+    //The constructor that takes a builder from which it will create object
+    //the access to this is only provided to builder
+    private BankAccount(BankAccountBuilder builder) {
+        this.name = builder.name;
+        this.accountNumber = builder.accountNumber;
+        this.email = builder.email;
+        this.newsletter = builder.newsletter;
+    }
+    
+    public static class BankAccountBuilder {
+        private String name;
+        private String accountNumber;
+        private String email;
+        private boolean newsletter;
+        
+        //All Mandatory parameters goes with this constructor
+        public BankAccountBuilder(String name, String accountNumber) {
+            this.name = name;
+            this.accountNumber = accountNumber;
+        }
+
+        //setters for optional parameters which returns this same builder
+        //to support fluent design
+        public BankAccountBuilder withEmail(String email) {
+            this.email = email;
+            return this;
+        }
+
+        public BankAccountBuilder wantNewsletter(boolean newsletter) {
+            this.newsletter = newsletter;
+            return this;
+        }
+        
+        //the actual build method that prepares and returns a BankAccount object
+        public BankAccount build() {
+            return new BankAccount(this);
+        }
+    }
+
+    //getters
+    public String getName() {
+        return name;
+    }
+
+    public String getAccountNumber() {
+        return accountNumber;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public boolean isNewsletter() {
+        return newsletter;
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BuilderPatternDriver.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BuilderPatternDriver.java
new file mode 100644
index 0000000000..d92a70e664
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BuilderPatternDriver.java
@@ -0,0 +1,16 @@
+package com.baeldung.designpatterns.creational.builder;
+
+public class BuilderPatternDriver {
+    public static void main(String[] args) {
+        BankAccount newAccount = new BankAccount
+          .BankAccountBuilder("Jon", "22738022275")
+          .withEmail("jon@example.com")
+          .wantNewsletter(true)
+          .build();
+
+        System.out.println("Name: " + newAccount.getName());
+        System.out.println("AccountNumber:" + newAccount.getAccountNumber());
+        System.out.println("Email: " + newAccount.getEmail());
+        System.out.println("Want News letter?: " + newAccount.isNewsletter());
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/FactoryDriver.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/FactoryDriver.java
new file mode 100644
index 0000000000..64ee307bb8
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/FactoryDriver.java
@@ -0,0 +1,16 @@
+package com.baeldung.designpatterns.creational.factory;
+
+public class FactoryDriver {
+    public static void main(String[] args) {
+        Polygon p;
+        PolygonFactory factory = new PolygonFactory();
+        
+        //get the shape which has 4 sides
+        p = factory.getPolygon(4);
+        System.out.println("The shape with 4 sides is a " + p.getType());
+        
+        //get the shape which has 4 sides
+        p = factory.getPolygon(8);
+        System.out.println("The shape with 8 sides is a " + p.getType());
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Heptagon.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Heptagon.java
new file mode 100644
index 0000000000..935fc2f04c
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Heptagon.java
@@ -0,0 +1,10 @@
+package com.baeldung.designpatterns.creational.factory;
+
+public class Heptagon implements Polygon {
+
+    @Override
+    public String getType() {
+        return "Heptagon";
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Octagon.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Octagon.java
new file mode 100644
index 0000000000..fc62302dc8
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Octagon.java
@@ -0,0 +1,10 @@
+package com.baeldung.designpatterns.creational.factory;
+
+public class Octagon implements Polygon {
+
+    @Override
+    public String getType() {
+        return "Octagon";
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Pentagon.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Pentagon.java
new file mode 100644
index 0000000000..65d109b10b
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Pentagon.java
@@ -0,0 +1,10 @@
+package com.baeldung.designpatterns.creational.factory;
+
+public class Pentagon implements Polygon {
+
+    @Override
+    public String getType() {
+        return "Pentagon";
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Polygon.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Polygon.java
new file mode 100644
index 0000000000..8364e546b0
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Polygon.java
@@ -0,0 +1,5 @@
+package com.baeldung.designpatterns.creational.factory;
+
+public interface Polygon {
+    String getType();
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/PolygonFactory.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/PolygonFactory.java
new file mode 100644
index 0000000000..406f0f5274
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/PolygonFactory.java
@@ -0,0 +1,22 @@
+package com.baeldung.designpatterns.creational.factory;
+
+public class PolygonFactory {
+    public Polygon getPolygon(int numberOfSides) {
+        if(numberOfSides == 3) {
+            return new Triangle();
+        }
+        if(numberOfSides == 4) {
+            return new Square();
+        }
+        if(numberOfSides == 5) {
+            return new Pentagon();
+        }
+        if(numberOfSides == 4) {
+            return new Heptagon();
+        }
+        else if(numberOfSides == 8) {
+            return new Octagon();
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Square.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Square.java
new file mode 100644
index 0000000000..805c1c9ae3
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Square.java
@@ -0,0 +1,10 @@
+package com.baeldung.designpatterns.creational.factory;
+
+public class Square implements Polygon {
+
+    @Override
+    public String getType() {
+        return "Square";
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Triangle.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Triangle.java
new file mode 100644
index 0000000000..8a8832d8a1
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Triangle.java
@@ -0,0 +1,10 @@
+package com.baeldung.designpatterns.creational.factory;
+
+public class Triangle implements Polygon {
+
+    @Override
+    public String getType() {
+        return "Triangle";
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/Singleton.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/Singleton.java
new file mode 100644
index 0000000000..1a5ac82c89
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/Singleton.java
@@ -0,0 +1,13 @@
+package com.baeldung.designpatterns.creational.singleton;
+
+public class Singleton  {    
+    private Singleton() {}
+    
+    private static class SingletonHolder {    
+        public static final Singleton instance = new Singleton();
+    }    
+
+    public static Singleton getInstance() {    
+        return SingletonHolder.instance;    
+    }    
+}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/SingletonDriver.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/SingletonDriver.java
new file mode 100644
index 0000000000..1955008d3e
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/SingletonDriver.java
@@ -0,0 +1,8 @@
+package com.baeldung.designpatterns.creational.singleton;
+
+public class SingletonDriver {
+    public static void main(String[] args) {
+        Singleton instance = Singleton.getInstance();
+        System.out.println(instance.toString());
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternIntegrationTest.java b/core-java/src/test/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternIntegrationTest.java
new file mode 100644
index 0000000000..dc02b976a0
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternIntegrationTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.designpatterns.creational.abstractfactory;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class AbstractPatternIntegrationTest {
+    @Test
+    public void givenAbstractFactory_whenGettingObjects_thenSuccessful() {
+        AbstractFactory abstractFactory;
+        
+        //creating a brown toy dog
+        abstractFactory = FactoryProvider.getFactory("Toy");
+        Animal toy = abstractFactory.getAnimal("Dog");
+        
+        abstractFactory = FactoryProvider.getFactory("Color");
+        Color color = abstractFactory.getColor("Brown");
+        
+        String result = "A " + toy.getType() + " with " + color.getColor() + " color " + toy.makeSound();
+        assertEquals("A Dog with brown color Barks", result);
+    }
+
+}
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/creational/builder/BuilderPatternIntegrationTest.java b/core-java/src/test/java/com/baeldung/designpatterns/creational/builder/BuilderPatternIntegrationTest.java
new file mode 100644
index 0000000000..898330b26e
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/designpatterns/creational/builder/BuilderPatternIntegrationTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.designpatterns.creational.builder;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class BuilderPatternIntegrationTest {
+    @Test
+    public void whenCreatingObjectThroughBuilder_thenObjectValid() {
+        BankAccount newAccount = new BankAccount
+          .BankAccountBuilder("Jon", "22738022275")
+          .withEmail("jon@example.com")
+          .wantNewsletter(true)
+          .build();
+        
+        assertEquals(newAccount.getName(), "Jon");
+        assertEquals(newAccount.getAccountNumber(), "22738022275");
+        assertEquals(newAccount.getEmail(), "jon@example.com");
+        assertEquals(newAccount.isNewsletter(), true);
+    }
+    
+    @Test
+    public void whenSkippingOptionalParameters_thenObjectValid() {
+        BankAccount newAccount = new BankAccount
+          .BankAccountBuilder("Jon", "22738022275")
+          .build();
+        
+        assertEquals(newAccount.getName(), "Jon");
+        assertEquals(newAccount.getAccountNumber(), "22738022275");
+        assertEquals(newAccount.getEmail(), null);
+        assertEquals(newAccount.isNewsletter(), false);
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/creational/factory/FactoryIntegrationTest.java b/core-java/src/test/java/com/baeldung/designpatterns/creational/factory/FactoryIntegrationTest.java
new file mode 100644
index 0000000000..ed0419c16d
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/designpatterns/creational/factory/FactoryIntegrationTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.designpatterns.creational.factory;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class FactoryIntegrationTest {
+
+    @Test
+    public void whenUsingFactoryForSquare_thenCorrectObjectReturned() {
+        Polygon p;
+        PolygonFactory factory = new PolygonFactory();
+        
+        //get the shape which has 4 sides
+        p = factory.getPolygon(4);
+        String result = "The shape with 4 sides is a " + p.getType();
+        
+        assertEquals("The shape with 4 sides is a Square", result);
+    }
+    
+    @Test
+    public void whenUsingFactoryForOctagon_thenCorrectObjectReturned() {
+        Polygon p;
+        PolygonFactory factory = new PolygonFactory();
+        
+        //get the shape which has 4 sides
+        p = factory.getPolygon(8);
+        String result = "The shape with 8 sides is a " + p.getType();
+        
+        assertEquals("The shape with 8 sides is a Octagon", result);
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/creational/singleton/SingletonIntegrationTest.java b/core-java/src/test/java/com/baeldung/designpatterns/creational/singleton/SingletonIntegrationTest.java
new file mode 100644
index 0000000000..a3d5b7a14d
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/designpatterns/creational/singleton/SingletonIntegrationTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.designpatterns.creational.singleton;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class SingletonIntegrationTest {
+
+    @Test
+    /**
+     * Although there is absolutely no way to determine whether
+     * a class is Singleton, in this test case, we will just 
+     * check for two objects if they point to same instance or 
+     * not. We will also check for their hashcode.
+     */
+    public void whenGettingMultipleObjects_thenAllPointToSame() {
+        //first object
+        Singleton obj1 = Singleton.getInstance();
+        
+        //Second object
+        Singleton obj2 = Singleton.getInstance();
+        
+        assertTrue(obj1 == obj2);
+        assertEquals(obj1.hashCode(), obj2.hashCode());
+    }
+
+}

From e271fa0c63e1d439c1df87dba618c85f80ac4d65 Mon Sep 17 00:00:00 2001
From: Gopal Singh Rajput <gopal.rajput@capgemini.com>
Date: Tue, 21 Nov 2017 02:50:06 +0530
Subject: [PATCH 67/72] Rename test to testFile (#3060)

---
 spring-rest-full/src/testFile | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 spring-rest-full/src/testFile

diff --git a/spring-rest-full/src/testFile b/spring-rest-full/src/testFile
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/spring-rest-full/src/testFile
@@ -0,0 +1 @@
+

From dbee97c1c1072eee3dd051cdc90d169e8189fc36 Mon Sep 17 00:00:00 2001
From: Holger Steinhauer <hlibrenz@gmail.com>
Date: Mon, 20 Nov 2017 21:47:48 +0000
Subject: [PATCH 68/72] BAEL-1317: Adding Java7 examples

---
 .../timezonedisplay/TimezoneDisplayJava7.java | 43 +++++++++++++++++++
 .../TimezoneDisplayJava7App.java              | 23 ++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java

diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
new file mode 100644
index 0000000000..5249d11b98
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
@@ -0,0 +1,43 @@
+package com.baeldung.timezonedisplay;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
+
+public class TimezoneDisplayJava7 {
+
+    public List<String> compileListFor(TimezoneDisplayJava7.OffsetBase base) {
+        String[] availableZoneIds = TimeZone.getAvailableIDs();
+        List<String> result = new ArrayList<>(availableZoneIds.length);
+
+        for (String zoneId : availableZoneIds) {
+            TimeZone curTimeZone = TimeZone.getTimeZone(zoneId);
+
+            String offset = calculateOffset(curTimeZone.getRawOffset());
+
+            result.add(String.format("(%s%s) %s", base, offset, zoneId));
+        }
+
+        Collections.sort(result);
+
+        return result;
+    }
+
+    private String calculateOffset(int rawOffset) {
+        if (rawOffset == 0) {
+            return "+00:00";
+        }
+        long hours = TimeUnit.MILLISECONDS.toHours(rawOffset);
+        long minutes = TimeUnit.MILLISECONDS.toMinutes(rawOffset);
+        minutes = Math.abs(minutes - TimeUnit.HOURS.toMinutes(hours));
+
+        return String.format("%+03d:%02d", hours, Math.abs(minutes));
+    }
+
+    public enum OffsetBase {
+        GMT, UTC
+    }
+
+}
diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
new file mode 100644
index 0000000000..8f0acb38f3
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
@@ -0,0 +1,23 @@
+package com.baeldung.timezonedisplay;
+
+import java.util.List;
+
+public class TimezoneDisplayJava7App {
+
+    public static void main(String... args) {
+        TimezoneDisplayJava7 display = new TimezoneDisplayJava7();
+
+        System.out.println("Time zones in UTC:");
+        List<String> utc = display.compileListFor(TimezoneDisplayJava7.OffsetBase.UTC);
+        for (String timeZone : utc) {
+            System.out.println(timeZone);
+        }
+
+        System.out.println("Time zones in GMT:");
+        List<String> gmt = display.compileListFor(TimezoneDisplayJava7.OffsetBase.GMT);
+        for (String timeZone : gmt) {
+            System.out.println(timeZone);
+        }
+    }
+
+}

From 12567132b1054c60e4129cb00cdaf5c6b3bdee79 Mon Sep 17 00:00:00 2001
From: Holger Steinhauer <hlibrenz@gmail.com>
Date: Tue, 21 Nov 2017 07:31:09 +0000
Subject: [PATCH 69/72] BAEL-1317: Moving Java7 example to `core-java` module

---
 .../baeldung/timezonedisplay/TimezoneDisplayJava7.java    | 8 ++++----
 .../baeldung/timezonedisplay/TimezoneDisplayJava7App.java | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename {core-java-8 => core-java}/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java (100%)
 rename {core-java-8 => core-java}/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java (100%)

diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java b/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
rename to core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
index 5249d11b98..79f0729f32 100644
--- a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
+++ b/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
@@ -8,6 +8,10 @@ import java.util.concurrent.TimeUnit;
 
 public class TimezoneDisplayJava7 {
 
+    public enum OffsetBase {
+        GMT, UTC
+    }
+
     public List<String> compileListFor(TimezoneDisplayJava7.OffsetBase base) {
         String[] availableZoneIds = TimeZone.getAvailableIDs();
         List<String> result = new ArrayList<>(availableZoneIds.length);
@@ -36,8 +40,4 @@ public class TimezoneDisplayJava7 {
         return String.format("%+03d:%02d", hours, Math.abs(minutes));
     }
 
-    public enum OffsetBase {
-        GMT, UTC
-    }
-
 }
diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java b/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
rename to core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java

From bc29683080f5ed177b0f6a66d499221cd6e15592 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Tue, 21 Nov 2017 18:19:10 +0200
Subject: [PATCH 70/72] update guava versiob

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

diff --git a/core-java/pom.xml b/core-java/pom.xml
index dbf61c3acf..77000b8741 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -460,7 +460,7 @@
         <logback.version>1.1.7</logback.version>
 
         <!-- util -->
-        <guava.version>22.0</guava.version>
+        <guava.version>23.0</guava.version>
         <commons-lang3.version>3.5</commons-lang3.version>
         <bouncycastle.version>1.55</bouncycastle.version>
         <commons-codec.version>1.10</commons-codec.version>

From 0b6a047cc0c6d9ffacfd94df32bb4dc31a098c76 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Tue, 21 Nov 2017 22:30:29 +0200
Subject: [PATCH 71/72] change time zone method name

---
 .../java/com/baeldung/timezonedisplay/TimezoneDisplay.java    | 2 +-
 .../java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java | 4 ++--
 .../com/baeldung/timezonedisplay/TimezoneDisplayJava7.java    | 2 +-
 .../com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
index ff618c8eea..3a1016c63b 100644
--- a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
+++ b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplay.java
@@ -14,7 +14,7 @@ public class TimezoneDisplay {
         GMT, UTC
     }
 
-    public List<String> compileListFor(OffsetBase base) {
+    public List<String> getTimeZoneList(OffsetBase base) {
         Set<String> availableZoneIds = ZoneId.getAvailableZoneIds();
 
         LocalDateTime now = LocalDateTime.now();
diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
index 42a7a2ba85..6811d5ad22 100644
--- a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
+++ b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
@@ -8,11 +8,11 @@ public class TimezoneDisplayApp {
         TimezoneDisplay display = new TimezoneDisplay();
 
         System.out.println("Time zones in UTC:");
-        List<String> utc = display.compileListFor(TimezoneDisplay.OffsetBase.UTC);
+        List<String> utc = display.getTimeZoneList(TimezoneDisplay.OffsetBase.UTC);
         utc.forEach(System.out::println);
 
         System.out.println("Time zones in GMT:");
-        List<String> gmt = display.compileListFor(TimezoneDisplay.OffsetBase.GMT);
+        List<String> gmt = display.getTimeZoneList(TimezoneDisplay.OffsetBase.GMT);
         gmt.forEach(System.out::println);
     }
 
diff --git a/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java b/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
index 79f0729f32..4882ebe175 100644
--- a/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
+++ b/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7.java
@@ -12,7 +12,7 @@ public class TimezoneDisplayJava7 {
         GMT, UTC
     }
 
-    public List<String> compileListFor(TimezoneDisplayJava7.OffsetBase base) {
+    public List<String> getTimeZoneList(TimezoneDisplayJava7.OffsetBase base) {
         String[] availableZoneIds = TimeZone.getAvailableIDs();
         List<String> result = new ArrayList<>(availableZoneIds.length);
 
diff --git a/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java b/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
index 8f0acb38f3..9f20667660 100644
--- a/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
+++ b/core-java/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayJava7App.java
@@ -8,13 +8,13 @@ public class TimezoneDisplayJava7App {
         TimezoneDisplayJava7 display = new TimezoneDisplayJava7();
 
         System.out.println("Time zones in UTC:");
-        List<String> utc = display.compileListFor(TimezoneDisplayJava7.OffsetBase.UTC);
+        List<String> utc = display.getTimeZoneList(TimezoneDisplayJava7.OffsetBase.UTC);
         for (String timeZone : utc) {
             System.out.println(timeZone);
         }
 
         System.out.println("Time zones in GMT:");
-        List<String> gmt = display.compileListFor(TimezoneDisplayJava7.OffsetBase.GMT);
+        List<String> gmt = display.getTimeZoneList(TimezoneDisplayJava7.OffsetBase.GMT);
         for (String timeZone : gmt) {
             System.out.println(timeZone);
         }

From 06b58e797874015e2b7d5b7f0bfb2ad7c1629f45 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Tue, 21 Nov 2017 23:49:37 +0200
Subject: [PATCH 72/72] formatting to trigger build

---
 .../java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
index 6811d5ad22..aa9f84e21a 100644
--- a/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
+++ b/core-java-8/src/main/java/com/baeldung/timezonedisplay/TimezoneDisplayApp.java
@@ -15,5 +15,4 @@ public class TimezoneDisplayApp {
         List<String> gmt = display.getTimeZoneList(TimezoneDisplay.OffsetBase.GMT);
         gmt.forEach(System.out::println);
     }
-
 }